From 8d7da562ec0b1b9ee930f7adf3e8c5d8b16ed583 Mon Sep 17 00:00:00 2001 From: lilili Date: Thu, 25 May 2023 15:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8B=A3=E6=96=99=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NFine.Application/WMS/PickMaterialApp.cs | 6 ++-- .../Views/PickMaterial/ICSMOPickMerge.cshtml | 32 ++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index cdf4e69..5924f6c 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -121,6 +121,8 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'"; a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName, a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator, case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan , + case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName != 'JOB' then '已过帐' + else (case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName = 'JOB' then '已配料' else '未配料' end) end as Status, 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,a.ID from ICSMOApply a @@ -149,10 +151,10 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'"; } } - sqlString.Append(@" group by a.ApplyCode, a.WorkPoint,a.CreateDateTime,a.createperson, + sqlString.Append(@" group by a.ApplyCode, a.WorkPoint,a.IssueQuantity,a.CreateDateTime,a.createperson, 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,a.WHCode,detail.LocationCode,a.ID,a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName, - a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator) as t where t.row=1"); + a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator,a.MUSERName) as t where t.row=1"); #endregion diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml index 12b4443..fa95072 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml @@ -85,6 +85,8 @@ function SetCols() { var Type = $("#selShow").val(); + var ct = document.getElementsByClassName("type7"); + var cols = new Array(); var collast = { label: "主键", name: "ID", hidden: true, key: true }; @@ -129,15 +131,25 @@ cols.push(collast); var collast = { label: '销售凭证项号', name: 'Brand', width: 100, align: 'left' }; cols.push(collast); + /* ct.style.display = "none";*/ + //ct1.style.display = "none"; + //ct2.style.display = "none"; + //ct3.style.display = "none"; } else { + var collast = { label: '客户编码', name: 'CusCode', width: 150, align: 'left' }; cols.push(collast); var collast = { label: '客户名称', name: 'CusName', width: 150, align: 'left' }; cols.push(collast); } + if (Type = 2) + { + var collast = { label: '状态', name: 'Status', width: 150, align: 'left' }; + cols.push(collast); + } $.ajax({ @@ -178,6 +190,8 @@ InvCode: $("#txt_InvCode").val(), Area: $("#txt_Area").val(), WHCode: $("#txt_WHCode").val(), + CusCode: $("#txt_CusCode").val(), + CusName: $("#txt_CusName").val() } $gridList.dataGrid({ @@ -404,6 +418,8 @@ InvCode: $("#txt_InvCode").val(), Area: $("#txt_Area").val(), WHCode: $("#txt_WHCode").val(), + CusCode: $("#txt_CusCode").val(), + CusName: $("#txt_CusName").val() } $gridList.jqGrid('setGridParam', { postData: { queryJson: JSON.stringify(queryJson) }, @@ -691,7 +707,7 @@ -
+
拣料 @@ -755,6 +771,20 @@
+ ： + +
+ +
+ + + ： + +
+ +
+ +