From 98a5e98f0a7f4956003bfbde8c53a86f5ac6cf3f Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Tue, 5 Mar 2024 17:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    | 16 +++++++++++
 .../Services/Public/ErpService.cs             | 28 +++++++++----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 98760bb7..80086bd1 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -176,6 +176,14 @@
             <param name="qty"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.Box.OutStock(System.Int32,System.Decimal)">
+            <summary>
+            出库
+            </summary>
+            <param name="materialId"></param>
+            <param name="qty"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.BoxDetails">
             <summary>
             老ops箱信息明细
@@ -4319,6 +4327,14 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBox_OutStock(WMS.Web.Domain.Entitys.OutStock,System.Boolean)">
+            <summary>
+            出库
+            </summary>
+            <param name="outStock"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.ExportExcelService.Export``1(System.Collections.Generic.List{``0},System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
             <summary>
             列表页导出
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index daa41e58..3f5a2085 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1609,8 +1609,8 @@ namespace WMS.Web.Domain.Services.Public
                 //3.未出库数量>0
                 //4.日期>=系统上线之日
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0 and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0 and FMaterialID.FERPCLSID not in (10,11,6)";
                 //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
                 for (int i = 0; i < stocks.Count(); i++)
@@ -1703,8 +1703,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型:标准
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")";
@@ -1796,8 +1796,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")";
@@ -1889,8 +1889,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -1982,8 +1982,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -2075,8 +2075,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //3.单据类型:标准
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
                 //param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -2174,8 +2174,8 @@ namespace WMS.Web.Domain.Services.Public
                 //2.审核状态：已审核
                 //4.日期>=系统上线之日
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                //6.物料 物料属性=费用或资产的排除 不拉取
-                param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11)";
+                //6.物料 物料属性=费用或资产或服务的排除 不拉取
+                param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11,6)";
                 //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
                 //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
                 for (int i = 0; i < stocks.Count(); i++)