回写逻辑最终版

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -687,8 +687,8 @@ namespace ICSSoft.DataProject
                     #region 判断是否启用匹配库位
                     string sqlCheckSign = @"select F_EnabledMark  from Sys_SRM_Items where F_EnCode = 'OutWithLocationCode'and F_EnabledMark = '1'";
                     DataTable flag = DBHelper.SQlReturnData(sqlCheckSign, cmd);
-                    //if (flag != null && flag.Rows.Count > 0)
-                    if (true)
+                    if (flag != null && flag.Rows.Count > 0)
+                    //if (true)
                     {
                         sql = @"select * into #maintemp from  (" + sql + @")a 
                                     select * into #resulttemp from #maintemp 
@@ -807,9 +807,9 @@ namespace ICSSoft.DataProject
 
     
 									select id,TransCode,DetailID,Type,TransSequence,IssueQuantity,Quantity,
-									[User],[MTime],InvCode,InvName,InvStd,InvUnit,WHCode,ToWarehouseCode,LocationCode,sum(LocationQty)as LocationQty,isMatched,AmountUnit,lotno,
+									[User],[MTime],InvCode,InvName,InvStd,InvUnit,WHCode,ToWarehouseCode,LocationCode,sum(LocationQty)as LocationQty,isMatched,AmountUnit,--lotno,
 									WHName,ExtensionID,ProjectCode,BatchCode, Version,Brand,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10 from #resulttemp GROUP BY id,TransCode,DetailID,Type,TransSequence,IssueQuantity,Quantity,
-									[User],[MTime],InvCode,InvName,InvStd,InvUnit,WHCode,ToWarehouseCode,LocationCode,isMatched,AmountUnit,lotno,
+									[User],[MTime],InvCode,InvName,InvStd,InvUnit,WHCode,ToWarehouseCode,LocationCode,isMatched,AmountUnit,--lotno,
 									WHName,ExtensionID,ProjectCode,BatchCode, Version,Brand,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10 ORDER BY locationcode ASC ,InvCode ASC