调整接口

WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@@ -1897,7 +1897,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
                               (ID,DocNO,INVCode,iQuantity,WHCode,BinCode,LotNO,QTYTotal,SendQTY,MUSER,MUSERNAME,WorkPoint)
                               VALUES
                               (NEWID(),'{0}','{1}',{2},'{3}','{4}','{5}',{6},{7},'{8}','{9}','{10}')  ;
-                              UPDATE ICSMOApply SET MUSER='{8}' WHERE ApplyCode='{0}'  ;";
+                              UPDATE ICSMOApply SET MUSER='{9}' WHERE ApplyCode='{0}'  ;";
                 picksql = string.Format(picksql, pickdr["Code"].ToString(), pickdr["InvCode"].ToString(), Convert.ToDecimal(pickdr["iQuantity"])
                     , pickdr["WarehouseCode"].ToString(), pickdr["LocationCode"].ToString(), pickdr["LotNO"].ToString()
                     , Convert.ToDecimal(pickdr["QTYTotal"]), Convert.ToDecimal(pickdr["SendQTY"]), MUSER, MUSERNAME, WorkPoint);

WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs

@@ -1482,7 +1482,7 @@ insert into ICSInventoryLot
                         InspectJosn += "\"RIG_ARTICOLO\": \"" + INVCode + "\",";
                         InspectJosn += "\"RIG_SUB1\": \"" + LotNo + "\",";
                         InspectJosn += "\"RIG_SUB2\": \"\",";
-                        InspectJosn += "\"RIG_QTAR\": " + thisCreateQty + ",";
+                        InspectJosn += "\"RIG_QTAR\": " + LOTQTY + ",";
                         InspectJosn += "\"RIG_HOSTINF\": " + Sequence + "";
                         InspectJosn += "}";
                     }
@@ -1493,7 +1493,7 @@ insert into ICSInventoryLot
                         InspectJosn += "\"RIG_ARTICOLO\": \"" + INVCode + "\",";
                         InspectJosn += "\"RIG_SUB1\": \"" + LotNo + "\",";
                         InspectJosn += "\"RIG_SUB2\": \"\",";
-                        InspectJosn += "\"RIG_QTAR\": " + thisCreateQty + ",";
+                        InspectJosn += "\"RIG_QTAR\": " + LOTQTY + ",";
                         InspectJosn += "\"RIG_HOSTINF\": " + Sequence + "";
                         InspectJosn += "},";
                     }

WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@@ -20,7 +20,7 @@
             
             debugger;
             SetCols();
-            //gridList();
+            gridList();
         });
 
     });
@@ -167,6 +167,8 @@
         if (Type == 2||Type==12) {
             var collast = { label: '状态', name: 'Status', width: 150, align: 'left' };
             cols.push(collast);
+            var collast = { label: '拣料人姓名', name: 'PickName', width: 100, align: 'left' };
+            cols.push(collast);
             var collast = { label: '物料号（父项生产订单物料）', name: 'OrderInvCode', width: 150, align: 'left' };
             cols.push(collast);
             var collast = { label: '物料描述（父项生产订单主物料）', name: 'OrderInvDescribe', width: 150, align: 'left' };
@@ -187,8 +189,7 @@
             cols.push(collast);
             var collast = { label: '工位', name: 'Desks', width: 100, align: 'left' };
             cols.push(collast);
-            var collast = { label: '拣料人姓名', name: 'PickName', width: 100, align: 'left' };
-            cols.push(collast);
+           
 
             ct4.style.display = "";
             ct5.style.display = "";