diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 547ca5f3..0def82f7 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 5f66f7c9..f561fa68 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -38,78 +38,78 @@ namespace WMS.Web.Domain.IService.Public /// erp:单据查询-采购入库单 /// /// - 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 + ")";