diff --git a/MP-MAG/Content/Site.css b/MP-MAG/Content/Site.css index 2d76acd..e847d04 100644 --- a/MP-MAG/Content/Site.css +++ b/MP-MAG/Content/Site.css @@ -9,8 +9,8 @@ body { /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - padding-left: 15px; - padding-right: 15px; + /* padding-left: 15px; + padding-right: 15px;*/ } .textCondens { /*font-family: 'Roboto Condensed', sans-serif;*/ @@ -82,8 +82,8 @@ body { .smallText { font-size: 0.8em; } -/* Override the default bootstrap behavior where horizontal description lists - will truncate terms that are too long to fit in the left column +/* Override the default bootstrap behavior where horizontal description lists + will truncate terms that are too long to fit in the left column */ .dl-horizontal dt { white-space: normal; diff --git a/MP-MAG/Content/Site.less b/MP-MAG/Content/Site.less index 3abae6f..3c8d8dc 100644 --- a/MP-MAG/Content/Site.less +++ b/MP-MAG/Content/Site.less @@ -1,163 +1,162 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - /*font-family: 'Roboto', sans-serif;*/ - font-family: 'Roboto Condensed', sans-serif; - /*font-family: 'Open Sans Condensed', sans-serif;*/ - padding-top: 50px; - padding-bottom: 20px; + /*font-family: 'Roboto', sans-serif;*/ + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ + padding-top: 50px; + padding-bottom: 20px; } /* Wrapping element */ /* Set some basic padding to keep content from hitting the edges */ .body-content { - padding-left: 15px; - padding-right: 15px; + /* padding-left: 15px; + padding-right: 15px;*/ } - .textCondens { - /*font-family: 'Roboto Condensed', sans-serif;*/ - font-family: 'Open Sans Condensed', sans-serif; + /*font-family: 'Roboto Condensed', sans-serif;*/ + font-family: 'Open Sans Condensed', sans-serif; } .textNormal { - font-family: 'Roboto', sans-serif; - /*font-family: 'Open Sans', sans-serif;*/ + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ } /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { - .jumbotron { - margin-top: 20px; - } + .jumbotron { + margin-top: 20px; + } - .body-content { - padding: 0; - } + .body-content { + padding: 0; + } - body { - font-family: 'Roboto', sans-serif; - } + body { + font-family: 'Roboto', sans-serif; + } } @media (max-width: 992px) { - .container { - width: 100%; - } + .container { + width: 100%; + } } @borderThick: 3px; .border-thick { - border-width: @borderThick !important; + border-width: @borderThick !important; } /* Animazione per richiamo attenzione*/ .flashColor { - border: @borderThick solid blue; - /* Safari 4.0 - 8.0 */ - -webkit-animation-name: blueFlash; - -webkit-animation-duration: 0.5s; - -webkit-animation-timing-function: linear; - -webkit-animation-delay: 0s; - -webkit-animation-iteration-count: infinite; - -webkit-animation-direction: alternate; - /* Standard syntax */ - animation-name: blueFlash; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-delay: 0s; - animation-iteration-count: infinite; - animation-direction: alternate; + border: @borderThick solid blue; + /* Safari 4.0 - 8.0 */ + -webkit-animation-name: blueFlash; + -webkit-animation-duration: 0.5s; + -webkit-animation-timing-function: linear; + -webkit-animation-delay: 0s; + -webkit-animation-iteration-count: infinite; + -webkit-animation-direction: alternate; + /* Standard syntax */ + animation-name: blueFlash; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-delay: 0s; + animation-iteration-count: infinite; + animation-direction: alternate; } /* Safari 4.0 - 8.0 */ @-webkit-keyframes blueFlash { - 0% { - border-color: #c4dbff; - } + 0% { + border-color: #c4dbff; + } - 25% { - border-color: #9dc4ff; - } + 25% { + border-color: #9dc4ff; + } - 50% { - border-color: #5ca5ff; - } + 50% { + border-color: #5ca5ff; + } - 75% { - border-color: #1b82ff; - } + 75% { + border-color: #1b82ff; + } - 100% { - border-color: #005ccc; - } + 100% { + border-color: #005ccc; + } } .bigText { - font-size: 1.3em; + font-size: 1.3em; } .smallText { - font-size: 0.8em; + font-size: 0.8em; } -/* Override the default bootstrap behavior where horizontal description lists - will truncate terms that are too long to fit in the left column +/* Override the default bootstrap behavior where horizontal description lists + will truncate terms that are too long to fit in the left column */ .dl-horizontal dt { - white-space: normal; + white-space: normal; } .deleted { - text-decoration: line-through; + text-decoration: line-through; } .padZL { - padding-left: 0.2em; + padding-left: 0.2em; } .padZR { - padding-right: 0.2em; + padding-right: 0.2em; } .padZRL { - .padZL; - .padZR; + .padZL; + .padZR; } .colAlt { - color: #C93; + color: #C93; } .fontBig { - font-size: 2em; + font-size: 2em; } .tNote { - color: #8a8a8a; - font-style: italic; + color: #8a8a8a; + font-style: italic; } .tNoWrap { - white-space: nowrap; + white-space: nowrap; } .navbar { - min-height: 0; - /*z-index: 0; // commentare quando in prod?!?*/ - color: #696969; + min-height: 0; + /*z-index: 0; // commentare quando in prod?!?*/ + color: #696969; } .pagination { - margin: 5px 0; + margin: 5px 0; } .pageSelDD { - width: 6em; + width: 6em; } .zeroWidth { - width: 0; + width: 0; } /*------------------------------------------------------------------ @@ -167,104 +166,104 @@ body { @blSCut: 1rem; .shortcuts { - text-align: center; + text-align: center; } .shortcuts .shortcut { - min-width: @blSCut * 9; - min-height: @blSCut * 5; - display: inline-block; - padding: @blSCut*2/3 0; - margin: 0 2px 1em; - vertical-align: top; - text-decoration: none; - background: #F3F3F3; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); - border: 1px solid #ddd; - box-sizing: border-box; - border-radius: @blSCut/2; + min-width: @blSCut * 9; + min-height: @blSCut * 5; + display: inline-block; + padding: @blSCut*2/3 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; } .shortcuts .shortcut-sm { - min-width: @blSCut * 4.5; - min-height: @blSCut * 3; - display: inline-block; - padding: @blSCut/4 0; - margin: 0 2px 1em; - vertical-align: top; - text-decoration: none; - background: #F3F3F3; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); - background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); - background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); - background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); - border: 1px solid #ddd; - box-sizing: border-box; - border-radius: @blSCut/2; + min-width: @blSCut * 4.5; + min-height: @blSCut * 3; + display: inline-block; + padding: @blSCut/4 0; + margin: 0 2px 1em; + vertical-align: top; + text-decoration: none; + background: #F3F3F3; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); + border: 1px solid #ddd; + box-sizing: border-box; + border-radius: @blSCut/2; } .shortcuts .shortcut .shortcut-icon { - width: 100%; - margin-top: 0; - margin-bottom: 0; - font-size: @blSCut*2; - color: #333; + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; } .shortcuts .shortcut-sm .shortcut-icon { - width: 100%; - margin-top: 0; - margin-bottom: 0; - font-size: @blSCut*2; - color: #333; + width: 100%; + margin-top: 0; + margin-bottom: 0; + font-size: @blSCut*2; + color: #333; } .shortcuts .shortcut:hover { - background: #E8E8E8; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); - background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); - background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); } .shortcuts .shortcut-sm:hover { - background: #E8E8E8; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); - background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); - background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); + background: #E8E8E8; + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%); + background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); } .shortcuts .shortcut:active { - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } .shortcuts .shortcut-sm:active { - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } .shortcuts .shortcut:hover .shortcut-icon { - color: #C93; + color: #C93; } .shortcuts .shortcut-sm:hover .shortcut-icon { - color: #666; + color: #666; } .shortcuts .shortcut-label { - display: block; - margin-top: .75em; - font-weight: 400; - color: #666; -} + display: block; + margin-top: .75em; + font-weight: 400; + color: #666; +} \ No newline at end of file diff --git a/MP-MAG/Content/Site.min.css b/MP-MAG/Content/Site.min.css index 7ac06e6..ed4e645 100644 --- a/MP-MAG/Content/Site.min.css +++ b/MP-MAG/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index d932977..6a16348 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -313,6 +313,13 @@ packList.aspx + + PLScanner.aspx + ASPXCodeBehind + + + PLScanner.aspx + UserAdmin.aspx ASPXCodeBehind @@ -460,6 +467,27 @@ cmp_packListNew.ascx + + cmp_SelPackList.ascx + ASPXCodeBehind + + + cmp_SelPackList.ascx + + + cmp_SelPedana.ascx + ASPXCodeBehind + + + cmp_SelPedana.ascx + + + cmp_PLScanner.ascx + ASPXCodeBehind + + + cmp_PLScanner.ascx + cmp_printLottoOUT.ascx ASPXCodeBehind @@ -509,6 +537,20 @@ cmp_LottiOut.ascx + + cmp_SelUdc.ascx + ASPXCodeBehind + + + cmp_SelUdc.ascx + + + cmp_UDCList.ascx + ASPXCodeBehind + + + cmp_UDCList.ascx + @@ -569,6 +611,12 @@ + + Always + + + + @@ -633,6 +681,7 @@ + @@ -656,6 +705,9 @@ + + + @@ -665,6 +717,8 @@ + + compilerconfig.json diff --git a/MP-MAG/SMART/PLScanner.aspx b/MP-MAG/SMART/PLScanner.aspx new file mode 100644 index 0000000..927435a --- /dev/null +++ b/MP-MAG/SMART/PLScanner.aspx @@ -0,0 +1,11 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PLScanner.aspx.cs" Inherits="MP_MAG.SMART.PLScanner" %> + +<%@ Register Src="~/WebUserControls/cmp_PLScanner.ascx" TagPrefix="uc1" TagName="cmp_PLScanner" %> + + +
+
+ +
+
+ \ No newline at end of file diff --git a/MP-MAG/SMART/PLScanner.aspx.cs b/MP-MAG/SMART/PLScanner.aspx.cs new file mode 100644 index 0000000..82bdc20 --- /dev/null +++ b/MP-MAG/SMART/PLScanner.aspx.cs @@ -0,0 +1,21 @@ +using MagData; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.SMART +{ + public partial class PLScanner : System.Web.UI.Page + { + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/SMART/PLScanner.aspx.designer.cs b/MP-MAG/SMART/PLScanner.aspx.designer.cs new file mode 100644 index 0000000..5ef1773 --- /dev/null +++ b/MP-MAG/SMART/PLScanner.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.SMART +{ + + + public partial class PLScanner + { + + /// + /// Controllo cmp_PLScanner. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_PLScanner cmp_PLScanner; + } +} diff --git a/MP-MAG/SMART/gestPedane.aspx b/MP-MAG/SMART/gestPedane.aspx index a49346d..ae22184 100644 --- a/MP-MAG/SMART/gestPedane.aspx +++ b/MP-MAG/SMART/gestPedane.aspx @@ -5,37 +5,41 @@ <%@ Register Src="~/WebUserControls/cmp_elencoUDC.ascx" TagPrefix="uc1" TagName="cmp_elencoUDC" %> -
-
-
-
-

Preparazione Spedizioni

-
-
- Richieste +
+
+
+
+
+
+

Preparazione Spedizioni

+
+
+ Richieste +
+ + +
+ +
+
+
- -
-
-
- +
+
+
+ +
+
+ +
+
+
+
+ <%----%>
-
-
-
- -
-
- -
-
-
-
- <%----%> -
\ No newline at end of file diff --git a/MP-MAG/SMART/gestPedane.aspx.cs b/MP-MAG/SMART/gestPedane.aspx.cs index 01ac621..ccdc5f2 100644 --- a/MP-MAG/SMART/gestPedane.aspx.cs +++ b/MP-MAG/SMART/gestPedane.aspx.cs @@ -96,7 +96,7 @@ namespace MP_MAG.SMART public string getImageUrl() { string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val="; - string payload = "{'baseUrl':'{0}','parameters':['" + PackListID + "']}"; + string payload = "{'baseUrl':'{0}','parameters':['PL" + PackListID + "']}"; string answ = $"{baseUrl}{payload}"; return answ; } diff --git a/MP-MAG/Site.Master b/MP-MAG/Site.Master index 205fc1b..748fd4c 100644 --- a/MP-MAG/Site.Master +++ b/MP-MAG/Site.Master @@ -4,78 +4,76 @@ <%@ Register Src="~/WebUserControls/cmp_menuTop.ascx" TagPrefix="uc1" TagName="cmp_menuTop" %> <%@ Register Src="~/WebUserControls/cmp_activeParams.ascx" TagPrefix="uc1" TagName="cmp_activeParams" %> - - - - - - - - - - - MP-MAG <%: Page.Title %> + + + + + + + + + + MP-MAG <%: Page.Title %> - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - - + + <%: Scripts.Render("~/bundles/modernizr") %> + + + + -
- - - <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> - <%--Framework Scripts--%> - - - - - - - - - - - - - <%--Site Scripts--%> - - + + + + <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> + <%--Framework Scripts--%> + + + + + + + + + + + + + <%--Site Scripts--%> + + - - -
- - + + +
+ + +
+ + +
+ + +
+ + +
+ +
- - -
- - -
- - -
- - -
- - - - - - + + + + + + - + \ No newline at end of file diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index 3226ded..8c24619 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -24,6 +24,7 @@ + diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx b/MP-MAG/WebUserControls/cmp_OrderList.ascx index 18705e1..2b1600f 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx @@ -13,11 +13,12 @@ Nessun record trovato
- Add New + Add New
+ <%----%> <%----%> @@ -31,10 +32,20 @@ - <%----%> - - - + + <%----%> + + + +
+ + + + +
+ + + diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx b/MP-MAG/WebUserControls/cmp_PLScanner.ascx new file mode 100644 index 0000000..b8f5e5b --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx @@ -0,0 +1,26 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_PLScanner.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_PLScanner" %> + +<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> +<%@ Register Src="~/WebUserControls/cmp_SelPackList.ascx" TagPrefix="uc1" TagName="cmp_SelPackList" %> +<%@ Register Src="~/WebUserControls/cmp_SelPedana.ascx" TagPrefix="uc1" TagName="cmp_SelPedana" %> +<%@ Register Src="~/WebUserControls/cmp_SelUdc.ascx" TagPrefix="uc1" TagName="cmp_SelUdc" %> + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs new file mode 100644 index 0000000..14a5cc0 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs @@ -0,0 +1,377 @@ +using MagData; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_PLScanner : BaseUserControl + { + #region Protected Properties + + /// + /// Comando ULTIMO barcode letto + /// + protected string lastCmd + { + get + { + return hfLastBCode.Value; + } + set + { + hfLastBCode.Value = value; + lastValidCmd = value; + } + } + + /// + /// ULTIMO Comando barcode VALIDO (!="") letto + /// + protected string lastValidCmd + { + get + { + return hfLastValidBCode.Value; + } + set + { + // solo se è non nullo/vuoto + if (!string.IsNullOrEmpty(value)) + { + hfLastValidBCode.Value = value; + } + } + } + + #endregion Protected Properties + + #region Private Methods + + private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e) + { + bool doRaiseEv = false; + // processo evento.. + lastCmd = cmp_barcode.inputAcquired.ToUpper(); + doRaiseEv = processLastCmd(doRaiseEv); + + // reset comando + cmp_barcode.inputAcquired = ""; + // aggiorno... + doUpdate(); + } + + private void Cmp_barcode_eh_doReset(object sender, EventArgs e) + { + } + + private void doUpdate() + { +#if false + // reset grafico + icnCart.Attributes.Remove("class"); + icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); + icnBin.Attributes.Remove("class"); + icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); + icnSecOp.Attributes.Remove("class"); + icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary"); + + // in base al secondo mostro uno o altro... + if (showCart) + { + icnCart.Attributes.Remove("class"); + icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success"); + lblMessage.Text = "Item recognized"; + // controllo SE HO cart + if (currCartTab.Count == 1) + { + var cartRow = currCartTab[0]; + // imposto OUT + lblDestination.Text = $"SEND TO CART C{cartRow.CartIndex} ({cartRow.CartDtmx})"; + } + else + { + lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!"; + } + lblDestination.CssClass = "text-success"; + } + else if (showBin) + { + icnBin.Attributes.Remove("class"); + icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary"); + lblMessage.Text = "Item recognized"; + if (currBinTab.Count == 1) + { + var binRow = currBinTab[0]; + lblDestination.Text = $"SEND TO BIN B{binRow.BinIndex} ({binRow.BinDtmx})"; + } + else + { + lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!"; + } + lblDestination.CssClass = "text-primary"; + } + if (showSecOp) + { + icnSecOp.Attributes.Remove("class"); + icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info"); + lblMessage.Text = "Item recognized"; + lblLastBCode.Text = $"DO SEC OP: {secOp}"; + lblLastBCode.CssClass = "text-info"; + } + // fix btn reset! + lbtResetSel.Visible = (itemIdSelected != 0); +#endif + } + + private bool processLastCmd(bool doRaiseEv) + { + if (lastCmd == "") doRaiseEv = true; + // processiamo barcode letto + decodedData decoData = MagDataLayer.man.decodeBcode(lastValidCmd); + switch (decoData.codeType) + { + case codeType.Command: + case codeType.PackList: + case codeType.Pedana: + case codeType.Udc: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + processSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + doRaiseEv = true; + break; + + default: + cmp_barcode.showOutput("text-danger", $"Codice sconosciuto: {decoData.rawData} --> ignoro"); + resetSelection(false); + doRaiseEv = true; + break; + } + + return doRaiseEv; + } + + /// + /// Processo il codice letto + /// + /// + /// + /// + private void processSuggestion(codeType tipoCod, string rawData, int codeInt) + { + //DS_App.ItemListDataTable tabItem = null; + // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero) + switch (tipoCod) + { + case codeType.Command: + + // verifico tipo comando + switch (rawData) + { + case "CMDRESET": + cmp_SelPackList.PackListID = 0; + cmp_SelPedana.Pedana = "ND"; + cmp_SelUdc.UDC = "NA"; + resetSelection(true); + break; + + default: + break; + } + break; + + case codeType.PackList: + // FARE!!! verificare packlist valida... + if (true) + { + // seleziono PackList + cmp_SelPackList.PackListID = codeInt; + } + + tryLinkAlUdc(); +#if false + // IN PRIMIS cerco lotto valido + DS_Mag.ElencoLottiDataTable tabLotti; + tabLotti = MagDataLayer.man.taEL.getByKey(rawData, "*", codStatoIN); + if (tabLotti.Count == 1) + { + // se trovato cerco in elenco --> aggiungo in lista se non c'è + var currLotti = lottiSel; + if (!currLotti.Contains(rawData)) + { + currLotti.Add(rawData); + lottiSel = currLotti; + } + } +#endif + break; + + case codeType.Pedana: + // verifico e seleziono pedana + + if (true) + { + cmp_SelPedana.Pedana = rawData; + } + + //tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); + //if (tabItem.Count == 1) + //{ + // showItemDetail(true, tabItem[0], false); + //} + //else if (tabItem.Count == 0) + //{ + // showItemDetail(false, null, true); + //} + break; + + case codeType.Udc: + + // verifico e seleziono udc + + if (true) + { + cmp_SelUdc.UDC = rawData; + } + + tryLinkAlUdc(); + + break; + //case codeType.Item: + // tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); + // if (tabItem.Count == 1) + // { + // showItemDetail(true, tabItem[0], false); + // } + // else if (tabItem.Count == 0) + // { + // showItemDetail(false, null, true); + // } + // break; + //case codeType.ItemGeneric: + // // PRIMA CERCSE ne ho in stato 1..3 + // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3); + // if (tabItem.Count == 0) + // { + // // se NON ne trovo cerci FINO a stato 5... + // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5); + // } + // if (tabItem.Count == 1) + // { + // showItemDetail(true, tabItem[0], false); + // } + // else if (tabItem.Count == 0) + // { + // showItemDetail(false, null, true); + // } + // break; + //case codeType.Cart: + // // verifico NON SIA richiesto PAINT + // if (showBin) + // { + // displError("PAINT: BIN REQUESTED: please retry", true); + // } + // else + // { + // if (currCartTab.Count == 1) + // { + // // controllo se sia quello corretto + // if (rawData != currCartTab[0].CartDtmx) + // { + // displError("INCORRECT CART: please retry", true); + // } + // else + // { + // // dichiaro che è depositato + // DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId); + // lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}"; + // resetSelection(false); + // } + // } + // } + // break; + //case codeType.Bin: + // // verifico NON SIA richiesto PAINT + // if (showCart) + // { + // displError("NOT PAINTED: CART REQUESTED: please retry", true); + // } + // else + // { + // if (currBinTab.Count == 1) + // { + // // controllo se sia quello corretto + // if (rawData != currBinTab[0].BinDtmx) + // { + // displError("INCORRECT BIN: please retry", true); + // } + // else + // { + // // dichiaro che è depositato + // DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId); + // lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}"; + // resetSelection(false); + // } + // } + // } + // break; + default: + break; + } + } + + private void tryLinkAlUdc() + { + // verifica UDC ed al, se entrambi validi e LIBERI + + // se c'è già un associazione UDC con altro AL --> chiede rilettura + + // se non c'era effettua associazione + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + // eventi barcode + cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; + // eventi reset lotti IN + cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset; ; + } + + /// + /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload + /// + /// + protected void resetSelection(bool resetStatus) + { +#if false + if (resetStatus) + { + try + { + // SE item esiste... + var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); + if (tabItem.Count == 1) + { + // riposto item a status 1... + DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + } + } + catch + { } + } + // elimino item sel... + itemIdSelected = 0; + resetShowData(); + ComLib.resetItemPickup(SheetID, DeviceId); +#endif + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_PLScanner.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.designer.cs new file mode 100644 index 0000000..7f4b6db --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PLScanner.ascx.designer.cs @@ -0,0 +1,80 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_PLScanner + { + + /// + /// Controllo cmp_SelPackList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_SelPackList cmp_SelPackList; + + /// + /// Controllo lblPL. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblPL; + + /// + /// Controllo cmp_barcode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_barcode cmp_barcode; + + /// + /// Controllo hfLastBCode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfLastBCode; + + /// + /// Controllo hfLastValidBCode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfLastValidBCode; + + /// + /// Controllo cmp_SelUdc. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_SelUdc cmp_SelUdc; + + /// + /// Controllo cmp_SelPedana. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_SelPedana cmp_SelPedana; + } +} diff --git a/MP-MAG/WebUserControls/cmp_SelPackList.ascx b/MP-MAG/WebUserControls/cmp_SelPackList.ascx new file mode 100644 index 0000000..d70eab8 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPackList.ascx @@ -0,0 +1,19 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_SelPackList.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_SelPackList" %> +<%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %> + +
+
+
+ + PACKING LIST + + + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelPackList.ascx.cs b/MP-MAG/WebUserControls/cmp_SelPackList.ascx.cs new file mode 100644 index 0000000..58321e5 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPackList.ascx.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_SelPackList : BaseUserControl + { + #region Public Properties + + public int PackListID + { + get + { + int answ = 0; + int.TryParse(hfPackListID.Value, out answ); + return answ; + } + set + { + hfPackListID.Value = $"{value}"; + lblPackListID.Text = $"{value}"; + cmp_OrderList.PackListID = value; + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + PackListID = 0; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelPackList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_SelPackList.ascx.designer.cs new file mode 100644 index 0000000..a1dad5d --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPackList.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_SelPackList + { + + /// + /// Controllo lbtShow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtShow; + + /// + /// Controllo lblPackListID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblPackListID; + + /// + /// Controllo cmp_OrderList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList; + + /// + /// Controllo hfPackListID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfPackListID; + } +} diff --git a/MP-MAG/WebUserControls/cmp_SelPedana.ascx b/MP-MAG/WebUserControls/cmp_SelPedana.ascx new file mode 100644 index 0000000..92f0aa4 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPedana.ascx @@ -0,0 +1,19 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_SelPedana.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_SelPedana" %> +<%@ Register Src="~/WebUserControls/cmp_UDCList.ascx" TagPrefix="uc1" TagName="cmp_UDCList" %> + +
+
+
+ + Pedana + + + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelPedana.ascx.cs b/MP-MAG/WebUserControls/cmp_SelPedana.ascx.cs new file mode 100644 index 0000000..f087a58 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPedana.ascx.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_SelPedana : BaseUserControl + { + #region Public Properties + + public string Pedana + { + get + { + return hfPedana.Value; ; + } + set + { + hfPedana.Value = value; + lblPedana.Text = value; + cmp_UDCList.AlSel = value; + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + Pedana = ""; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelPedana.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_SelPedana.ascx.designer.cs new file mode 100644 index 0000000..65df1a0 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelPedana.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_SelPedana + { + + /// + /// Controllo lbtShow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtShow; + + /// + /// Controllo lblPedana. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblPedana; + + /// + /// Controllo cmp_UDCList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_UDCList cmp_UDCList; + + /// + /// Controllo hfPedana. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfPedana; + } +} diff --git a/MP-MAG/WebUserControls/cmp_SelUdc.ascx b/MP-MAG/WebUserControls/cmp_SelUdc.ascx new file mode 100644 index 0000000..7c2950b --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelUdc.ascx @@ -0,0 +1,18 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_SelUdc.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_SelUdc" %> + +
+
+
+ + UDC + + + +
+ dettaglio UDC? +
+
+
+
+ + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelUdc.ascx.cs b/MP-MAG/WebUserControls/cmp_SelUdc.ascx.cs new file mode 100644 index 0000000..008544e --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelUdc.ascx.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_SelUdc : BaseUserControl + { + #region Public Properties + + public string UDC + { + get + { + return hfUDC.Value; ; + } + set + { + hfUDC.Value = value; + lblUDC.Text = value; +#if false + cmp_OrderList.PackListID = value; +#endif + } + } + + #endregion Public Properties + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + UDC = ""; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_SelUdc.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_SelUdc.ascx.designer.cs new file mode 100644 index 0000000..3fc499f --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_SelUdc.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_SelUdc + { + + /// + /// Controllo lbtShow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtShow; + + /// + /// Controllo lblUDC. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblUDC; + + /// + /// Controllo hfUDC. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfUDC; + } +} diff --git a/MP-MAG/WebUserControls/cmp_UDCList.ascx b/MP-MAG/WebUserControls/cmp_UDCList.ascx new file mode 100644 index 0000000..c61001a --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_UDCList.ascx @@ -0,0 +1,47 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_UDCList.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_UDCList" %> + + + + + + + + + + + + <%----%> + <%----%> + <%----%> + + <%----%> + <%----%> + <%-- + + --%> + <%-- + --%> + <%-- + + + + --%> + <%-- + + + + + + + --%> + + + Nessun record trovato + + + + + + + + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_UDCList.ascx.cs b/MP-MAG/WebUserControls/cmp_UDCList.ascx.cs new file mode 100644 index 0000000..e2f72c4 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_UDCList.ascx.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_UDCList : BaseUserControl + { + #region Public Properties + + public string AlSel + { + get + { + return hfAL.Value; + } + set + { + hfAL.Value = value; + doUpdate(); + } + } + + #endregion Public Properties + + #region Private Methods + + private void doUpdate() + { + grView.SelectedIndex = -1; + grView.DataBind(); + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_UDCList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_UDCList.ascx.designer.cs new file mode 100644 index 0000000..4cf621b --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_UDCList.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_UDCList + { + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// Controllo hfAL. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfAL; + } +} diff --git a/MP-MAG/WebUserControls/cmp_barcode.ascx b/MP-MAG/WebUserControls/cmp_barcode.ascx index 57c77d9..eda1585 100644 --- a/MP-MAG/WebUserControls/cmp_barcode.ascx +++ b/MP-MAG/WebUserControls/cmp_barcode.ascx @@ -1,7 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_barcode" %> -

BARCODE

- - -
+ + +
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs index 0e35380..9674b3f 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs @@ -76,7 +76,7 @@ namespace MP_MAG.WebUserControls catch { } // descrizione - txtDescr.Text = $"PEDANA {newNum}"; + txtDescr.Text = $"{newNum}"; } #endregion Private Methods diff --git a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx index 3e16874..47358c6 100644 --- a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx +++ b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx @@ -1,4 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_elencoUDC.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_elencoUDC" %> +<%@ Register Src="~/WebUserControls/cmp_UDCList.ascx" TagPrefix="uc1" TagName="cmp_UDCList" %>
@@ -7,52 +8,7 @@
- - - - - - - - - - - - <%----%> - <%----%> - <%----%> - - <%----%> - <%----%> - <%-- - - --%> - <%-- - --%> - <%-- - - - - --%> - <%-- - - - - - - - --%> - - - Nessun record trovato - - - - - - - - +
diff --git a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.cs index c2fa551..ec64eff 100644 --- a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.cs @@ -15,27 +15,16 @@ namespace MP_MAG.WebUserControls { get { - return hfAL.Value; + return cmp_UDCList.AlSel; } set { - hfAL.Value = value; - doUpdate(); + cmp_UDCList.AlSel = value; } } #endregion Public Properties - #region Private Methods - - private void doUpdate() - { - grView.SelectedIndex = -1; - grView.DataBind(); - } - - #endregion Private Methods - #region Protected Methods protected void Page_Load(object sender, EventArgs e) diff --git a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.designer.cs index 80845bd..9028955 100644 --- a/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_elencoUDC.ascx.designer.cs @@ -15,30 +15,12 @@ namespace MP_MAG.WebUserControls { /// - /// Controllo grView. + /// Controllo cmp_UDCList. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.GridView grView; - - /// - /// Controllo ods. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource ods; - - /// - /// Controllo hfAL. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfAL; + protected global::MP_MAG.WebUserControls.cmp_UDCList cmp_UDCList; } } diff --git a/MP-MAG/WebUserControls/cmp_footer.ascx b/MP-MAG/WebUserControls/cmp_footer.ascx index 3f5b7a0..dd129f3 100644 --- a/MP-MAG/WebUserControls/cmp_footer.ascx +++ b/MP-MAG/WebUserControls/cmp_footer.ascx @@ -1,14 +1,26 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_footer" %>
-
- - -  |  - -
-
- -
+
+ + +  |  + +
+
+ +
+
+ + + + + + + + + + +
- + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_footer.ascx.cs b/MP-MAG/WebUserControls/cmp_footer.ascx.cs index fdda05c..9ad4049 100644 --- a/MP-MAG/WebUserControls/cmp_footer.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_footer.ascx.cs @@ -1,44 +1,59 @@ using SteamWare; + //using SteamWare.IO; using System; using System.Configuration; namespace MP_MAG.WebUserControls { - public partial class cmp_footer : System.Web.UI.UserControl - { - public event EventHandler eh_doRefresh; - protected void Page_Load(object sender, EventArgs e) + public partial class cmp_footer : System.Web.UI.UserControl { - // sistemo le stringhe... - lblApp.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - setTimer(); - setClock(); - } - /// - /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada - /// - private void setTimer() - { -#if false - Timer1.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms"); -#endif - } - protected void Timer1_Tick(object sender, EventArgs e) - { - setClock(); - // se qualcuno ascolta sollevo evento nuovo valore... - if (eh_doRefresh != null) - { - eh_doRefresh(this, new EventArgs()); - } - } + #region Public Events - private void setClock() - { - lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss"); - //lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})"; - lblCodOperatore.Text = $"{Page.User.Identity.Name}"; + public event EventHandler eh_doRefresh; + + #endregion Public Events + + #region Private Methods + + private void setClock() + { + lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss"); + //lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})"; + lblCodOperatore.Text = $"{Page.User.Identity.Name}"; + } + + /// + /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada + /// + private void setTimer() + { + MainTimer.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms"); + } + + #endregion Private Methods + + #region Protected Methods + + protected void MainTimer_Tick(object sender, EventArgs e) + { + setClock(); + // se qualcuno ascolta sollevo evento nuovo valore... + if (eh_doRefresh != null) + { + eh_doRefresh(this, new EventArgs()); + } + } + + protected void Page_Load(object sender, EventArgs e) + { + // sistemo le stringhe... + lblApp.Text = $"{ConfigurationManager.AppSettings.Get("appName")}"; + lblVers.Text = $"v.{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}"; + setTimer(); + setClock(); + } + + #endregion Protected Methods } - } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_footer.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_footer.ascx.designer.cs index 441dd3d..06251c7 100644 --- a/MP-MAG/WebUserControls/cmp_footer.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_footer.ascx.designer.cs @@ -11,43 +11,52 @@ namespace MP_MAG.WebUserControls { - public partial class cmp_footer - { + public partial class cmp_footer + { - /// - /// Controllo lblDateTime. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblDateTime; + /// + /// Controllo lblDateTime. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblDateTime; - /// - /// Controllo lblCodOperatore. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblCodOperatore; + /// + /// Controllo lblCodOperatore. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblCodOperatore; - /// - /// Controllo lblApp. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblApp; + /// + /// Controllo lblApp. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblApp; - /// - /// Controllo Timer1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer Timer1; - } + /// + /// Controllo lblVers. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblVers; + + /// + /// Controllo MainTimer. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer MainTimer; + } } diff --git a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx index 26ed603..9db1b50 100644 --- a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx +++ b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx @@ -7,7 +7,6 @@ <%@ Register Src="~/WebUserControls/cmp_creaLottoOUT.ascx" TagPrefix="uc1" TagName="cmp_creaLottoOUT" %> <%@ Register Src="~/WebUserControls/cmp_ArtRich.ascx" TagPrefix="uc1" TagName="cmp_ArtRich" %> - @@ -17,25 +16,25 @@
-
-

-

-
-
- -
- -
-
- -
- - -
-
- -
- -
-
- +
+

+

+
+
+ +
+ +
+
+ BARCODE
+ +
+ + +
+
+ +
+ +
+
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs index 6225e75..e0b1c1a 100644 --- a/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs @@ -9,568 +9,281 @@ using System.Web.UI.WebControls; namespace MP_MAG.WebUserControls { - public partial class cmp_prtFiniti : BaseUserControl - { - /// - /// Tipo Stampa - /// - public string tipoStampa + public partial class cmp_prtFiniti : BaseUserControl { - get - { - return lblTipoStampa.Text; - } - set - { - lblTipoStampa.Text = value; - } - } - /// - /// Comando ULTIMO barcode letto - /// - protected string lastCmd - { - get - { - return hfLastBCode.Value; - } - set - { - hfLastBCode.Value = value; - lastValidCmd = value; - } - } - /// - /// Coda di stampa attiva - /// - public string printQueue - { - get - { - // cerco in hidden file... - string answ = hfPrintQueue.Value; - if (string.IsNullOrEmpty(answ)) + #region Protected Properties + + /// + /// Comando ULTIMO barcode letto + /// + protected string lastCmd { - // altrimenti da currProdData - answ = currProdData.PrintQueue; - } - return answ; - } - set - { - hfPrintQueue.Value = value; - } - } - /// - /// Tipo di lotto - /// - public string tipoLotto - { - get - { - return hfTipoLotto.Value; - } - set - { - hfTipoLotto.Value = value; - } - } - /// - /// Cod Flusso x UDC - /// - public string flussoUdc - { - get - { - return hfFlussoUdc.Value; - } - set - { - hfFlussoUdc.Value = value; - } - } - /// - /// Cod Stato - /// - public string codStatoOUT - { - get - { - return hfCodStatoOUT.Value; - } - set - { - hfCodStatoOUT.Value = value; - } - } - /// - /// Cod Stato - /// - public string codStatoIN - { - get - { - return hfCodStatoIN.Value; - } - set - { - hfCodStatoIN.Value = value; - } - } - /// - /// Origine - /// - public string origine - { - get - { - return hfOrigine.Value; - } - set - { - hfOrigine.Value = value; - } - } - /// - /// ULTIMO Comando barcode VALIDO (!="") letto - /// - protected string lastValidCmd - { - get - { - return hfLastValidBCode.Value; - } - set - { - // solo se è non nullo/vuoto - if (!string.IsNullOrEmpty(value)) - { - hfLastValidBCode.Value = value; - } - } - } - /// - /// Elenco dei lotti selezionati (riporta a sottocomponenti) - /// - public List lottiSel - { - get - { - return cmp_LottiIn.lottiSel; - } - set - { - cmp_LottiIn.lottiSel = value; - cmp_LottiOut.lottiSel = value; - cmp_ArtOut.lottiSel = value; - } - } - /// - /// Caricamento pagina - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - lottiSel = new List(); - cmp_creaLottoOUT.Visible = false; - cmp_printLottoOUT.Visible = false; - } - // eventi barcode - cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; - // eventi reset lotti IN - cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset; - cmp_LottiIn.eh_doReset += cmp_LottiIn_eh_doReset; - // selezione articoli - cmp_ArtOut.eh_doRefresh += cmp_ArtOut_eh_doRefresh; - cmp_ArtOut.eh_doReset += cmp_ArtOut_eh_doReset; - // selezione lotti esistenti x stampa - cmp_LottiOut.eh_doRefresh += cmp_LottiOut_eh_doRefresh; - cmp_LottiOut.eh_doReset += cmp_LottiOut_eh_doReset; - // eventi di creazione lotto e stampa - cmp_creaLottoOUT.eh_doRefresh += Cmp_creaLottoOUT_eh_doRefresh; - cmp_printLottoOUT.eh_doRefresh += Cmp_printLottoOUT_eh_doRefresh; - } - - private void Cmp_printLottoOUT_eh_doRefresh(object sender, EventArgs e) - { - // salvo richiesta stampa della quantità richiesta - int numUdc = cmp_printLottoOUT.numUdc; - decimal qtaTot = cmp_printLottoOUT.qtaTot; - if (numUdc > 0) - { - decimal qtaUdc = qtaTot / numUdc; - string keyParam = cmp_LottiOut.lottoSel; - for (int i = 0; i < numUdc; i++) - { - // creo UDC x semilavorato.. - var tabNewUDC = MagDataLayer.man.taEUdc.insertQuery(cmp_LottiOut.lottoSel, flussoUdc, CodCli, CodPost, qtaUdc, 1, CodOpr, 0, 0, 0, "", 0, ""); - if (tabNewUDC.Count == 1) - { - // cheo stampa per chiave lotto... - MagDataLayer.man.taPJQ.insertQuery(tabNewUDC[0].UDC, printQueue); - } - } - } - // nascondo creazione... - showCreaStampa(false, false); - cmp_LottiIn.doUpdate(); - cmp_LottiOut.doUpdate(); - } - - private void Cmp_creaLottoOUT_eh_doRefresh(object sender, EventArgs e) - { - MagDataLayer.man.taEL.insertQuery(tipoLotto, cmp_ArtOut.CodArtSel, codStatoOUT, origine, "", RifExt, cmp_LottiIn.elLotti); - cmp_LottiOut.doUpdate(); - } - - /// - /// Selezionato un Lotto già creato - /// - /// - /// - private void cmp_ArtOut_eh_doRefresh(object sender, EventArgs e) - { - // mostro button x creare NUOVA etichetta SUL LOTTO ESISTENTE - showCreaStampa(true, false); - } - /// - /// Reset sel articolo - /// - /// - /// - private void cmp_ArtOut_eh_doReset(object sender, EventArgs e) - { - showCreaStampa(false, false); - } - /// - /// Nascondo print lotto - /// - /// - /// - private void cmp_LottiOut_eh_doRefresh(object sender, EventArgs e) - { - // mostro button x creare NUOVO LOTTO - showCreaStampa(false, true); - } - /// - /// Print lotto - /// - /// - /// - private void cmp_LottiOut_eh_doReset(object sender, EventArgs e) - { - showCreaStampa(false, false); - } - /// - /// Mostra buttons crea/stampa lotto - /// - /// - /// - protected void showCreaStampa(bool showCrea, bool showPrint) - { - cmp_creaLottoOUT.Visible = showCrea; - cmp_printLottoOUT.Visible = showPrint; - } - - private void cmp_LottiIn_eh_doReset(object sender, EventArgs e) - { - Response.Redirect(user_std.pagCorrente); - } - - private void Cmp_barcode_eh_doReset(object sender, EventArgs e) - { - resetIcons(); - } - - private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e) - { - bool doRaiseEv = false; - // processo evento.. - lastCmd = cmp_barcode.inputAcquired.ToUpper(); - doRaiseEv = processLastCmd(doRaiseEv); - - // reset comando - cmp_barcode.inputAcquired = ""; - // aggiorno... - doUpdate(); - } - - private void resetIcons() - { -#if false - lblDestination.CssClass = "text-secondary"; - lblMessage.Text = ""; - lblDestination.Text = ""; - lblLastBCode.Text = ""; - lbtCancel.Visible = false; - lbtScrapped.Visible = false; - lbtParkArea.Visible = false; - lbtResetSel.Visible = (itemIdSelected != 0); -#endif - } - private bool processLastCmd(bool doRaiseEv) - { - if (lastCmd == "") doRaiseEv = true; - // processiamo barcode letto - decodedData decoData = MagDataLayer.man.decodeBcode(lastValidCmd); - switch (decoData.codeType) - { - case codeType.UNK: - cmp_barcode.showOutput("text-danger", $"Codice sconosciuto: {decoData.rawData} --> ignoro"); - resetSelection(false); - doRaiseEv = true; - break; - case codeType.Lotto: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - processSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - case codeType.LottoInt: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - //doRaiseEv = true; - break; - case codeType.Date: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - //processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - case codeType.PartNumber: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - //processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - case codeType.Quantity: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - //doRaiseEv = true; - break; - case codeType.Udc: - cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); - //doRaiseEv = true; - break; - //case codeType.Batch: - // cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); - // doRaiseEv = true; - // break; - //case codeType.Cart: - // cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}"); - // processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - // break; - //case codeType.Bin: - // cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}"); - // processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - // break; - //default: - // cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); - // resetSelection(false); - // break; - } - - return doRaiseEv; - } - /// - /// Processo il codice letto - /// - /// - /// - /// - private void processSuggestion(codeType tipoCod, string rawData, int codeInt) - { - //DS_App.ItemListDataTable tabItem = null; - // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero) - switch (tipoCod) - { - case codeType.Lotto: - // IN PRIMIS cerco lotto valido - DS_Mag.ElencoLottiDataTable tabLotti; - tabLotti = MagDataLayer.man.taEL.getByKey(rawData, "*", codStatoIN); - if (tabLotti.Count == 1) - { - // se trovato cerco in elenco --> aggiungo in lista se non c'è - var currLotti = lottiSel; - if (!currLotti.Contains(rawData)) + get { - currLotti.Add(rawData); - lottiSel = currLotti; + return hfLastBCode.Value; + } + set + { + hfLastBCode.Value = value; + lastValidCmd = value; } - } - break; - //case codeType.Item: - // tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); - // if (tabItem.Count == 1) - // { - // showItemDetail(true, tabItem[0], false); - // } - // else if (tabItem.Count == 0) - // { - // showItemDetail(false, null, true); - // } - // break; - //case codeType.ItemGeneric: - // // PRIMA CERCSE ne ho in stato 1..3 - // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3); - // if (tabItem.Count == 0) - // { - // // se NON ne trovo cerci FINO a stato 5... - // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5); - // } - // if (tabItem.Count == 1) - // { - // showItemDetail(true, tabItem[0], false); - // } - // else if (tabItem.Count == 0) - // { - // showItemDetail(false, null, true); - // } - // break; - //case codeType.Cart: - // // verifico NON SIA richiesto PAINT - // if (showBin) - // { - // displError("PAINT: BIN REQUESTED: please retry", true); - // } - // else - // { - // if (currCartTab.Count == 1) - // { - // // controllo se sia quello corretto - // if (rawData != currCartTab[0].CartDtmx) - // { - // displError("INCORRECT CART: please retry", true); - // } - // else - // { - // // dichiaro che è depositato - // DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId); - // lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}"; - // resetSelection(false); - // } - // } - // } - // break; - //case codeType.Bin: - // // verifico NON SIA richiesto PAINT - // if (showCart) - // { - // displError("NOT PAINTED: CART REQUESTED: please retry", true); - // } - // else - // { - // if (currBinTab.Count == 1) - // { - // // controllo se sia quello corretto - // if (rawData != currBinTab[0].BinDtmx) - // { - // displError("INCORRECT BIN: please retry", true); - // } - // else - // { - // // dichiaro che è depositato - // DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId); - // lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}"; - // resetSelection(false); - // } - // } - // } - // break; - default: - break; - } - } -#if false - /// - /// Mostra o nasconde dettaglio su ITEM letto - /// - /// - /// - /// - private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError) - { - resetShowData(); - divItemDet.Visible = showItem; - divItemError.Visible = showError; - if (showError) - { - displError("Item not found", true); - } - if (showItem) - { - lblItemCode.Text = itemRow.ItemExtCode; - lblItemDesc.Text = itemRow.ItemDesc; - lblItemDtmx.Text = itemRow.ItemDtmx; - itemIdSelected = itemRow.ItemID; - // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError("ERROR: Item not ready", false); - break; - case 1: - case 2: - case 100: - // salvo che è in STATO 2 (picked up) - DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); - // verifico cosa devo mostrare come PROX passaggio... - showCart = itemRow.ProcessesReq == ""; - showBin = (itemRow.ProcessesReq.Contains("PaintFlag")); - secOp = itemRow.PostProcList; - showSecOp = (secOp != ""); - doUpdate(); - break; - case 3: - displError("Item already on CART!", false); - break; - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError("ALL Item already scanned on BIN!", false); - break; - case 5: - displError("Item already at KIT STATION!", false); - break; - case 990: - displError("Item declared SCRAP!", false); - break; - case 991: - displError("Item declared SCRAP with CNC program created!", false); - break; - default: - displError("ERROR: Item status UNKNOWN!", false); - break; } - } - lbtResetSel.Visible = (itemIdSelected != 0); - } -#endif - /// - /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload - /// - /// - protected void resetSelection(bool resetStatus) - { -#if false - if (resetStatus) - { - try - { - // SE item esiste... - var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); - if (tabItem.Count == 1) - { - // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); - } - } - catch - { } - } - // elimino item sel... - itemIdSelected = 0; - resetShowData(); - ComLib.resetItemPickup(SheetID, DeviceId); -#endif - } - private void doUpdate() - { + /// + /// ULTIMO Comando barcode VALIDO (!="") letto + /// + protected string lastValidCmd + { + get + { + return hfLastValidBCode.Value; + } + set + { + // solo se è non nullo/vuoto + if (!string.IsNullOrEmpty(value)) + { + hfLastValidBCode.Value = value; + } + } + } + + #endregion Protected Properties + + #region Public Properties + + /// + /// Cod Stato + /// + public string codStatoIN + { + get + { + return hfCodStatoIN.Value; + } + set + { + hfCodStatoIN.Value = value; + } + } + + /// + /// Cod Stato + /// + public string codStatoOUT + { + get + { + return hfCodStatoOUT.Value; + } + set + { + hfCodStatoOUT.Value = value; + } + } + + /// + /// Cod Flusso x UDC + /// + public string flussoUdc + { + get + { + return hfFlussoUdc.Value; + } + set + { + hfFlussoUdc.Value = value; + } + } + + /// + /// Elenco dei lotti selezionati (riporta a sottocomponenti) + /// + public List lottiSel + { + get + { + return cmp_LottiIn.lottiSel; + } + set + { + cmp_LottiIn.lottiSel = value; + cmp_LottiOut.lottiSel = value; + cmp_ArtOut.lottiSel = value; + } + } + + /// + /// Origine + /// + public string origine + { + get + { + return hfOrigine.Value; + } + set + { + hfOrigine.Value = value; + } + } + + /// + /// Coda di stampa attiva + /// + public string printQueue + { + get + { + // cerco in hidden file... + string answ = hfPrintQueue.Value; + if (string.IsNullOrEmpty(answ)) + { + // altrimenti da currProdData + answ = currProdData.PrintQueue; + } + return answ; + } + set + { + hfPrintQueue.Value = value; + } + } + + /// + /// Tipo di lotto + /// + public string tipoLotto + { + get + { + return hfTipoLotto.Value; + } + set + { + hfTipoLotto.Value = value; + } + } + + /// + /// Tipo Stampa + /// + public string tipoStampa + { + get + { + return lblTipoStampa.Text; + } + set + { + lblTipoStampa.Text = value; + } + } + + #endregion Public Properties + + #region Private Methods + + /// + /// Selezionato un Lotto già creato + /// + /// + /// + private void cmp_ArtOut_eh_doRefresh(object sender, EventArgs e) + { + // mostro button x creare NUOVA etichetta SUL LOTTO ESISTENTE + showCreaStampa(true, false); + } + + /// + /// Reset sel articolo + /// + /// + /// + private void cmp_ArtOut_eh_doReset(object sender, EventArgs e) + { + showCreaStampa(false, false); + } + + private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e) + { + bool doRaiseEv = false; + // processo evento.. + lastCmd = cmp_barcode.inputAcquired.ToUpper(); + doRaiseEv = processLastCmd(doRaiseEv); + + // reset comando + cmp_barcode.inputAcquired = ""; + // aggiorno... + doUpdate(); + } + + private void Cmp_barcode_eh_doReset(object sender, EventArgs e) + { + resetIcons(); + } + + private void Cmp_creaLottoOUT_eh_doRefresh(object sender, EventArgs e) + { + MagDataLayer.man.taEL.insertQuery(tipoLotto, cmp_ArtOut.CodArtSel, codStatoOUT, origine, "", RifExt, cmp_LottiIn.elLotti); + cmp_LottiOut.doUpdate(); + } + + private void cmp_LottiIn_eh_doReset(object sender, EventArgs e) + { + Response.Redirect(user_std.pagCorrente); + } + + /// + /// Nascondo print lotto + /// + /// + /// + private void cmp_LottiOut_eh_doRefresh(object sender, EventArgs e) + { + // mostro button x creare NUOVO LOTTO + showCreaStampa(false, true); + } + + /// + /// Print lotto + /// + /// + /// + private void cmp_LottiOut_eh_doReset(object sender, EventArgs e) + { + showCreaStampa(false, false); + } + + private void Cmp_printLottoOUT_eh_doRefresh(object sender, EventArgs e) + { + // salvo richiesta stampa della quantità richiesta + int numUdc = cmp_printLottoOUT.numUdc; + decimal qtaTot = cmp_printLottoOUT.qtaTot; + if (numUdc > 0) + { + decimal qtaUdc = qtaTot / numUdc; + string keyParam = cmp_LottiOut.lottoSel; + for (int i = 0; i < numUdc; i++) + { + // creo UDC x semilavorato.. + var tabNewUDC = MagDataLayer.man.taEUdc.insertQuery(cmp_LottiOut.lottoSel, flussoUdc, CodCli, CodPost, qtaUdc, 1, CodOpr, 0, 0, 0, "", 0, ""); + if (tabNewUDC.Count == 1) + { + // cheo stampa per chiave lotto... + MagDataLayer.man.taPJQ.insertQuery(tabNewUDC[0].UDC, printQueue); + } + } + } + // nascondo creazione... + showCreaStampa(false, false); + cmp_LottiIn.doUpdate(); + cmp_LottiOut.doUpdate(); + } + + private void doUpdate() + { #if false // reset grafico icnCart.Attributes.Remove("class"); @@ -624,8 +337,342 @@ namespace MP_MAG.WebUserControls lblLastBCode.CssClass = "text-info"; } // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); + lbtResetSel.Visible = (itemIdSelected != 0); +#endif + } + + private bool processLastCmd(bool doRaiseEv) + { + if (lastCmd == "") doRaiseEv = true; + // processiamo barcode letto + decodedData decoData = MagDataLayer.man.decodeBcode(lastValidCmd); + switch (decoData.codeType) + { + case codeType.UNK: + cmp_barcode.showOutput("text-danger", $"Codice sconosciuto: {decoData.rawData} --> ignoro"); + resetSelection(false); + doRaiseEv = true; + break; + + case codeType.Lotto: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + processSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + break; + + case codeType.LottoInt: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + //doRaiseEv = true; + break; + + case codeType.Date: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + //processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + break; + + case codeType.PartNumber: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + //processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + break; + + case codeType.Quantity: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + //doRaiseEv = true; + break; + + case codeType.Udc: + cmp_barcode.showOutput("badge badge-success", $"{decoData.description}"); + //doRaiseEv = true; + break; + //case codeType.Batch: + // cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); + // doRaiseEv = true; + // break; + //case codeType.Cart: + // cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}"); + // processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + // break; + //case codeType.Bin: + // cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}"); + // processLottoSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + // break; + //default: + // cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + // resetSelection(false); + // break; + } + + return doRaiseEv; + } + + /// + /// Processo il codice letto + /// + /// + /// + /// + private void processSuggestion(codeType tipoCod, string rawData, int codeInt) + { + //DS_App.ItemListDataTable tabItem = null; + // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero) + switch (tipoCod) + { + case codeType.Lotto: + // IN PRIMIS cerco lotto valido + DS_Mag.ElencoLottiDataTable tabLotti; + tabLotti = MagDataLayer.man.taEL.getByKey(rawData, "*", codStatoIN); + if (tabLotti.Count == 1) + { + // se trovato cerco in elenco --> aggiungo in lista se non c'è + var currLotti = lottiSel; + if (!currLotti.Contains(rawData)) + { + currLotti.Add(rawData); + lottiSel = currLotti; + } + } + break; + //case codeType.Item: + // tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); + // if (tabItem.Count == 1) + // { + // showItemDetail(true, tabItem[0], false); + // } + // else if (tabItem.Count == 0) + // { + // showItemDetail(false, null, true); + // } + // break; + //case codeType.ItemGeneric: + // // PRIMA CERCSE ne ho in stato 1..3 + // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3); + // if (tabItem.Count == 0) + // { + // // se NON ne trovo cerci FINO a stato 5... + // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5); + // } + // if (tabItem.Count == 1) + // { + // showItemDetail(true, tabItem[0], false); + // } + // else if (tabItem.Count == 0) + // { + // showItemDetail(false, null, true); + // } + // break; + //case codeType.Cart: + // // verifico NON SIA richiesto PAINT + // if (showBin) + // { + // displError("PAINT: BIN REQUESTED: please retry", true); + // } + // else + // { + // if (currCartTab.Count == 1) + // { + // // controllo se sia quello corretto + // if (rawData != currCartTab[0].CartDtmx) + // { + // displError("INCORRECT CART: please retry", true); + // } + // else + // { + // // dichiaro che è depositato + // DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId); + // lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}"; + // resetSelection(false); + // } + // } + // } + // break; + //case codeType.Bin: + // // verifico NON SIA richiesto PAINT + // if (showCart) + // { + // displError("NOT PAINTED: CART REQUESTED: please retry", true); + // } + // else + // { + // if (currBinTab.Count == 1) + // { + // // controllo se sia quello corretto + // if (rawData != currBinTab[0].BinDtmx) + // { + // displError("INCORRECT BIN: please retry", true); + // } + // else + // { + // // dichiaro che è depositato + // DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId); + // lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}"; + // resetSelection(false); + // } + // } + // } + // break; + default: + break; + } + } + + private void resetIcons() + { +#if false + lblDestination.CssClass = "text-secondary"; + lblMessage.Text = ""; + lblDestination.Text = ""; + lblLastBCode.Text = ""; + lbtCancel.Visible = false; + lbtScrapped.Visible = false; + lbtParkArea.Visible = false; + lbtResetSel.Visible = (itemIdSelected != 0); +#endif + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// Caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + lottiSel = new List(); + cmp_creaLottoOUT.Visible = false; + cmp_printLottoOUT.Visible = false; + } + // eventi barcode + cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; + // eventi reset lotti IN + cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset; + cmp_LottiIn.eh_doReset += cmp_LottiIn_eh_doReset; + // selezione articoli + cmp_ArtOut.eh_doRefresh += cmp_ArtOut_eh_doRefresh; + cmp_ArtOut.eh_doReset += cmp_ArtOut_eh_doReset; + // selezione lotti esistenti x stampa + cmp_LottiOut.eh_doRefresh += cmp_LottiOut_eh_doRefresh; + cmp_LottiOut.eh_doReset += cmp_LottiOut_eh_doReset; + // eventi di creazione lotto e stampa + cmp_creaLottoOUT.eh_doRefresh += Cmp_creaLottoOUT_eh_doRefresh; + cmp_printLottoOUT.eh_doRefresh += Cmp_printLottoOUT_eh_doRefresh; + } + + /// + /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload + /// + /// + protected void resetSelection(bool resetStatus) + { +#if false + if (resetStatus) + { + try + { + // SE item esiste... + var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); + if (tabItem.Count == 1) + { + // riposto item a status 1... + DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + } + } + catch + { } + } + // elimino item sel... + itemIdSelected = 0; + resetShowData(); + ComLib.resetItemPickup(SheetID, DeviceId); +#endif + } + + /// + /// Mostra buttons crea/stampa lotto + /// + /// + /// + protected void showCreaStampa(bool showCrea, bool showPrint) + { + cmp_creaLottoOUT.Visible = showCrea; + cmp_printLottoOUT.Visible = showPrint; + } + + #endregion Protected Methods + +#if false + /// + /// Mostra o nasconde dettaglio su ITEM letto + /// + /// + /// + /// + private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError) + { + resetShowData(); + divItemDet.Visible = showItem; + divItemError.Visible = showError; + if (showError) + { + displError("Item not found", true); + } + if (showItem) + { + lblItemCode.Text = itemRow.ItemExtCode; + lblItemDesc.Text = itemRow.ItemDesc; + lblItemDtmx.Text = itemRow.ItemDtmx; + itemIdSelected = itemRow.ItemID; + // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... + switch (itemRow.StatusID) + { + case 0: + displError("ERROR: Item not ready", false); + break; + + case 1: + case 2: + case 100: + // salvo che è in STATO 2 (picked up) + DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); + // verifico cosa devo mostrare come PROX passaggio... + showCart = itemRow.ProcessesReq == ""; + showBin = (itemRow.ProcessesReq.Contains("PaintFlag")); + secOp = itemRow.PostProcList; + showSecOp = (secOp != ""); + doUpdate(); + break; + + case 3: + displError("Item already on CART!", false); + break; + + case 4: + // fino a concorrenza qta richiesta sposto, POI do errori + displError("ALL Item already scanned on BIN!", false); + break; + + case 5: + displError("Item already at KIT STATION!", false); + break; + + case 990: + displError("Item declared SCRAP!", false); + break; + + case 991: + displError("Item declared SCRAP with CNC program created!", false); + break; + + default: + displError("ERROR: Item status UNKNOWN!", false); + break; + } + } + lbtResetSel.Visible = (itemIdSelected != 0); + } #endif } - } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx index cf5fdb5..1c137fa 100644 --- a/MP-MAG/WebUserControls/cmp_prtSemilav.ascx +++ b/MP-MAG/WebUserControls/cmp_prtSemilav.ascx @@ -7,7 +7,6 @@ <%@ Register Src="~/WebUserControls/cmp_creaLottoOUT.ascx" TagPrefix="uc1" TagName="cmp_creaLottoOUT" %> <%@ Register Src="~/WebUserControls/cmp_ArtRich.ascx" TagPrefix="uc1" TagName="cmp_ArtRich" %> - @@ -17,24 +16,25 @@
-
-

-

-
-
- -
- -
-
- -
- - -
-
- -
- -
-
+
+

+

+
+
+ +
+ +
+
+ BARCODE
+ +
+ + +
+
+ +
+ +
+
\ No newline at end of file diff --git a/MP-MAG/images/LogoHighResWhite.png b/MP-MAG/images/LogoHighResWhite.png new file mode 100644 index 0000000..361a978 Binary files /dev/null and b/MP-MAG/images/LogoHighResWhite.png differ diff --git a/MP-MAG/images/LogoSteamware.png b/MP-MAG/images/LogoSteamware.png new file mode 100644 index 0000000..012685c Binary files /dev/null and b/MP-MAG/images/LogoSteamware.png differ diff --git a/MP-MAG/images/SteamwareLogo.png b/MP-MAG/images/SteamwareLogo.png new file mode 100644 index 0000000..878a011 Binary files /dev/null and b/MP-MAG/images/SteamwareLogo.png differ diff --git a/MP-MAG/images/favicon.png b/MP-MAG/images/favicon.png new file mode 100644 index 0000000..ae6349b Binary files /dev/null and b/MP-MAG/images/favicon.png differ diff --git a/MagData/DS_Mag.xsd b/MagData/DS_Mag.xsd index fda1f45..a3204f7 100644 --- a/MagData/DS_Mag.xsd +++ b/MagData/DS_Mag.xsd @@ -512,7 +512,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -587,7 +587,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -742,7 +742,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -769,7 +769,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -836,7 +836,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -856,7 +856,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + @@ -890,7 +890,7 @@ SELECT CodCliente, RagSociale, Indirizzo, Localita, Cap, Provincia, Nazione FROM - + diff --git a/MagData/DS_Report.Designer.cs b/MagData/DS_Report.Designer.cs index 5f7ab23..bd6583b 100644 --- a/MagData/DS_Report.Designer.cs +++ b/MagData/DS_Report.Designer.cs @@ -2447,6 +2447,8 @@ namespace MagData { private global::System.Data.DataColumn columnDataPedana; + private global::System.Data.DataColumn columnBarcodeBaseUrl; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public stp_prt_CartellinoPedaneDataTable() { @@ -2544,6 +2546,14 @@ namespace MagData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn BarcodeBaseUrlColumn { + get { + return this.columnBarcodeBaseUrl; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2581,7 +2591,7 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public stp_prt_CartellinoPedaneRow Addstp_prt_CartellinoPedaneRow(string CodPedana, int NumPedana, int PesoPedana, string DescDest_1, string DescDest_2, string DescDest_3, int NumColli, System.DateTime DataPedana) { + public stp_prt_CartellinoPedaneRow Addstp_prt_CartellinoPedaneRow(string CodPedana, string NumPedana, decimal PesoPedana, string DescDest_1, string DescDest_2, string DescDest_3, int NumColli, System.DateTime DataPedana, string BarcodeBaseUrl) { stp_prt_CartellinoPedaneRow rowstp_prt_CartellinoPedaneRow = ((stp_prt_CartellinoPedaneRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodPedana, @@ -2591,12 +2601,20 @@ namespace MagData { DescDest_2, DescDest_3, NumColli, - DataPedana}; + DataPedana, + BarcodeBaseUrl}; rowstp_prt_CartellinoPedaneRow.ItemArray = columnValuesArray; this.Rows.Add(rowstp_prt_CartellinoPedaneRow); return rowstp_prt_CartellinoPedaneRow; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public stp_prt_CartellinoPedaneRow FindByCodPedana(string CodPedana) { + return ((stp_prt_CartellinoPedaneRow)(this.Rows.Find(new object[] { + CodPedana}))); + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public override global::System.Data.DataTable Clone() { @@ -2622,6 +2640,7 @@ namespace MagData { this.columnDescDest_3 = base.Columns["DescDest_3"]; this.columnNumColli = base.Columns["NumColli"]; this.columnDataPedana = base.Columns["DataPedana"]; + this.columnBarcodeBaseUrl = base.Columns["BarcodeBaseUrl"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2629,9 +2648,9 @@ namespace MagData { private void InitClass() { this.columnCodPedana = new global::System.Data.DataColumn("CodPedana", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodPedana); - this.columnNumPedana = new global::System.Data.DataColumn("NumPedana", typeof(int), null, global::System.Data.MappingType.Element); + this.columnNumPedana = new global::System.Data.DataColumn("NumPedana", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumPedana); - this.columnPesoPedana = new global::System.Data.DataColumn("PesoPedana", typeof(int), null, global::System.Data.MappingType.Element); + this.columnPesoPedana = new global::System.Data.DataColumn("PesoPedana", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPesoPedana); this.columnDescDest_1 = new global::System.Data.DataColumn("DescDest_1", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescDest_1); @@ -2643,18 +2662,27 @@ namespace MagData { base.Columns.Add(this.columnNumColli); this.columnDataPedana = new global::System.Data.DataColumn("DataPedana", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDataPedana); + this.columnBarcodeBaseUrl = new global::System.Data.DataColumn("BarcodeBaseUrl", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBarcodeBaseUrl); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnCodPedana}, true)); + this.columnCodPedana.AllowDBNull = false; this.columnCodPedana.ReadOnly = true; + this.columnCodPedana.Unique = true; this.columnCodPedana.MaxLength = 12; - this.columnNumPedana.ReadOnly = true; + this.columnNumPedana.AllowDBNull = false; + this.columnNumPedana.MaxLength = 50; this.columnPesoPedana.ReadOnly = true; - this.columnDescDest_1.ReadOnly = true; - this.columnDescDest_1.MaxLength = 27; - this.columnDescDest_2.ReadOnly = true; - this.columnDescDest_2.MaxLength = 27; + this.columnDescDest_1.AllowDBNull = false; + this.columnDescDest_1.MaxLength = 500; + this.columnDescDest_2.AllowDBNull = false; + this.columnDescDest_2.MaxLength = 250; this.columnDescDest_3.ReadOnly = true; - this.columnDescDest_3.MaxLength = 17; + this.columnDescDest_3.MaxLength = 365; this.columnNumColli.ReadOnly = true; - this.columnDataPedana.ReadOnly = true; + this.columnDataPedana.AllowDBNull = false; + this.columnBarcodeBaseUrl.ReadOnly = true; + this.columnBarcodeBaseUrl.MaxLength = 250; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5762,13 +5790,7 @@ namespace MagData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string CodPedana { get { - try { - return ((string)(this[this.tablestp_prt_CartellinoPedane.CodPedanaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'CodPedana\' nella tabella \'stp_prt_CartellinoPedane\' è DB" + - "Null.", e); - } + return ((string)(this[this.tablestp_prt_CartellinoPedane.CodPedanaColumn])); } set { this[this.tablestp_prt_CartellinoPedane.CodPedanaColumn] = value; @@ -5777,15 +5799,9 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int NumPedana { + public string NumPedana { get { - try { - return ((int)(this[this.tablestp_prt_CartellinoPedane.NumPedanaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumPedana\' nella tabella \'stp_prt_CartellinoPedane\' è DB" + - "Null.", e); - } + return ((string)(this[this.tablestp_prt_CartellinoPedane.NumPedanaColumn])); } set { this[this.tablestp_prt_CartellinoPedane.NumPedanaColumn] = value; @@ -5794,10 +5810,10 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int PesoPedana { + public decimal PesoPedana { get { try { - return ((int)(this[this.tablestp_prt_CartellinoPedane.PesoPedanaColumn])); + return ((decimal)(this[this.tablestp_prt_CartellinoPedane.PesoPedanaColumn])); } catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("Il valore della colonna \'PesoPedana\' nella tabella \'stp_prt_CartellinoPedane\' è D" + @@ -5813,13 +5829,7 @@ namespace MagData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string DescDest_1 { get { - try { - return ((string)(this[this.tablestp_prt_CartellinoPedane.DescDest_1Column])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'DescDest_1\' nella tabella \'stp_prt_CartellinoPedane\' è D" + - "BNull.", e); - } + return ((string)(this[this.tablestp_prt_CartellinoPedane.DescDest_1Column])); } set { this[this.tablestp_prt_CartellinoPedane.DescDest_1Column] = value; @@ -5830,13 +5840,7 @@ namespace MagData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string DescDest_2 { get { - try { - return ((string)(this[this.tablestp_prt_CartellinoPedane.DescDest_2Column])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'DescDest_2\' nella tabella \'stp_prt_CartellinoPedane\' è D" + - "BNull.", e); - } + return ((string)(this[this.tablestp_prt_CartellinoPedane.DescDest_2Column])); } set { this[this.tablestp_prt_CartellinoPedane.DescDest_2Column] = value; @@ -5881,13 +5885,7 @@ namespace MagData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public System.DateTime DataPedana { get { - try { - return ((global::System.DateTime)(this[this.tablestp_prt_CartellinoPedane.DataPedanaColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'DataPedana\' nella tabella \'stp_prt_CartellinoPedane\' è D" + - "BNull.", e); - } + return ((global::System.DateTime)(this[this.tablestp_prt_CartellinoPedane.DataPedanaColumn])); } set { this[this.tablestp_prt_CartellinoPedane.DataPedanaColumn] = value; @@ -5896,26 +5894,19 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsCodPedanaNull() { - return this.IsNull(this.tablestp_prt_CartellinoPedane.CodPedanaColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetCodPedanaNull() { - this[this.tablestp_prt_CartellinoPedane.CodPedanaColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsNumPedanaNull() { - return this.IsNull(this.tablestp_prt_CartellinoPedane.NumPedanaColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetNumPedanaNull() { - this[this.tablestp_prt_CartellinoPedane.NumPedanaColumn] = global::System.Convert.DBNull; + public string BarcodeBaseUrl { + get { + try { + return ((string)(this[this.tablestp_prt_CartellinoPedane.BarcodeBaseUrlColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'BarcodeBaseUrl\' nella tabella \'stp_prt_CartellinoPedane\'" + + " è DBNull.", e); + } + } + set { + this[this.tablestp_prt_CartellinoPedane.BarcodeBaseUrlColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5930,30 +5921,6 @@ namespace MagData { this[this.tablestp_prt_CartellinoPedane.PesoPedanaColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsDescDest_1Null() { - return this.IsNull(this.tablestp_prt_CartellinoPedane.DescDest_1Column); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetDescDest_1Null() { - this[this.tablestp_prt_CartellinoPedane.DescDest_1Column] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsDescDest_2Null() { - return this.IsNull(this.tablestp_prt_CartellinoPedane.DescDest_2Column); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetDescDest_2Null() { - this[this.tablestp_prt_CartellinoPedane.DescDest_2Column] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsDescDest_3Null() { @@ -5980,14 +5947,14 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsDataPedanaNull() { - return this.IsNull(this.tablestp_prt_CartellinoPedane.DataPedanaColumn); + public bool IsBarcodeBaseUrlNull() { + return this.IsNull(this.tablestp_prt_CartellinoPedane.BarcodeBaseUrlColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetDataPedanaNull() { - this[this.tablestp_prt_CartellinoPedane.DataPedanaColumn] = global::System.Convert.DBNull; + public void SetBarcodeBaseUrlNull() { + this[this.tablestp_prt_CartellinoPedane.BarcodeBaseUrlColumn] = global::System.Convert.DBNull; } } @@ -7213,6 +7180,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO tableMapping.ColumnMappings.Add("DescDest_3", "DescDest_3"); tableMapping.ColumnMappings.Add("NumColli", "NumColli"); tableMapping.ColumnMappings.Add("DataPedana", "DataPedana"); + tableMapping.ColumnMappings.Add("BarcodeBaseUrl", "BarcodeBaseUrl"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/MagData/DS_Report.xsd b/MagData/DS_Report.xsd index e0a3c94..75d3986 100644 --- a/MagData/DS_Report.xsd +++ b/MagData/DS_Report.xsd @@ -311,6 +311,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO + @@ -346,7 +347,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO - + @@ -371,7 +372,7 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO - + @@ -979,45 +980,58 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO - + - + - - - + - + - + + - + + + + + + + + - + - + + + + + + + + - + @@ -1065,5 +1079,9 @@ SELECT IdxPrintJob, printerQueue, keyParam, dtStart, dtEnd, stato, dtLastTry FRO + + + + \ No newline at end of file diff --git a/MagData/DS_Report.xss b/MagData/DS_Report.xss index 688df66..2d9a625 100644 --- a/MagData/DS_Report.xss +++ b/MagData/DS_Report.xss @@ -4,12 +4,12 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + \ No newline at end of file diff --git a/MagData/Enum.cs b/MagData/Enum.cs index 259830d..f14b9e8 100644 --- a/MagData/Enum.cs +++ b/MagData/Enum.cs @@ -6,28 +6,31 @@ using System.Threading.Tasks; namespace MagData { - /// - /// tipologia di report (FILE rdlc) gestito in stampa... - /// - public enum reportRichiesto - { - ND, - CartellinoFinitiOdette, - CartellinoPedane, - CartellinoSemilavorati - } + /// + /// Tipi di barcode gestiti + /// + public enum codeType + { + UNK = 0, + Command, + Date, + Lotto, + LottoInt, + PackList, + PartNumber, + Pedana, + Quantity, + Udc + } - /// - /// Tipi di barcode gestiti - /// - public enum codeType - { - UNK = 0, - Lotto, - LottoInt, - Date, - PartNumber, - Quantity, - Udc - } -} + /// + /// tipologia di report (FILE rdlc) gestito in stampa... + /// + public enum reportRichiesto + { + ND, + CartellinoFinitiOdette, + CartellinoPedane, + CartellinoSemilavorati + } +} \ No newline at end of file diff --git a/MagData/MagDataLayer.cs b/MagData/MagDataLayer.cs index c03e9e3..9bd90e7 100644 --- a/MagData/MagDataLayer.cs +++ b/MagData/MagDataLayer.cs @@ -224,22 +224,45 @@ namespace MagData public decodedData decodeBcode(string bcValue) { decodedData answ = new decodedData(); + int codeInt = 0; answ.rawData = bcValue; - if (bcValue.StartsWith("M")) + if (bcValue.StartsWith("CMD")) + { + answ.codeType = codeType.Command; + answ.code = bcValue.Replace("CMD", ""); + answ.codeInt = codeInt; + answ.description = $"Comando: {answ.code}"; + } + else if (bcValue.StartsWith("M")) { answ.codeType = codeType.LottoInt; answ.code = bcValue.Replace("M", ""); - answ.codeInt = 0; + answ.codeInt = codeInt; answ.description = $"Lotto: {answ.code}"; } + else if (bcValue.StartsWith("PED")) + { + answ.codeType = codeType.Pedana; + answ.code = bcValue.Replace("PED", ""); + int.TryParse(answ.code, NumberStyles.Integer, CultureInfo.InvariantCulture, out codeInt); + answ.codeInt = codeInt; + answ.description = $"Pedana: {bcValue}"; + } + else if (bcValue.StartsWith("PL")) + { + answ.codeType = codeType.PackList; + answ.code = bcValue.Replace("PL", ""); + int.TryParse(answ.code, NumberStyles.Integer, CultureInfo.InvariantCulture, out codeInt); + answ.codeInt = codeInt; + answ.description = $"PackList: {answ.code}"; + } else if (bcValue.StartsWith("P")) { - // conrollo se data (6 numeri...) oppure part... + // controllo se data (6 numeri...) oppure part... if (bcValue.Length == 7) { answ.codeType = codeType.Date; answ.code = bcValue.Replace("P", ""); - int codeInt = 0; int.TryParse(answ.code, NumberStyles.Integer, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = 0; answ.description = $"Data YYMMDD: {answ.code}"; @@ -248,7 +271,6 @@ namespace MagData { answ.codeType = codeType.PartNumber; answ.code = bcValue.Replace("P", ""); - int codeInt = 0; int.TryParse(answ.code, NumberStyles.Integer, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = 0; answ.description = $"PartNumber Odette: {answ.code}"; @@ -262,7 +284,6 @@ namespace MagData { answ.codeType = codeType.Quantity; answ.code = bcValue.Replace("Q", ""); - int codeInt = 0; int.TryParse(answ.code, NumberStyles.Integer, CultureInfo.InvariantCulture, out codeInt); answ.codeInt = codeInt; answ.description = $"Qty Odette: {answ.code}"; @@ -283,7 +304,6 @@ namespace MagData { answ.codeType = codeType.Udc; answ.code = bcValue.Replace("S", ""); - int codeInt = 0; answ.codeInt = codeInt; answ.description = $"UDC Odette: {answ.code}"; } @@ -297,7 +317,6 @@ namespace MagData var riga = tabLotti[0]; answ.codeType = codeType.Lotto; answ.code = bcValue; - int codeInt = 0; answ.codeInt = codeInt; answ.description = $"Lotto: {answ.code}"; } @@ -314,7 +333,6 @@ namespace MagData { answ.codeType = codeType.Udc; answ.code = bcValue; - int codeInt = 0; answ.codeInt = codeInt; answ.description = $"UDC: {answ.code}"; }