From bb3a28bcfdda9a656a676914b608d689f2c9cc10 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 29 Jul 2024 14:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=91=E8=9D=B6=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 275060 -> 275060 bytes .../IService/Public/IErpService.cs | 26 +++---- .../Services/Public/ErpService.cs | 70 +++++++++++------- 3 files changed, 57 insertions(+), 39 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 547ca5f3bcc85d6ef8ea06e408957bc954d311c4..0def82f745606e5bfa16057028901f5923d95364 100644 GIT binary patch delta 4233 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 /// - Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-其他入库单 /// /// /// - Task> BillQueryForMiscellaneous(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForMiscellaneous(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-直接调拨入库单 /// /// /// - Task> BillQueryForTransferDirect(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForTransferDirect(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-分步式调入单 /// /// /// - Task> BillQueryForTransferin(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForTransferin(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-组装拆卸单-组装（成品入库） /// /// /// - Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-组装拆卸单-拆卸（子件入库） /// /// /// - Task> BillQueryForAssembledApp_Disassembly(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForAssembledApp_Disassembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-出库单 /// /// - Task> BillQueryForDeliveryNoticeOutStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForDeliveryNoticeOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-直接调拨出库 /// /// - Task> BillQueryForTransferDirectOutStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForTransferDirectOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-分布式调出 /// /// - Task> BillQueryForTransferOutOutStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForTransferOutOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-组装拆卸单(拆卸 主出) /// /// - Task> BillQueryForAssembledAppOutStock_Dassembly(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForAssembledAppOutStock_Dassembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-组装拆卸单(组装 子出) /// /// - Task> BillQueryForAssembledAppOutStock_Assembly(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForAssembledAppOutStock_Assembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-其他出库 /// /// - Task> BillQueryForMisDeliveryOutStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForMisDeliveryOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:单据查询-销售出库单 /// /// - Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null); + Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true); /// /// erp:查询销售出库单信息 /// diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 2d726695..e0c5f6f3 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -160,7 +160,7 @@ namespace WMS.Web.Domain.Services.Public /// 模糊搜索 /// 单据编号集合精确查找 /// - public async Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null,bool isCheck=true) { string result_json = ""; try @@ -193,7 +193,8 @@ namespace WMS.Web.Domain.Services.Public //4.明细关闭状态：正常 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'"; - param.FilterString = " FDocumentStatus='C' and FMRPCloseStatus='A'"; + param.FilterString = " FMRPCloseStatus='A'"; + if(isCheck) param.FilterString += " and FDocumentStatus='C'"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) @@ -284,7 +285,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForMiscellaneous(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForMiscellaneous(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -317,7 +318,8 @@ namespace WMS.Web.Domain.Services.Public //3.单据类型：标准其他入库单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //param.FilterString = " FDocumentStatus='C' and FBillTypeID='d772ead981e748d69dda1caac7583f8c'"; - param.FilterString = " FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) @@ -394,7 +396,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferDirect(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForTransferDirect(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -428,7 +430,8 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取 //param.FilterString = " FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; - param.FilterString = " FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FSrcStockId!=FDestStockId"; for (int i = 0; i < stocks.Count(); i++) @@ -507,7 +510,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferin(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForTransferin(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -541,7 +544,8 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取 //param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'"; - param.FilterString = " FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FSrcStockId!=FDestStockId"; for (int i = 0; i < stocks.Count(); i++) { @@ -620,7 +624,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -653,7 +657,9 @@ namespace WMS.Web.Domain.Services.Public //3.单据类型：标准组织拆卸单；备注：这里的单据类型只有一个，所以就不需要判断了 //4.事务类型：1为组装，2为拆卸 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = " FDocumentStatus='C' and FAffairType='Assembly'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; + param.FilterString += " and FAffairType='Assembly'"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) @@ -730,7 +736,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForAssembledApp_Disassembly(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForAssembledApp_Disassembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -763,7 +769,9 @@ namespace WMS.Web.Domain.Services.Public //3.单据类型：标准组织拆卸单；备注：这里的单据类型只有一个，所以就不需要判断了 //4.事务类型：1为组装，2为拆卸 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = " FDocumentStatus='C' and FAffairType='Dassembly'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; + param.FilterString += " and FAffairType='Dassembly'"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) @@ -1777,7 +1785,7 @@ namespace WMS.Web.Domain.Services.Public #endregion #region 出库 - public async Task> BillQueryForDeliveryNoticeOutStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForDeliveryNoticeOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -1812,7 +1820,9 @@ namespace WMS.Web.Domain.Services.Public //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //6.物料 物料属性=费用或资产或服务的排除 不拉取 - param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; + param.FilterString += " and FRemainOutQty>=0"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; @@ -1878,7 +1888,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferDirectOutStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForTransferDirectOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -1911,7 +1921,8 @@ namespace WMS.Web.Domain.Services.Public //6.物料 物料属性=费用或资产或服务的排除 不拉取 //7.V01.05.00: 当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取 //param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; - param.FilterString = "FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; param.FilterString += " and FSrcStockId!=FDestStockId"; //string srt = JsonConvert.SerializeObject(stocks_codes); @@ -1977,7 +1988,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferOutOutStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForTransferOutOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -2010,7 +2021,8 @@ namespace WMS.Web.Domain.Services.Public //6.物料 物料属性=费用或资产或服务的排除 不拉取 //7.V01.05.00: 当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取 //param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; - param.FilterString = "FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; param.FilterString += " and FSrcStockID!=FDestStockID"; //string srt = JsonConvert.SerializeObject(stocks_codes); @@ -2076,7 +2088,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForAssembledAppOutStock_Dassembly(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForAssembledAppOutStock_Dassembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -2108,7 +2120,9 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID //6.物料 物料属性=费用或资产或服务的排除 不拉取 //param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; - param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; + param.FilterString += " and FAffairType='Dassembly'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; @@ -2173,7 +2187,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForMisDeliveryOutStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForMisDeliveryOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -2205,7 +2219,8 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //6.物料 物料属性=费用或资产或服务的排除 不拉取 //param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; - param.FilterString = "FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; @@ -2270,7 +2285,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForAssembledAppOutStock_Assembly(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForAssembledAppOutStock_Assembly(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -2302,7 +2317,9 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID //6.物料 物料属性=费用或资产或服务的排除 不拉取 //param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; - param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; + param.FilterString += " and FAffairType='Assembly'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")"; @@ -2370,7 +2387,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null) + public async Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -2405,7 +2422,8 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //6.物料 物料属性=费用或资产或服务的排除 不拉取 //param.FilterString = "FDocumentStatus='C' and FBillTypeID='ad0779a4685a43a08f08d2e42d7bf3e9'"; - param.FilterString = "FDocumentStatus='C'"; + param.FilterString = " 1=1"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";