Merge commit 'f14a88dc70e0aa0f1d269a6c9d3ffc329583b906'

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

@@ -800,7 +800,7 @@ a.ExtensionID
                     }
                     #endregion
                     #region 销售出库（合并发料）
-                    else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription()|| TransType == TransTypeEnum.DisPatchInspect.GetDescription())
+                    else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription())
                     {
                         sqlCheckSign = @"select * from ICSConfiguration where code = 'OutWithLocationCode007' and enable = '1'";
                         flag = DBHelper.SQlReturnData(sqlCheckSign, cmd);