修改PBCA序號綁定Group，判斷區間問題(between)

取消Search 按鈕

AMESCoreStudio.Web/Controllers/PCBController.cs

@@ -539,9 +539,8 @@ namespace AMESCoreStudio.Web.Controllers
 
                 #endregion
 
-                #region 展開的序號是否在區間內
+                if (serialNumbers.Count() > 0)
-
+                {
-                #endregion
 
                     #region  判斷展開的序號是否已綁Group & 產生BarcodeInfo 
                     foreach (var item in serialNumbers)
@@ -597,6 +596,11 @@ namespace AMESCoreStudio.Web.Controllers
                     return Json(new Result() { success = true, msg = "綁定成功", data = BarCodeGroup.Data.Select(s => s.GroupID).FirstOrDefault() });
 
                     #endregion
+                }
+                else
+                {
+                    return Json(new Result() { success = false, msg = "無生產序號可綁定", data = null });
+                }
 
             }
             return Json(new Result() { success = false, msg = "生產序號不在工單區間內", data = null });

AMESCoreStudio.Web/Views/PCB/PCB015.cshtml

@@ -44,7 +44,7 @@
                     </div>
 
 
-                    <div class="layui-inline">
+                    @*<div class="layui-inline">
                         <div class="layui-inline" style="margin-left: 0px;">
                             <div class="layui-inline layui-show-xs-block">
                                 <button class="layui-btn layui-btn-sm layui-btn-normal" id="querysubmit" lay-filter="querysubmit">
@@ -52,7 +52,7 @@
                                 </button>
                             </div>
                         </div>
-                    </div>
+                    </div>*@
                 </div>
                 <div class="layui-form-item">
 
@@ -282,6 +282,7 @@
         function WipNOinput(e) {
             if (e.keyCode == 13) {
                 $('#BarcodeNo').val("");
+                tt(0);
                 var data = $("#WipNo").val();
                 if (data) {
                     console.log("data=" + data);

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs

@@ -338,7 +338,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpPost("DapperByListBarcodeNO")]
         public ActionResult<IEnumerable<BarcodeInfo>> GetBarcodeInfoesDapperByListNO([FromBody] List<string> id)
         {
-
+            if (id.Count() > 0)
+            {
                 var query = @$" SELECT BARCODE_ID as BarcodeID , BARCODE_NO as BarcodeNo ,
                             STATUS_NO as StatusNo , EXTRA_BARCODE_NO as ExtraBarcodeNo , LOCATION_ID as LocationID ,
                             STATION_ID as StationID , RULE_STATUS as RuleStatus , WIP_ID as WipID , BOX_NO as BoxNo ,
@@ -360,6 +361,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
                 return q.ToList();
             }
+            else
+            {
+                List<BarcodeInfo> q = new List<BarcodeInfo>();
+                return q.ToList();
+
+
+            }
+        }
 
 
         /// <summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeController.cs

@@ -96,6 +96,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 .FromSqlInterpolated($@" SELECT * FROM JHAMES.WIP_BARCODE WHERE {BarcodeNO} BETWEEN START_NO AND END_NO and Wip_NO = {WipNo}
                                        ").AsNoTracking().ToList();
 
+            wipBarcode = wipBarcode.Where(w => w.StartNO.Length == BarcodeNO.Length && w.EndNO.Length == BarcodeNO.Length).ToList();
+
             return wipBarcode;
         }