页面字段显示优化

ICSSoft.FromERP/ICSSoft.FromERP/ICSInventorySql.cs

@@ -69,13 +69,14 @@ namespace ICSSoft.FromERP
                             Info.LGORT = "";
                             Info.CHG_DATE = DateTime.Now.Year + "-" + DateTime.Now.Month.ToString().PadLeft(2, '0') + "-" + DateTime.Now.Day.ToString().PadLeft(2, '0');
                         }
+                        log.Info("Info.CHG_DATE" + Info.CHG_DATE);
                         Info.WERKS = dr["WorkPointCode"].ToString();
                         Info.T_MARA = new SAPGetINVZS.ZWMS_MARA[1];
 
                         SAPGetINVZS.ZWMS_SK_MARAResponse result = new SAPGetINVZS.ZWMS_SK_MARAResponse();
                         client.Timeout = 600000;
                         result = client.CallZWMS_SK_MARA(Info);
-                        //log.Info(JsonConvert.SerializeObject(result));
+                        log.Info(JsonConvert.SerializeObject(result));
                         foreach (SAPGetINVZS.ZWMS_MARA item in result.T_MARA)
                         {
                             TotalCount++;

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

@@ -2709,7 +2709,7 @@ where a.DNType='3'  and a.Status='2' and a.EATTRIBUTE1 is NOT null
                             ,a.WHCode,detail.LocationCode AS Area,f.Colspan	,f.ProjectCode	,f.BatchCode	,f.Version	,f.Brand	,f.cFree1	,f.cFree2	,f.cFree3	,f.cFree4	
                             ,f.cFree5	,f.cFree6	,f.cFree7	,f.cFree8	,f.cFree9	,f.cFree10,c.MUSERName
                             ,Case When a.WHCode+';'+detail.LocationCode in (select F_Define1+';'+F_Define2 from Sys_SRM_ItemsDetail where F_Define3='HGAreaConfig')
-                            THEN '货柜' ELSE '平库' END AS AreaType
+                            THEN '货柜' ELSE '平库' END AS AreaType,LotD.EATTRIBUTE1 AS LotDLocationCode
                             from ICSMOApplyNegDetail a
 							left join ICSMOApplyNeg d on a.ApplyNegCode=d.ApplyNegCode and a.WorkPoint=d.WorkPoint
                             left join  ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
@@ -2721,6 +2721,15 @@ where a.DNType='3'  and a.Status='2' and a.EATTRIBUTE1 is NOT null
                             )c
                             on a.ApplyNegCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint
 							left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint
+
+left join(SELECT [TransCode], [TransSequence],WorkPoint,
+STUFF((SELECT ','''+[EATTRIBUTE1]  
+		FROM (select DISTINCT [EATTRIBUTE1] from [ICSInventoryLotDetail] 
+				where [TransCode]=b.[TransCode] and [TransSequence]=b.[TransSequence] and WorkPoint=b.WorkPoint
+				)a  for xml path(''))+'',1,2,'') AS [EATTRIBUTE1]
+FROM [ICSInventoryLotDetail] b  where ISNULL([EATTRIBUTE1],'')<>''
+GROUP BY [TransCode], [TransSequence],WorkPoint) LotD on a.ApplyNegCode=LotD.TransCode and a.Sequence=LotD.TransSequence and a.WorkPoint=LotD.WorkPoint 
+
 							WHERE d.Type='2'";
             sql = string.Format(sql, Figure);
             sql = string.Format(sql, DbHelper.GetErpIp(), DbHelper.GetErpName());

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

@@ -1285,13 +1285,13 @@
                     </div>
                 </td>
 
-                <td>
+                <td style="display:none;">
                     <label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;是否显示货柜单据：</label>
                 </td>
-                <td>
+                <td style="display:none;">
                     <div class="input-group" id="txt_Container">
-                        <input type="radio" name="container" value="1" />&nbsp;是
-                        <input type="radio" name="container" checked="checked" value="2" />&nbsp;否
+                        <input type="radio" name="container" checked="checked" value="1" />&nbsp;是
+                        <input type="radio" name="container" value="2" />&nbsp;否
                     </div>
                 </td>
 

WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml

@@ -699,6 +699,8 @@
                     //cols.push(collast);
                     var collast = { label: '已生成数量', name: 'LOTQTY', width: 60, align: 'left', };
                     cols.push(collast);
+                    var collast = { label: '推荐库位', name: 'LotDLocationCode', width: 150, align: 'left' };
+                    cols.push(collast);
                     var collast = { label: '创建日期', name: 'CreateDateTime', width: 120, align: 'left', };
                     cols.push(collast);
                     var collast = { label: '区域类型', name: 'AreaType', width: 10, align: 'left', hidden: true };
@@ -850,7 +852,7 @@
                 cols1.push(collast1);
                 var collast1 = { label: '条码数量', name: 'Quantity', width: 200, align: 'left' };
                 cols1.push(collast1);
-                if (Type == 7 || Type == 9) {
+                if (Type == 7 || Type == 9 || Type == 12) {
                     var collast1 = { label: '推荐库位', name: 'LocationCode', width: 200, align: 'left' };
                     cols1.push(collast1);
                 }