From 7d6c9268cc882e3e519a0f0220dacb696648a239 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 13 Nov 2023 17:38:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/Public/ErpService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 142bc3ee..8c1efb16 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1463,7 +1463,7 @@ namespace WMS.Web.Domain.Services.Public //3.未出库数量>0 //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockId in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1540,7 +1540,7 @@ namespace WMS.Web.Domain.Services.Public //3.未出库数量>0 //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1617,7 +1617,7 @@ namespace WMS.Web.Domain.Services.Public //3.未出库数量>0 //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1694,7 +1694,7 @@ namespace WMS.Web.Domain.Services.Public //3.未出库数量>0 //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1771,7 +1771,7 @@ namespace WMS.Web.Domain.Services.Public //3.未出库数量>0 //4.日期>=系统上线之日 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID - param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly'"; + param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; From 35785f6d0149d21846a43308a2a4618db774f4a6 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 13 Nov 2023 17:53:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Public/ErpService.cs | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 8c1efb16..a5daf6f7 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1460,8 +1460,7 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 + //3.单据类型:标准 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; //string srt = JsonConvert.SerializeObject(stocks_codes); @@ -1537,9 +1536,8 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1614,9 +1612,8 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1691,9 +1688,8 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; @@ -1768,9 +1764,8 @@ namespace WMS.Web.Domain.Services.Public //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 //2.审核状态：已审核 - //3.未出库数量>0 - //4.日期>=系统上线之日 - //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID + //3.单据类型:标准 + //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID param.FilterString = "FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "' and FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); //param.FilterString = param.FilterString + " and FSrcStockID in (" + srt.Substring(1, srt.Length - 2) + ")"; From 79374270ef691e6e82ec526e6822722967a23b9d Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 14 Nov 2023 09:13:38 +0800 Subject: [PATCH 3/4] 11 --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 228751 -> 228751 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 0d472f8861c72d4e8fb2f41c191bb6f7894fe28a..3447264783894c3488947434564749ba8c3210f3 100644 GIT binary patch delta 6173 zcmeI03vg7`8OQg0H{Wg&5<&t(Q6S=R0>wD2o(iIvC2z8_IN?w(EquQT>+V?Gwn>LLuUT>`+ev8 zpR;$e=W+MWJ{>>%biAlHMZ6?Lsby|yLp4IiwHCL_(G94Z$dj!TC`&dB|Q3x0DVnA3LICK+(AIqswK*VCo|e52p3zXLnMCftwjJgswJvl#ewB522%RvbvbE zM0Y(@EBQ(xpMVH5pp$4j1)YY@Knd>fQK;!* z7*P*pK^OP^VLv~70Z726$Ja3$(eU|#c4vJPx&s<~F(~Lf7EzB|3sHYq9HRc9ctq`u zK~3MtX%oQP&!AUy^h&@483%dNR-1)Q~j>QC+ewa zV~&`w4DM;+5(=m&O;MUy6KjewKrx1;Vl~79{JQ3sAMT_2!M8|{5a1pb{!}#UV1)=h z7-m+r+)7-e5|2u4RtavUPNb5EN)oHOZlzwNQXiG8ST%4f$zElUrBYD3n$$`RWEJ3u=kHmCQIsP3bz8 zuP>+RB3GN4T82D$$nz1TPl*dEG; za-a^-Yv{Qi%4PZP3Tl#+hqg_~J0ji)bz*sB1@(&Q4DJH`Y~Bf)M)|m<7wBs0%Cc*j z(bkMvNdC^;Kj=27KQsUu2;B}1f_@I&0S$)kgnj}25;~9mcX7U)WEh?DhUj^AxAUFa z^C#M#M)pMw2Z7hSs zHlVhZn$>Hlu1G8MT=%jni@1Q=RmNu5u{0_wP2K1D#xXcN8c_T0GyANixgxdPbB$+J z9&rJ+t6ZLcl~&$7!86^@YC^;W)FvkYCVI997##jYptemk8`Up@nNA}*kI zIRWsHXPeC6@L)h~a{}Nuo-N4WunnkfP5@MRwke$$N!SO}J|_SwJ>PE`9JT?qtK<#n@;1SO@jlto;fZFB+z@wh+F$RZiKy7mZV7h0U(V3BieL(GV z0$`@+dz`^x8&KP3vMj5h{;9J(*KAg^A}*kI%`%_cOgSR8%5zn-s*1RP+EpdbzeDYU zb3D@%tmZ^aKy7jYV6JET9fQO71=Kbt0Ool%$>6XJsBKOF^bzg?z12*sq%{5r^xA|{|V)v%e~-&i2bku&MLT0Iwe=EbZQMa)2Lb^>6DXIskP z@C^gCZ3&xVsL?4(j@m;54fOtEN^U_2+t>dNj?X;ekrr7B- zUfS@&H1)!?NjUY}xAZ5uql3{TVH6kG`zba{K(TDRpOO8z!UWCOk+1;)Cd!0wXjA$m&DdG6Z2+)$U}FGa zcfiUAVEJRU11euWNcV{JshY8ju|@${s91#nEJZ9c0M;575@4pRK1B8Xvoz0=&mW@R z=~bGsKvXXQ=q208Bv4F2K`l_Fh8Qi@*Y% zEnqo$Ddh%gbb<-8ZYlLN5*FzUGXP&NV2L^7J4zM7WgLpOa1IuzXBoj#>j>3#c*uH= z@x6y|nWL6-A4omVxQ1fY3RW+$TFGh^{Agdz>d&lR8#Ah^dqqVOo-Os?qynEWTODj82*~#kD zODmrZKxr4N&)w1&k>Pfu@+GT(x|OdYm9J6R!)mWv*%ztoN9BMVxsQtckstkC{_l?X zfP2Ktn#Hu@KYo6TWpcSiU4s`rm~F5hpWMl4sf~8(&OklO^i!NW?JV`4ow{?)QXkl< zJHITo^}=+!ow_s0QahYaz>WyY1ASD36HoPu{^kf`u@aMB%+7&dgNQYs+fjX6&JrAIfC{d zdnFP=yMn%hEa)h74Ei2A4xNBbLZ_h9&>83~bPhTX`TY4xKm-~7{45m(V8{;zplB!t ziiPw$lv;>_^D8Rqx{qkF=8Zj!xU}TU?ErFUp)oahxwZZyuh{+@Z`edry{Ys!*Ay8| xq66*>l)J_l1G`^5;q3YM(|(c2aivCQQDm+zHKudC{x5yx{g=$-a^wD(e*sGUI@tgK delta 6399 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 Date: Tue, 14 Nov 2023 09:22:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 177976bd..21e32446 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -320,7 +320,9 @@ namespace WMS.Web.Repositories var list = await _context.OutStockTask.Include(x => x.Details) .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && - (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync(); + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) + .ToListAsync(); var response = _mapper.Map>(list); //获取物料信息 显示物料三件套 foreach (var r in response.SelectMany(s => s.details)) @@ -371,6 +373,7 @@ namespace WMS.Web.Repositories var entitys = await _context.OutStockTask .Include(s => s.Details) .Where(w => billNos.Contains(w.BillNo)) + .OrderByDescending(o => o.Id) .ToListAsync(); return entitys.Clone(); @@ -418,6 +421,7 @@ namespace WMS.Web.Repositories .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .OrderByDescending(o => o.Id) .Select(s => s.BillNo) .ToListAsync(); }