From 4c96955dead96785f686ec67c9a71a7725d942f2 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 7 Jan 2022 08:58:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo | Bin 79872 -> 79872 bytes .../HQFSettledDetailDapperRepository.cs | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo index 59036805337d503f235961294f2ad03e5276d10c..84ff170240337bbf06359ea25c8fa083f0d4bf83 100644 GIT binary patch delta 1418 zcmc(fOH31C5XU>qqP5+Ymh!3;x=1NVD7JM8nh;YTQA|joYLtr+v2yU@gI24eRD1-K z1Ko*MjR$Fr@gmXgp;r=m(*wrDc*lcY3@nTp$LC2oWVN5|@Y=ahbS6TqTBxYs7V8n1~aq(3MwvZt~HeYB$*6pn6c?!eJ>6>TB|2C-pK>M{FT@ z9mfr_*g_N4Amdx}1f~6x#Cl5zR*MPAg^`L`NhU|3&^f1R{vTdbGH23N(vcis;XP1~ zQA^MSTn`qo>aWE`OAu!SA5}4Gy$MJ0o3&eC``Z?r-YH_N^etuuFGg(R4L4|Ugt$rE zB5o6Rh%tiCWt*VO1_>%!y%yf`1k|z!9K&eYF!*ti+E$E~AJ*r#<`SVTl=pzd`COBU zan+rb_zLiK;3rlxwBVkVc*1w7;4C)N%tIZD2qdP})7daQKu* z347Z;{eDI9>^v1d?cdSv_qMg4)LxE$sl*3?W{d}(bZdOfkWD%S5wDPI8cgx(G8g@3w$n0`fDJTiJ4&(@WPSiOmhW%FyhGE T8I%X*%-t3U3Ym{CXtMnRd*#q& delta 1815 zcmchXUrbw79LIaEWt8?7N9)!`oJ?KE#x{+{ETN8)L5L%xHPg)W zIuo6&)3(3FZrNTW*`F5^>^0%VhsF6oHjO4G3-NWD%ol@ZBwLJszCY|mlGQ}_;7LCB zckcQ7JKx{$9A!nXtmt$5h2@jcUxhG`Q|heQ@3P+dOj;IpN=q5htFB5WA!HKzwv1J$ z)BRB{zr)(_Uk!|)4!FQ?Xg9-}z@vbN^H{Cam)o@ecKmmMPT&Bwfcv~<`xvYncyzjq z?mQ}w10UE7{2%~&z!M+{LZBD)fqt+BguwuafURH~*bbuLNiYa@fEd^bhQKbsjyw%J z40f}N&!F-wcn<6Vaj+MRfP?wb2J<0Qo(C_0ck`oH3R1kHt|4`GQ-jFVU>GaL3TY~_ z%2j}sWd~Sgwp<#^b)I8DT~nEr*XHxMf2ne&lFa|3%81c}GCzdMq&GUqV$_q%81u3Y zZP3GB)?{OLIm>O`u#`1A3PyX)dZN(I#_s&gG>w_QmsvzkO}6xw*;U0U^%cD?-;_Di zHGR2@Qs$Nav?(nZ7xFWD8mqf)7F}44J=8W5U6i(rnAh%h#mK?Rq+4{Zi%w^TD;HDAkZHG^KdOri|#JReb%F?mknp?GlxakuCIJ zHw(^5zQOCu#N2xIUcW(9SgZM~YyqUaP#Gm+o2P6@8_`kezZf z?qWwB&Un#Lpxy)4>KDJ}=S4?i)I&Ya1EjdUboJ7*WpnQ5siPN8y!7q)u~Sno>uwZt zZV{y5p2O7cxt&kg+fQTGTzT&^uvu^xybnJ3E7k^eyz!zaxxNr<0dGOi`l*$u9?#zW zmYZ@DnwvLv-EI9w=G&>=Mvjln57#-sW!@_l+_48-#JFHlaf_Jd=Dc4jSe|<5B-kel zY$gNEYnhM0uOpXI5Mkz|;I~y90gck3jKKR7YLm#)5ixKEYQ1VIoUI~Dv{tR%_Dc=L z96$YY44gKD76V#xMoPo)4Y?+g14oj5y#s;d)`5vYe{y0Xkcjk!0*P=k5g8v3MnbP_ zQ9nNYV>8w5@R1U`-1_Fp=-$cMBg2!^$=Sh^v&W{>smWun9#2juROO=b3bL zsW{>hk+tC8aoXk=B$7T=ROPBtT^urruo^DiIDFYB(7fA9W9dzcHjB9P2%Y+2iX5|! t#knr=nxNx{e2cy&am)0fLoCxf(Kjd;odJXN`Gq+O25J}2xx~?iKLI9-F(v>2 diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index f61dc81f..d78f62fe 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -126,11 +126,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report ////} if (!string.IsNullOrEmpty(begin)) { - condition += string.Format(" and a.BeginTime>='{0}' ", begin); + condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); } if (!string.IsNullOrEmpty(end)) { - condition += string.Format(" and a.BeginTime<='{0}' ", end); + condition += string.Format(" and b.LastModificationTime<='{0}' ", end); } //if (!string.IsNullOrEmpty(cp7begin)) //{ @@ -180,7 +180,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " (\n" + " SELECT\n" + " b.WmsBillNum AS 交货单号,\n" + -" a.CreationTime AS 交货时间,\n" + +" b.LastModificationTime AS 交货时间,\n" + " b.IsAuto AS 手工或自动,\n" + " a.StorageLocation AS 收货仓库,\n" + " a.StorageLocationDesc AS 收货仓库描述,\n" + @@ -202,7 +202,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " AND a.MaterialCode = b.MaterialCode\n" + " LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" + " WHERE\n" + -" ( a.HQHKanBan <> 'BJ' ) and a.Version='{0}') AS temp1\n" + +" ( a.HQHKanBan <> 'BJ' ) and a.Version='{0}' {1}) AS temp1\n" + " LEFT OUTER JOIN (\n" + " SELECT\n" + " Price,\n" + @@ -271,11 +271,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report if (!string.IsNullOrEmpty(begin)) { - condition += string.Format(" and a.BeginTime>='{0}' ", begin); + condition += string.Format(" and a.LastModificationTime>='{0}' ", begin); } if (!string.IsNullOrEmpty(end)) { - condition += string.Format(" and a.BeginTime<='{0}' ", end); + condition += string.Format(" and a.LastModificationTime<='{0}' ", end); } string str = @@ -307,7 +307,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_HQ_H_Platform \n" + " WHERE\n" + " version = '{0}' \n" + -" AND HQHKanBan = 'BJ' \n" + +" AND HQHKanBan = 'BJ' {1}\n" + " GROUP BY\n" + " MaterialCode,\n" + " StorageLocation,\n" +