Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

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

@@ -1040,11 +1040,18 @@ namespace NFine.Application.WMS
                 string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
                 string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
                 DateTime MTime = DateTime.Now;
-                string sql = string.Empty;
+                string check = $@"IF EXISTS (SELECT ID FROM ICSWareHouseLotInfoLog WHERE TransType='15' AND TransCode IN ({codes}) )
+                             BEGIN 
+                                RAISERROR('单据已占料，请先取消占料',16,1);
+                                RETURN
+                              END;"; 
+                //Repository().ExecuteBySql(check);
+                SqlHelper.CmdExecuteNonQueryLi(check);
+                string sql = String.Empty;
                 StringBuilder msg=new StringBuilder();
                 if (type == "14")
                 {
-                    sql = $@"SELECT a.RCVCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.RCVQuantity as IssueQuantity     
+                    sql += $@"SELECT a.RCVCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.RCVQuantity as IssueQuantity     
                                         FROM ICSManufactureReceive  a
                                        left JOIN ICSInventoryLotDetail b ON a.RCVCode=b.TransCode AND a.Sequence=b.TransSequence
 		                               left JOIN ICSInventoryLot c  ON c.LotNo=b.LotNo
@@ -1054,7 +1061,7 @@ namespace NFine.Application.WMS
                 }
                 else if (type == "15")
                 {
-                    sql = $@"SELECT a.InCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.InQuantity as IssueQuantity
+                    sql += $@"SELECT a.InCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.InQuantity as IssueQuantity
                                        FROM ICSOtherIn  a
                                        left JOIN ICSInventoryLotDetail b ON a.InCode=b.TransCode AND a.Sequence=b.TransSequence
 		                               left JOIN ICSInventoryLot c  ON c.LotNo=b.LotNo
@@ -1064,7 +1071,7 @@ namespace NFine.Application.WMS
                 }
                 else if (type == "16")
                 {
-                    sql = $@"SELECT a.ApplyNegCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.IssueNegQuantity as IssueQuantity      FROM ICSMOApplyNegDetail  a
+                    sql += $@"SELECT a.ApplyNegCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.IssueNegQuantity as IssueQuantity      FROM ICSMOApplyNegDetail  a
                                        left JOIN ICSInventoryLotDetail b ON a.ApplyNegCode=b.TransCode AND a.Sequence=b.TransSequence
 		                               left JOIN ICSInventoryLot c  ON c.LotNo=b.LotNo
                                        WHERE a.ApplyNegCode in ({codes}) 
@@ -1073,7 +1080,7 @@ namespace NFine.Application.WMS
                 }
                 else if (type == "17")
                 {
-                    sql = $@"SELECT a.SDNCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.SDNQuantity as IssueQuantity     
+                    sql += $@"SELECT a.SDNCode as Code,a.Sequence,SUM(c.Quantity) as Quantity ,a.SDNQuantity as IssueQuantity     
                                        FROM ICSSDN  a
                                        left JOIN ICSInventoryLotDetail b ON a.SDNCode=b.TransCode AND a.Sequence=b.TransSequence
 		                               left JOIN ICSInventoryLot c  ON c.LotNo=b.LotNo

WMS-BS/NFine.Web/Areas/WMS/Views/DeleteReceipts/ICSDeleteReceipts.cshtml

@@ -1176,6 +1176,7 @@
             InvCode: $("#txt_InvCode").val(),
             InvName: "",
             BatchCode: "",
+            WHCode:"",
             Container: "2",
         }
         $gridList.dataGrid({
@@ -1456,11 +1457,11 @@
         else
         {
             for (var i = 0; i < objList.length; i++) {
-                var strValue = $("#gridList").jqGrid("getCell", objList[i], "IsOccupy");//得到单元格数据
-                if (strValue == "已占料") {
-                    $.modalAlertNew("WMS00116");
-                    return;
-                }
+                //var strValue = $("#gridList").jqGrid("getCell", objList[i], "IsOccupy");//得到单元格数据
+                //if (strValue == "已占料") {
+                //    $.modalAlertNew("WMS00116");
+                //    return;
+                //}
                 var strValue1 = $("#gridList").jqGrid("getCell", objList[i], "Status");//得到单元格数据
                 if (strValue1 == "已过账") {
                     $.modalAlertNew("WMS00118");