From df4095c6dd617b1840cd171f6883a26b13e0fc69 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 20 Nov 2023 15:57:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 231119 -> 231119 bytes src/WMS.Web.Domain/Entitys/OutStock.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 9f72895cab5a58af7e8d55a44b8b8087e6f70fd9..16c6b4cc8f667e3a39c40ecd1f5e8c94be097a19 100644 GIT binary patch delta 5596 zcmbuC3v^V)8OQg2ckgV7l7s+xkdSO3kU+v_H=Aq{iI9X>g1nJA8`Jh|OjG9Gu53`0Un>-FHR*MMVAvP(*9L=C!Ejq;O=UpW!+vj@ z*IN_TYpUAo{9$jcU#~-JIOy|Nhiluz?X~T?x3aF?A8vCj;QJbt7G6D*9yVH2$fUlV z8y9oEg&O--++E3UYouDftAR@R);cBCIFe33R(M+`?d;orcL`s+Rhhugw9s_Eq>;kL zwz2eWg|{}*7-MH6rIDf;duP!KHASoTRC~ORLcX+-3VHK9dR6J`dq($h_jF}6U!YJr z&vsLjGL=7a4Th>}rl0dkMO31A_`)J8ez1iuQ8w}5H){fqoc3xh=jY=^^`ByyL&pi zBA3_TVc9_Sjp1-dFZ^KVlJ2h6dZ-uGTD`lsL+_a}GS%&_kLbOju5LZJcCFvzvzpM@ zs&}@}>WW~KB6@g6eZ_EJ_CwIhmYz9Z)k8P;2HQHLI--U)=!2KKq3h<(aFf0~*x3;d z_UhrrWG{W0-mZ7+k&x`&`kw__ldiaM*0bs>{?(m2ay*OXTsaH(*|>J?;1b<}J9fD6 z^sU9xINa81x@6F`j`94F2zGjfn|AXBMdVSo%cE1zmlV?k16v&;9(qh^<sEnQ?*8;~1IV(zC21+_);z)zjM%a?G;UrSAnC_?NT)=oKm!c8KnfV);+wi?ax@n)qv4MMV?h?k1~NVe8I*uhFa?aa$C(OSj#UOQUUYE4ax}<66NCMy15HC852yfMaN)q|_P{=9 z^7@rPjv*&M%@rNqdFYJ&2&e)IE+7Yxbv0@gwd^eKR>n&|VEZ+w8T?w*a+H|9CT%8{c}5{+P+9Z=suwJ?E%=1pnn0q^sZFONV&Ri&SEi zq^RE+$)7k!8GgSx_!AB-ZVS?y%vhFb3RQz`#)bxwW}I53e%HyrK2E)Cp;MbJ`v@)G zHAbdjnkihGNU@a>NhKA^C7QU@Rz@b3G$`pBFYl+zqcc@&7V=WLXdb7DJiCJSdp)`IQhu8D9_m9Rz2kU%-L*;&zxLLP-|W1rE}hCcqgj!)C`9P z4=auZhJjUmW}TX+@JCD3`f{etPp+vcQZ3hBNK>R)uDyCDAAghzqq$a_y>zC?w_JO@ zOyRa%dy!00Y`ONzn4;8j?d32bWpEx_pj;M z5tqZB0cP@=GW9GqXb%R|anz`BWq>@!41<~#tqJ-pe%oSA!McOW+#t zWpFL{3b+oe1lMZ~B_ar;4TL}#=%5{}0ylsTuv#;wy-VLv79W?hL&FJY!}|3F@-2kl zLtcj?=C~uK#3-hU-)pBw$F%#E`@}A-G3F9S35M9Mp^T-9KWMQ_#U4%U#j~|bGe$j6 zQz^PHaiZVQ#6Fzp9P5lpQ=Z;<1>=v2us>uy_UI&xx?VXs`#vV9Ky~1>?;` z*k7|WID>I8W!#$@-@Ao2@wP3r$k_HG&7{KqM2}k)(Vy%9Q+DX*g`7EiNgL0mq?Wg<|pWCW~$yKv%N?~{tGNH0~QW>H+p=eC7 zixn4?6edR4N-E=D$y0Mi4apU0h)8Gr#m6YGJ;M$gl^iq^@@OW;T&#?RlEp;!#Yzs8 zTqed{tmHw-=O5&$OTW}7;%Nc5T%{sERH=ANN~0P^zgzDe3x4t&+mAPI@9}Q91fSbO@VP6j~1z3*M8Z!U*j(qsr$Hgh?Wk^ zV*G(a6k-Qt%mL&4A<80lP&x)JiM%18s@{ z%e9|kQ=Ax{gFdia`*}5muw45gHN{7kYd@H#_|$Ukr_mJWEZ2SnO_8a})H;eke3Vk6 z3X_ign3=*k+;t6iFR|Rz_=AHi99QF?B=}6RuA7^1Gc9#eB6#d@Hz)2!6LQ{gIi6#W zS~+$ylR37;Dod?$id9av${{JX``@S7GKPePRJ#-`1ANmvHw8fCF8yU zI+f)|?48JU-vk@LU7(8bB{gbOGM#@ji1O0E?GCP9CoMRCjcXeX?In zz9(M78GMfBr=pjmd4Quu~_&wuOj!}UTc#i%`w2N_ZoU$(44doAD8&-Eacm=!)_MmMq z*azMKiSMeN(Bj`!{D!-*gK}4n@?X`e?d%=7#>aSJojRv*zI(6DQf=X9G<9WQ+9^rxIa*XRrsuV9Ky~1tXRS6AboX7)%)!uVAcJ z>_OKUXO^fx%v=4Ebtvrzz!cjp*WPtg?66#WtMOVHeuBUFyeB4p!Eyi4IM=CWX}KpE z-krEROdSU1kIBJ^G2^Bu=@%>-OKBD+i=~+22%-H5z5@P%{Bf`R6ue)2#1;baF++*e z@d*>BnfR26Gq?`g&oc2D6X#egQ=Dh=qj7-25TDBu;SLu*8Wooy7xMF9qKRjz_3Op0 O&iSS>=IiPUBmN2VU;z;T delta 5903 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 A)Bpeg diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index a8af87ed..71bab547 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -84,7 +84,7 @@ namespace WMS.Web.Domain.Entitys /// /// 明细 /// - public List Details = new List(); + public List Details { get; set; } = new List(); /// /// 创建(需要在明细都生成后最后调用) /// From 0d8aa6e4ad464fc8e72d65f2c8f1443ae6a2ad18 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 20 Nov 2023 16:22:39 +0800 Subject: [PATCH 2/3] =?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/Controllers/TestController.cs | 1 + src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 2 +- .../Services/Public/ErpService.cs | 49 ++++++++++--------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 04fda4d8..a1db9efb 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -46,6 +46,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { + var result = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddHours(-2)); //var t=await _outStockTaskRepositories.Get(1); // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index ba136800..0f8bdafa 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -999,7 +999,7 @@ 备注 - + 明细 diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index cbd4067b..07dc914e 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1362,7 +1362,8 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",",stocks.Select(x => x.Id)); + //var stocks_codes = string.Join(",",stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //string.Join(",",stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token @@ -1372,8 +1373,8 @@ namespace WMS.Web.Domain.Services.Public //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1387,7 +1388,7 @@ namespace WMS.Web.Domain.Services.Public //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0"; - param.FilterString += " and FStockID in (" + stocks_codes + ")"; + param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) @@ -1444,7 +1445,7 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",", stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1452,8 +1453,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1467,7 +1468,7 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FSrcStockId in (" + stocks_codes + ")"; + param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) @@ -1522,7 +1523,7 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",", stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1530,8 +1531,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1545,7 +1546,7 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FSrcStockID in (" + stocks_codes + ")"; + param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) @@ -1600,7 +1601,7 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",", stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1608,8 +1609,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1623,7 +1624,7 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FStockID in (" + stocks_codes + ")"; + param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) @@ -1678,7 +1679,7 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",", stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1686,8 +1687,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1701,7 +1702,7 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FStockId in (" + stocks_codes + ")"; + param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) @@ -1756,7 +1757,7 @@ namespace WMS.Web.Domain.Services.Public var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); - var stocks_codes = string.Join(",", stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1764,8 +1765,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件：可能还有其它条件 - var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00"); - if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00"); + var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -1779,7 +1780,7 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); - param.FilterString += " and FStockIDSETY in (" + stocks_codes + ")"; + param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) From bb9332b930d85f1515fccc9d5efde7a6db02961e Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 20 Nov 2023 16:40:37 +0800 Subject: [PATCH 3/3] =?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/Controllers/TestController.cs | 2 +- .../Services/OutStockTaskService.cs | 73 +++++++++---------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index a1db9efb..445f1069 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -46,7 +46,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var result = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddHours(-2)); + var result = await this._outStockTaskService.Sync(null); //var t=await _outStockTaskRepositories.Get(1); // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 57eb2c08..08abcd2c 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -139,44 +139,43 @@ namespace WMS.Web.Domain.Services } } - //2.2.提交修改 - var isSuccess = await _outStockTaskRepositories.EditEntityList(data_list, isTransaction); + } + //2.2.提交修改 + var isSuccess = await _outStockTaskRepositories.EditEntityList(data_list, isTransaction); + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); + + //2.3剔除:已修改的单据 + foreach (var item in erp_removeList) + erp_list.Remove(item); + + //3.wms任务单的来源单据编号不存在于erp中，那么就新增 + if (erp_list.Count != 0) + { + var add_entitys = new List(); + var billNos = erp_list.GroupBy(x => x.SourceBillNo).Select(x => x.Key).ToList(); + foreach (var item in billNos) + { + var e = erp_list.FirstOrDefault(f => f.SourceBillNo == item); + var entity = new OutStockTask(); + entity.Create((OutStockType)e.Type, e.DeliveryOrgId, e.ReceiptCustomerId, (DateTime)e.CreateTime); + + //找到当前对应来源单据编号的集合数据 + var current_erp_details = erp_list.Where(x => x.SourceBillNo == item).ToList(); + //给到dto的实体明细中 + foreach (var erp in current_erp_details) + { + var detail = _mapper.Map(erp); + var erpDetail = _mapper.Map(erp); + detail.ErpDetails.Add(erpDetail); + entity.Details.Add(detail); + } + add_entitys.Add(entity); + } + //3.1提交新增 + isSuccess = await _outStockTaskRepositories.AddRange(add_entitys, isTransaction); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); - - //2.3剔除:已修改的单据 - foreach (var item in erp_removeList) - erp_list.Remove(item); - - //3.wms任务单的来源单据编号不存在于erp中，那么就新增 - if (erp_list.Count != 0) - { - var add_entitys = new List(); - var billNos = erp_list.GroupBy(x => x.SourceBillNo).Select(x => x.Key).ToList(); - foreach (var item in billNos) - { - var e = erp_list.FirstOrDefault(f => f.SourceBillNo == item); - var entity = new OutStockTask(); - entity.Create((OutStockType)e.Type, e.DeliveryOrgId, e.ReceiptCustomerId, (DateTime)e.CreateTime); - - //找到当前对应来源单据编号的集合数据 - var current_erp_details = erp_list.Where(x => x.SourceBillNo == item).ToList(); - //给到dto的实体明细中 - foreach (var erp in current_erp_details) - { - var detail = _mapper.Map(erp); - var erpDetail = _mapper.Map(erp); - detail.ErpDetails.Add(erpDetail); - entity.Details.Add(detail); - } - add_entitys.Add(entity); - } - //3.1提交新增 - isSuccess = await _outStockTaskRepositories.AddRange(add_entitys, isTransaction); - if (!isSuccess) - return Result.ReFailure(ResultCodes.DateWriteError); - } - } return Result.ReSuccess(); @@ -310,7 +309,7 @@ namespace WMS.Web.Domain.Services foreach (var entity in taskList) { if (entity.Type == OutStockType.Sal) - DeliveryNotice_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s=>s.SourceBillNo)); + DeliveryNotice_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); else if (entity.Type == OutStockType.Stkdirecttransfers) TransferDirect_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); else if (entity.Type == OutStockType.StktransferInst)