From 99de43d1d844260e6596fd7a695ef5577e3cbb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=99=94?= Date: Mon, 12 Jun 2023 11:20:35 +0800 Subject: [PATCH] no message --- WMS-BS/NFine.Application/WMS/PickMaterialApp.cs | 2 +- .../Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index 25ac7f5..95a42fa 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -1143,7 +1143,7 @@ f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1, end as IsNew, case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy, case when sum(a.Quantity)=sum(a.TransferQuantity) then '已过帐' - when sum(a.Quantity)!=sum(a.TransferQuantity) and a.TransferQuantity>0 then '已配料' + when sum(a.Quantity)!=sum(a.TransferQuantity) and sum(a.TransferQuantity)>0 then '已配料' else '未配料' END AS Status, 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 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 6249a46..b1286fc 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml @@ -10,6 +10,7 @@ var flag = '1'; var mark = '拣料'; var Arguments = ''; + $.ajaxSettings.async = false;//设置全局同步 //var PickID = ''; $(function () { @@ -194,7 +195,6 @@ } function gridList() { - var Type = $("#selShow").val(); var $gridList = $("#gridList");