From 46817280e7b35518b275d72d32616ff6d8cf2f46 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 17 Oct 2024 17:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=8D=B3=E6=97=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
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
 src/WMS.Web.Api/Controllers/TestController.cs |   9 +-
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |  20 +++-
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    |   2 +-
 src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs   |  18 +++-
 .../IService/Public/IErpService.cs            |   2 +-
 .../Services/ProductInventoryService.cs       |  50 ++++++++-
 .../Services/Public/ErpService.cs             | 100 ++++++++++++------
 .../Services/TakeStockService.cs              |  23 ++--
 9 files changed, 162 insertions(+), 62 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 283ff789d555ef092d6441ab232e644afae2295d..e1dbf467c2fed9dfe4596e91234d8ebac7117f45 100644
GIT binary patch
delta 41161
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
IIpnba2iX&T0ssI2

delta 41166
zcmeHQ2bdJaw%)1go*tC2#04Y^A_B6@vI{FBvjU1p6eCF31R@zxLBM4}MFf$cw3rYx
zDuR(~!ki_VksxM3VUBAesPC^+UA4pD^P*4h_1-uAeKmE?f6l4Y)nR)6uKD)U)Nemc
z4egv4>eX>boAfrVv(pO-GBVPO+7=9HTbNapS(KgECM!KFyKS5FcG(3*ZL;z*+U4ct
z7v*PXwaL%U%gRn~Q<#&Umz7sI@0wa7l=<L&8B-U8N`^f=zogdcPWgp}t@GQo&d<-z
z%*@ZoDQY_;r%gedHaTr`it;mxGEiSu+w7eD`~sM>3koxeiZX_@&dF$-nU|N7kzUv?
zC6qm5chAtu-93floRpuRo{jp85SyP>P*^ymU1nxcdUjq$VPR3bw(WA-73F2-v}>JN
zIHX`myNs;tyn?JDs;TLjnRz)`8R;n^qg_gEf5|1H>dNkY#q>!{mPS%i?nSx}DK#Y}
z<$mPLkRAxI<;Yj~U#$_%8`gsPNvKaDJ&m*q=@}&D`Yh6Oe!I1zdGTWq-$YuCv<7J{
z(mJH|NCHJ{K>ikzg#0#gqlcis16}3s2KHBxtMXJC%KyDUe;;`z=&Cs%AgLy7M0!4w
zQk<fKK15Q5Z9>|N6yJy~(6=HTh5}S@5O`4BM{#js_-=!)D*6~n)$s|EDz|RXkWV2$
z6)8?h`3yq*0DTT!1)_B+FCe{y^fJ;bNUEUMkX}c611Wy=5<8JNniWy8+E;4dEk{~`
z^q?PGBbruMgQ%)=kbi+(Z43Oy>&1AnG~};XBx|mGXuVkO4x1m^|31AQ>QqW^gi1^4
z%@CAQS`8VSlFKsaYpmni5R@`U$jVV?5Y}18^&u#5^mEI}Iu*E*w?edmp<B;3&^sY|
zo1uO0iNNc<5WUM##lwu(2O)Z&p&svxI$2!ShauVsXp?TRYDB35w6NK>VoQiNtH_XF
zv8Gd_{Z?!EC`4P?pd%n-Q;^oTS;vn<w2kZDjk<L|J`K?)4AuO=K%a-`Glp_4^ks;?
zVCZ}c?Fi9!hI-VJX;pUGI=%|gPR4((E$d`+|8|AwYX#{BDOt5oXApMV*jNaP8s~}|
zMV*Qq`%Q?5WBmqoo$6Jo)H;6~f})%U!&!Ic`w)G{&`b;c7@{8-y16czxyMHD4bdKj
zFB}1QpN02_Xdk=xu5WhO&msDWp%X^RwESPJYl@&>6dv>nvg(!2AcTaOk3v96*u4OF
zBWc|n0R?V;g@&@W?oU{d%h1{nMeSl9kBA@-kf{~2s#RwY%Gu%$6HpRr1)ys^+`5$)
zba-5OkX3m)gHXXbR`dikHQpmPnek2)REeQcqh*}|+`cM;DkoM8Kv!GUmR3zr)wpUQ
zt7>%yp}KXfA)u&QD{VHl))bV+Q0f@7k7^65#ZaF0sw3zKhH{TIUiAdkWoVWSY#^vU
zL#tmlUX27bWN5SXYAonThU&i})7m$&jXO$E6NLv;0J7?Z&LA|kjz<e9suv|=G2NP3
z{1`#a82{=OQ+*3T%^BK1)<DM!YRS+EuNo*_P%DOdjx$heK^Y9qeO0FAWZF8~2+9P0
zz}W==Z<J--vIP`1{T6Q(!Srh<s4YXwUNbZDI6*lKMK6%GJMbPqUQl~LW)L8&LC_h5
z4z`991eCId_;i%4s^@uBP)9Dca#LAb&!ZCs<;Il?S(U0Y2%T)HoduM#QrQgvZ`8%Q
zog|>B?j1Yc^rfqylNnl$T6IIZ2|9(L)He*&UC^lv_1-3G*We!a6x0Kd>2VL?uOBa~
zwqaXuLA{i_o)Wqh0JPA@Hs>@!eYn&IY(=LF>dR2>g{JN^1)agre(QC%ptBgd#(MP=
zbPhwQ%}n6Ag8DNw_Dur~6f}UL2R}CFlEH!o0W$r7j7>qhwRyI+`GWFPY<#BxXtx6E
zRw$?-t~|)t6r>%Ctm6>O=%T~|0cgLW*6%z)LzSD~{TS1Y^92oKXz?dznvM`OoT2E&
z#%q+IkqkX&1IGv&&Cnd{HBQi2hAK5T({8+=3jmoRfs9Q-x@i~Mrd=fHLKPc7BmlJA
z#nx?tpo_VRXV;jvT_R{AL(5RBo_3Q3O;XUp&rF{#6*PsNmP{~CQw0?>)YE!R6I8;`
z?g_GbmFc$D%LGklyyHX@eTAUQ8G5#bfvyxZgQ14&40M&CnG99_+_Yr2pjix!wqA1t
zUCq!S>or%<H4Hs%z2*y=$58J}O!3zWTENiymIhiV=sJdOftNn?uNUM4GW!5BHU;Uy
zU1Ym?gP=t!Hhv!f&~7(cx0?jr$W@F!)>Ltepqt~WfQ(H+I(D&*y;acS#3}%2w<Xr?
zHbG0ciUu1@$L<hxJ42~onxVW)(47p8vR?NHx|^ZUWD|I=prs5wWxehfbRR>#tk(mA
zmNB%hl?hxSXgNa}ZyD$zK@T$2aJy;5BZ3}gsMvZvCg@RyMq96c2wKU|YU}lcpvM^+
zJjE3Ml%OXW+LmshRf3*o=mG2Xte|HYYL#KUo)`2SLv!CY(2IgzU})+N)6|y*y~NNK
z>-DOjR~Q<5sR?{t&}$5}c*j6*3VMT~XROy6L8}>xwl-et1g&Lgi4EK!Xgx#ocA7@K
zE$A(Vc3ZD^1---2R_pb?p!XQ+@UAI-qo5BMT32kKO@cmTs86PWwg}qHP`#-J`bf}L
zh8A0|j|FX0(8BkO)2D(yVW-$vrlp??`i!BT*6T|_Uof-{rR$?>hoJ3%%+UoIn}YP5
z-f8FbSAuq`*!ZIhfOh-Zy6qD5HCOSKtu-cSH$%lGrn%n;A_XnXGRU`rO4%vzeFJ?j
z=sSk`>@t1&QP2+zEw^5K1?^#IvGv+7XdgpAS+Ac3{lw7RX{PuTNxv{uIom)&Qb?j%
z{ub-yNRkW<vR+|HE<?|LU;-nOJcd^6Hg^SwNh$}(3~V{+mrOTz1?43juH56t5`Z4d
z3bIr1&9$PW3S8>Ijb?YHN~#oBDr9U5(y^6oY!ykB6RQBA-Ktu*YLcpQ6&){=!R<^9
zN!8=3s4o4`ho<2*C8Z^n3P6`y%a&SOQY|huwVe#UsML{kL|mzmu_;K$*0r(qB-Kr<
z0)Td_Z`~S5svlP#WNZr3jt#A2qhd)76AJ{O{f@MLjU^o!S0H3;3et{Etm9FVnk1G7
zK)W@yZbwUM%H<txEGk!+)|*++V<a_Go__ZnbMxLpQgeouZ!*xal3Fr!i}gyE)QX|d
zX5-abQU*gYc<EcvHj**{9WdDd=vHLeR%A=cQf~g_&1P1&lhl@>F{PrmF6=l-If;b<
z(1o?Pg&i-cJx30jVG27zQU``UIu17{9j$9rQb)#@!BtmsqNLo!N&x6eI@!q1k~(qZ
zK3mC2lDaTd@~t^#bd_{6L)*5PrgW2Z3PWSAG*EX*r!v%PtATn->cP+|>(yIQFNUUA
zuhS&;VW|8}6L`9$z6{Mf-auzcI)kBp*6VCZXE9V_p?;FiVJP~M2|QO)e}>jtuYr;V
zFf_+{4VE;Bp}JR@z<f!03~hp!{+?1OsQ{2UBNa%0{r4jHo-#yIk#dheBLUDuKGY8R
zd6I^5sZZL9&X+Wdq1+$LkdKfwoS`M#Omjv_8p%-lECY>^G@7B^)@z)ku?$^my~azr
zfT0c_o4|`CUC7Xz@X}v8CrG*&km(v^YzopHm}on2iKK}tHt45c(ot5`Pf{jJniN+A
zWL1RDAWV_-L-XlU8Kq*RsnF(8iR@fT(<DuYwlH>B7Zq@s<m_^tU7@oXI=fP5GdcJw
zc@oW%G+WLu7rK$ImM7C3>37&8PHCYkx<hs?#YZXKsf0Tr+=VE9u6YVS!^Cq*2y6Tm
zdqhrnvywOaW9G`7l}GOtmA&G-m3K9|M|R_GEY%|s!}ac7ly#q^`vc3eGRp(7ESIz*
zusm31c?gz=B|Q>Y9xbyx2FprG{|GFP2bN+~^aM;#N_r|VJzW;G3YKRiJsVh_E3-Tg
z%L|fT3@k5|Szd<a6-loKme<NGufy_&q&EZ0YGo-dEmeJ81Jhbb>jKmIvY-vHyd~-F
zgDvmC@~))!4z|1x%LkG+29^)YO4|g>W=UHD%T|f{v8g6}1k*N29|xvS%7Q+H<ugg2
z2bM3&EMLO1UDA$&EjwZPO48Q{TXw;+TT)D0iYcx*g6SJcrI-?P>03Q9?v<xvvIf%v
z(gUmqlL7ietOrv7`eUpIJ0AKItOvUr`YP6geT?y^=NSlgEgW8EJ=mepUuQkojnLPy
z&O1*H9c^Ge*kjP&NzmU<&^NIj>=W#N47}>$Rz0eaK4m=^f9PMb{++e&Owe~F=#-#;
z&%^lxKIhR@vU@2$=tqq79vLf7#e0=?>eMfT-zlhPN=htcIv!~6lQBvAWz40Y<c~FC
zRn<PxMX5vfX8JkUwZD{2hZF~oj~x<@K9;4U28bt@1B>fWIIwuuQcMw;$~kmcVA{jQ
z(czAoljUKn;84ZDR>_7@DlC;9suEa&(Ni&1VX5X&^@A-nU`cbRW?-qMN(+v^+AtmA
zP@Q;_Zh2i;>N!;ZU`qp78af9a&IcULje?jX%bML7F-@GfgRJcM3yv~<!amCB%qQ%o
z4u(DEnd9MRN^#U=3C0|f!+J2%&?Bq|;|sk!>v~YpU5uNG4+auaaa9J&W?zj2y*BGS
zR%&Nb-2}Zsf}VJIG-i7+1c*<V-8Ey8`6+XWXQ8^p9C(F+ey!hiuWV9KPF-u7JGrsL
zF=<;k)G`o{bz)W2=)4x1ANpx{h*~+Fg6|~h4wSMhEo9Yvok7U3j;$Ri>aMorEOT?(
z#-U7xw%u!>Y=^QKIyGXTb`G^=Xul0S&Y>KJZibh>Tp#aHdj;tWxsp{obOzxs{Q0jO
z#sB`7R;7dO@(B)g;AZZQ;CF$J7LPjAF|MtURa<oiVME9a?w|52Vp>kFt@%WUa#6Fn
z-Qjux@J5}iTW1G~y7wP>j=9M?$)PR`tvJj;T^%}^p(m|ZH-}DP=x2E82MXOCIu(%F
zF_5t-NLSj!R@&2{9x68emJ@(>>t)?~JJgG-NbhGFa+*VZ7`o|j1D)<rUxqHVUS~RV
z217fn*Vzu8#Zcw)=DS8eht5$@d@BIxR`j>6IM<>6961P)`YG)|hXyc|+uuNg9U8>Y
zGV7J^P##0qSg%5d3K-gFy@ohc#L%|oreWtfG*m(H4FjMXHq18ce20c{<d_O3a)d*}
z6C(lW$dNX3ltUvqaup(Vm&Q0WnxR|IHPASR#xhjCqJhRcbOA%Vtk*>jUC2;B>ovil
ziy0~bq`%i);?P6|#disSZrCK-u*nWh;>fkOuuC19!q9^QOe>~3RLoG_N(P$dPzgi7
zSg*?*n$FO0>ve@gmowDoA=9uc9h#w__=W+{4V!5jc9lajIr1YErn@xTp;?KM0CeQl
zHgb+bS99dCsiv`W9lD00)IsLZneWg%K<3baj7>qhxCOSjYaLpUSStYScAa%w=+Jds
z#XwY{+k3r3eqtm59l6Lx-r&$8j=Ud{dT!k0(2We`RyNQr4&BVqUh8$MLyH+|IM`Hq
zn?p+!6hF8Cbd|T;D(`UUc8(lvBkywP&csLnI`VECd5=SPbL7*A)Q!E@p`{E}e$+gG
zy5FJu0GYvsj7>qhxMjAu2OL_KSStYSw%od{aA<j4d62OwNIO1g9Ut->dQf@#u`04o
zHU3%f5r-a*tHa;+sQK;lF^3*i7C-cutgZPH|8Qufiq`|EWL1;SAUtksdcuLCDw<o>
zRP>ZXPsUeN@|dY;l|xT+MN3eTK6O9q&@*urK~@#%48n7^qURkb3A+>kZ}ft7d(nZS
z`Z6Zp?3kAwdWoT_)eQ8iL$5Hj%6h%-&}$5>v0iUF^aexa3rye|hgLIGr@DdGIkc9c
ze%5P)L+cqTvC!KNy~WTx8~Cn6?=ZC1dcE(^dkk&0UK<_yfT6mDrp8SUeaKMD8V1_p
z&}N2)Td$8C+RD%*>-Dii+Zf7w+ys8=&?gLiWCK5U=re|5Ht<V_zF_FsA``g7q3sNv
zkY*;$R}Sq2WF`${wJ&uB;cL5-b~#Ygq?w&&NE<PScE`m+R<SyRu+iSH{3cV0Y!%-)
zL|ny|G|(MNE&i=TrHmh2({O{ncj&vgsv)bYbq3)F8~dXJMKyb>jos_ep14@ZDpqF@
zKC#XIXCx<m*cp;jaM*$Hq>9rSgnhOt`yD8%Df6BL)8Z$K|Lo9Dzz;a_0pN{(v2H0Y
z6m^s=u4VS8a4F;}Xx2~zIW9?tzJ`}Rmxo<)6%>DB1)$6KTys+yamiC|3(qrU9p+Lw
zF00|w1}g8;;SBY(UKL%cz|e}?cwoETj^3d#z0&e4+4@sms)TaPOoWV0LAs%ptz#9J
zDys_P`vX9`Rkd!_T&l|LI$@Y;eGQkYGj!__2CC^&8bh<KS8bPSF|^Bi)p6+vhBjKS
zdM?#vD0IFV=msv;S5SPz0O*D_v<++IQbUgHg-HEevaw4?0y2Gvj7>p0wuy~B%B3c8
zRruTLnDg|}E;Z#+Lv>Bxj&Z3OLtmpJeZgztQgeoS)s@xrzq32bP~dda6&+4BKxYtI
z+6El!LP_W&0Nu`3)-BzoR$R}l;bwGNyOfa_2|!2wU|Vtk^KNjaEwPPDnTg>5ba<9^
z%XTR%(G7rhYir%wxzv{1*L#E+n&Vu`VQB1g=0bP8OYH%f-2xe#f^=~mY;h;J)FH7}
z0NU+$u?N%gJK9pCE_F;S6@V@^*SekPQf^!;A!AdJcI;#wJG<0LIr^_zmf}e+bz$hi
z=gs%(t}dO-&=C#Hm*{RTof20AWL1OCAe?Gz=<Y&Em>mFgLwZ=Zo-XxBbOWH>dRe#L
zE}hXUu3pI4NM{iKY_4SW;y$+S(_HEkS2bi+way@T_J{1qpUAAt!eK|{51Cr|PnebZ
z>|f=#n3a8Pe@}O*uj;R#`y!r6{Kqja)2f_dyV4l+H}1;KjbvKknHE3Gr8DDpDP*-v
zbq3*(`I%?i63=nzY_4gn<zXKES5h|9+V`_{_jjpZTyG$&-slX%xz@3@fTH&7t>ds~
z2UvWdO9SExfUFA88H7RBaj*+T6|laEx%10+DK9P-vWnFigd~ep4M&ni`lh+I4*cCL
z(gHjE3SBC|Tsz>d3IK25mzvwx{6i+2o>73`Da<t;vf5WVgAm6y{o9dEtLGQlQ5oV=
zQQQ#-S#?8a5dJ-kQ+>rTjMMnrVEoX_8x6HRIM0QmPAdbN<J(?|-I3G&li8_y1PnVh
zegr^Q)gv&>j==dY4dW3Q(*j=zlLS?D_md>3nsa87pc;H<O%hc7zaK$W|GHZK_YqX%
z&xaKPMg<MG=fhO+!4j|Z0Q6}yfwFo`!W}_nQ{2Cjvs%4)gl+stmqsKu9)NEAUqxF5
zf2GmCleXI2-bXdn#1Wn0JpM1Bt?DWGJ87%&Q!vZSnNfBxj&^C3x+H5iC1VRR2sxG@
z2!d;i9GNf)0qFhx>kQZGRmRwg#=10yul;k6!`;s~i(lZ<IL33g;GQ7Y)|ceEf}g6N
zVJ5k*|AgzRf2I4QTvwj)6U|H>Z)fI(E{*4znciNeoiNGH%zr|NRdmAnvBP=<N5(}i
z7(^HQ&&-x-#S>hEPE_b6!Pyd?G@(q!uQ{rSgUNG~T(IdTxilHAnxYcB8S1U#!TvN-
zQIf!UZG|6BGL(=3AyWyNPN_d<hiuaPb;XHQFaB$yEQECmQ7`UyP>vlC(NPH<9l!V0
z@+dD?DY=e6<!ae#<#9XZ$0Bv3ics(3ld_THx7a0*YV?Uh)m!qPDM7s(|Ai9N8}a*;
z-#*8m+gbLlwOyg=rTCpn*a@MM3!#$hf3!<ZP5n-x>izVV3T^57V|L4GsXr)Gy`r9}
z&`j4~(M7hZwMU`q1@(POP_LwSROXJZziGGZ=Fi$Ij!5mJ5cO=+6A(P%_le0?USEaw
zb^VQdMYmdKC`CO(J5vejp;;5<+eG-W`Ldedai3`1yq_|uCs5}qK|Ns_pak_uX^;}s
zBcnVe<hlO&`^0*$Kq&>TpR-@|^@@~I<oXNti+0{nr3`ib*Y=B|)L}|dUyBy0Di?{B
zy-tzkg*RNm!(G46FQV1T&Ogf4q2fsr5Qx{YYKmJq)jbh&sJR0{G1R8Iu^Lq3#%j_u
zm!_jQ07t~?#OlWCF%SD%xOP!9?J}3M%XM~z&f=-pvHF-u%R;dR(OAQ1tWlI^xY1bS
zXw3h-hpZmH(v8wg*MD!3tak)m17$9(>Csq5G}byA%Z$=IVDsIDH^>?*yY`fwLQP|B
zqO=|04y2t(Um<;spmxz%PBeC0ly(8w?fQ8)%7ztU?W3{dqx2)7J(v%@WLDc)Zj`)m
zlp;vw!qM1?Q92Cb;Yj6?Dj-!vssvM~XsmOTQlV82``vrXx{YEdM`K;1u~VW{3-)f&
z*s0N2_h_s~G}bd3>lLNiVL$yQS-aH{h^YgQbD~riS-)tke>8S(G&Ud_8yKZ}u+~Rv
zfYcDFkw5Y#*;O1F_HWrB>eQsh2q}rirbT1Zqp{1PvCE^eE27lI&-hX{4jtte_mPiO
zYYLyW(b&3ZY<)DgAsTxtN=N(kw##EGHG}1oXzbG{9fPu)`%_Po1Ix95*b?bjf9x$X
zO|%O8d2fpvwbKD*AhkxyM5-K$QXAx1VgKm9a$51r(9eYaYA8B&>h^$TyQ;?lEZeif
zVA-A>KA2^@Kb6i2Ycg%WFrU8^!?k}H(>+WB0?WWM%OF?=hbb?x<cAf%RdZ4cU@8n#
zQD7QU7Bm!=^TISNu$*6J84k;cFpUf>qslC!VHp#qv4JI^W2?rEgXMxSjSnovI4_ze
zTnN)eVY)al#c_5gz%ns>5IG;k1>F2gf|yBVO_+?BDPg+QR8(e}3QI|trYQ^hPt(~H
zP>L^u@$xWT5rhTAan<q}uv{6YnFkkm6)dyDG&`_dT~^f`Sgr{NZ&}O@cRq-;Ta1eU
z_G16AqTL4j5YiylgFOemfOYIIz0pwCgPjEXaMpue1AR2>!482wj`cED{DrJz>@~j_
zmoo;+XugTG_{nS!h8G1+Wxd!o=rY#zNTQ7xEY+bh+Wl1t{&QHrI$S^K(Qndxi$U|H
zqaD0Iax|`W&6Lm#!a=W=#J~bxfGe|R0nZE5{IC`mgz4Hqye=F^2tMb~2*GKpk^eVF
zu>LC0E?@))H}7pVu|sF5;a|q}{WI74`PZ;?`!n0DTfowd|BiHuA)@rKM3kOMLT-|f
zs~EbxfrD#)f|>mPj*weDCrP%&nf3RRZL8=1g+yBC5AtZM*Lu><<s>0CNr+XqC5K3e
z9mp5ZKZg+eZ(h1D$!f*@4<%WxhPRnywc1CZNmi?(x$4`#zlPPiFl=rn{V*-W*L(9z
z3}kgW))|DKEMfS7g*J;1d7;fem$YiAs2Qas{*-k)|I4_j`X`Cs<f0}yr+5lxrh5}j
zOVb&q`+qX$G`XlKpSqHC&?Ftyu6*?0zV_%LFhQ@km-<Cvx?WxC{W(}FJIMr1GC}#v
zbdm{b2ro${Xp#x~_g$(q$pppfrAa2J{p!**$plqIQGQB-mxV1)?)c<dr&y^Vxz?#&
z#q=**>-2BO|D5-${Le0boY&c}jMwQ;28**&0*g~EcbXp0)I3TtHCu=Lc_+#d{*JF?
zOTXFIvb2&VZkDZ#n(qBY<jj-)S8}F$tO+WkdffSw;%%z`4f;h1>W_j>Rm4a2Qhg64
z^l<%|dqv$}C2_X%Kiexh9twFgHIck|5JPjmcfD%T_2EM%W%?jxE_xJy>J;+7-6N|c
zurqH6D|Y4tmu?6Xm_s*&!Opxf40h&CVY(Up1`yBATnJaDW!@6zY_ZO6)!7oA-KMjH
zxSGucxSIaMi)4*Pw}VR9EE+o|8fzYnwTO~tYewlR@F`~@&364~*NYle0+wc!767~!
z={i5Rr<~=l>nYQHrx!S{4SLDpbwJ&WWkqAz(OBC<=4<x(LwwCU(C{wN*hx{U0rp}V
zv@+tRU-u^2^2kGAXvVWLGw>%8hsM9GX!)11&!Vx<{gTt<0GH{PntFLxK)t*h4Kvis
zRM0FH_3|EIOT#N4x<x)On0wjJ3%Hj%0`BGPGY{Zi_V>WOJlFfNrXrW^zmEoZpp@bN
z*l3_fgN!`bqdX($dsJZLLXV1+jF~mWqoIL#o(H-&&|<*DJn+i2$N3&O-&!2*VKGT9
zj_|OEq!vedSUggTqdcq-sm0MAh~Zis<ADsW#jzgf;94B#VPQrsUf|)M+_X5}qvCf1
z`9cqW-KOD-Jgji2#fv?x*rvq^9@ZDr;zSQigK6;+4>SfXPV%r|mlh{`SkX(1Q#`D>
zrNv7<EY76GVh_JrE3vpdP4%!ElZHz?nidSubPo$9Y4kD=D=TU7at{k7Y4HjVt08G|
zh6e__7O(WcVb|hJ4=i>qUgd$uuEklXIY4K7w7ocxul7J?*B)~`tZAdgYfxR_Fc<9!
z#CfPW5a(kb1ilMUM}S`I(RD#L7J69YL>K0JSlC31*LzsdgvDZ7<Y6Tf4d38lxe_hj
z=wSsBE#BnO%|U6mc(gbWZ}q^6*A7cO{HK`~Z}YHDxE62sKs(ps9UlJOOpAA-pMiLn
zhyNt2q2aqd(CW2#k4H;AzvK>Czqoqfx!l9wjcMx&4}UYJ#Ron7y_gms^6;-^T71~U
zzm;k65f6Vhro~4+F!i<gm<O)D7FT*;>ud2J9+;0>eB8qi2};D=c*4Vfh-vsq4}UYJ
z#iu;{jhGgn_VD*%T3m%gDiELX@M?rcpY_21*Wz;?-T=_z^B&#-(Bca?h6C|M9KwP4
z5_W8HP}<8Ly%LQ2s~)`;h_53qaCpO`Hv@Dvj>JG*i=#a#ZJkH!19SuSW)Sukj>G_c
z$D?-x@jc8+?GUE-J^H}&kGxBc$QczB^|gmrvUJOLd3Xy;i@QCF1@YwJ4H%7ng9FD~
z`RZNrI8n^21RvT<DmW$ekEjK64}4ceE$MvyZ!GD2ZbY-t2SoT=g`!IjjDW@*p}~=E
z%rU0CGE+WG1raI?f{My4Ltq&i`IDCtFAmlcKX@r|^<u_+Ixo@_iH1e+iL3tk5gHz$
z5fK`R#sD7`q0tc<6Ty2KV<YM&p~!=vPUvHm`?v^h5-y0)cz6Q{ZW7d*%=75NNH4l5
za#q0qzBt1C?>PSPs6*o)^RF|>1&P%I_~e4b_A$n(nmw*F`~sWgKT~0HL1O(>2cJp)
zv!7g$n182AE=bJ7kX(=$CxzsK#O624<buTNB9UB>n34+;8%Aq#LE_|s#C-p#Rw&j&
zazWzcg2Z^3v&pZ}&|Emff?S5yeklISNZ@~bLE^$gCWkNe%;|PQ1W#Mb7}b!mDM%lB
z_gTk@5xP$~`VYKh{$Ajc2rY|?g{)$A2BErLtg?oHqGBs;7Qt)ZH3gp7Dkyb~SyH>U
zz>`}A<yo&f0uO!_lzXJ{sweOOSV6OFU;}{%!3tXavhivp@aR`To5z4GnOyZ)?U>}M
z$7&SXn-xYo*y(wKpbnTUX6;;`jxv825Eax>S^UaP&1&~23d&V8D_A}OvMN<)5IWgX
zI}0dfrLr3U-jb^xk4@6t|5TcLa@Au#PCHICcL-Mqx}2eBTNvm{K{FU?xXwUV37W}J
z<<HITm@Q})L!+(N96?tzG{}0*6?6?lPg}3~g61*Q`w~<9wSpEfw7#WzQ8c;g@jZg>
z=0OQfHsf@!prs5wwZTC53%ZY?Ue+tgbvJ{P<hm!h?n$nDa@AvX>senj$#n+3VZfzM
zu6j(#Rgdw7#8T@!ODO8g%)S}sI&zYvE)11?Yi@tKN;;XLZCi|2H%X^3H0DYJb(eH1
zL#?(NsHdbJ46U+Wy(RTxXo~eZO;R6*%Fi@`r%UR~P?Gij|B&^*;8$7ihrH@>bH}WX
zJShTN)MQQL;xF6HgSFRK`IgCJiT_MLFrrq73<zV8@>vH<tbo6!m(mah0&*A}zLYB9
zyWqVQEPRxp?@G`qK~Mbm_>(+dICp8tU$IEmsxc+<YfS9_ly!5{<LKAmV*lE@xzSkf
zC|w$fQZdq0f5aEE=HG4=-F&->E_m7{Xr}|twu=--@{l4((|}J$IvjF&qzXtCkuC#v
zInotKGms4T+bp|#C9s(hztRqQS{=3Q?k&)<>@M*_++z=XVWVww*==5SyLqteb}9J6
zc-^8Zz7{U^AgBk|_bEX=m|muYWuCuyzRW$8w>$pbOLMOer7w<Pd2O{gH(HJry6JYD
zqkOtG(zO&HIGHU`(h?=zrli~aE_-EWo!gljI~~3Y!2;zMKkkTdc4x%@@CRAje_*ey
Q=kH!9J0G+jc=~bw1O7bcRR910

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 7f3eff22..001901dc 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -108,6 +108,11 @@ namespace WMS.Web.Api.Controllers
             //var m2 = my2.Object;
             //var md = m2.code;
 
+            List<(string orgCode, string stockCode)> request = new List<(string orgCode, string stockCode)>();
+            request.Add(("101", "CK001"));
+            request.Add(("101", "CK002"));
+            var list = await _erpService.BillQueryForInventory(request);
+
             //LingXingResponse<LingXingStockResponse> r = new LingXingResponse<LingXingStockResponse>();
 
             //string str = "{\"code\":0,\"message\":\"success\",\"error_details\":[],\"request_id\":\"7A739491-8740-01AC-304E-0203AF887AE2\",\"response_time\":\"2024-10-16 17:58:57\",\"data\":[{\"wid\":437,\"type\":1,\"name\":\"ORICO_OD\",\"is_delete\":0}],\"total\":1}";
@@ -117,8 +122,8 @@ namespace WMS.Web.Api.Controllers
             //var s = await _lingXingService.GetSeller();
             //var ns = s.Data.Where(w =>w.Id== "2101").ToList();
             //string str = string.Join(",", s.Data.Select(s => s.Id).ToList());
-            var sd= await _lingXingService.GetInventory(new LingXingInventoryRequest() { wid = "437" });
-            string sdsdf = sd.Message;
+            //var sd= await _lingXingService.GetInventory(new LingXingInventoryRequest() { wid = "437" });
+            //string sdsdf = sd.Message;
             //List<string> list = new List<string>();
             //list.Add("GD-02-15");
             //list.Add("GD-01-15");
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 018bf731..d3357fe3 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1006,15 +1006,25 @@
             仓库
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.ErpInventoryDto.Erp_SubStockId">
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpInventoryDto.Erp_SubStockName">
             <summary>
-            子仓库(跟金蝶交互字段)
+            子仓库
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpInventoryDto.Batch">
+             <summary>
+             批号
+            </summary> 
+        </member>
         <member name="P:WMS.Web.Core.Dto.Erp.ErpInventoryDto.Qty">
-            <summary>
-            数量
-            </summary>
+             <summary>
+             可用量
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpInventoryDto.BeforeQty">
+             <summary>
+             库存量
+            </summary> 
         </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpNumberDto">
             <summary>
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 231aad46..9b51cd52 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -4304,7 +4304,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForInventory(System.Collections.Generic.List{System.ValueTuple{System.String,System.String,System.String,System.Int32}})">
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForInventory(System.Collections.Generic.List{System.ValueTuple{System.String,System.String}})">
             <summary>
             及时库存
             </summary>
diff --git a/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs
index 39a786f7..30597164 100644
--- a/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs
@@ -19,12 +19,20 @@ namespace WMS.Web.Core.Dto.Erp
         /// </summary>
         public string StockCode { get; set; }
         /// <summary>
-        /// 子仓库(跟金蝶交互字段)
+        /// 子仓库
         /// </summary>
-        public int Erp_SubStockId { get; set; }
+        public string Erp_SubStockName { get; set; }
         /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { get; set; }
+        /// 批号
+        ///</summary> 
+        public string Batch { get; set; }
+        /// <summary>
+        /// 可用量
+        ///</summary> 
+        public decimal Qty { get; set; } = 0;
+        /// <summary>
+        /// 库存量
+        ///</summary> 
+        public decimal BeforeQty { get; set; } = 0;
     }
 }
diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index f561fa68..5d7510c5 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -178,7 +178,7 @@ namespace WMS.Web.Domain.IService.Public
         /// 及时库存
         /// </summary>
         /// <returns></returns>
-        Task<ResultList<ErpInventoryDto>> BillQueryForInventory(List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request);
+        Task<ResultList<ErpInventoryDto>> BillQueryForInventory(List<(string orgCode, string stockCode)> request);
         //同步数据(保存提交审核)
         Task<Result<string>> Save<T>(T dto, string formId);
         //提交
diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
index 33697c87..096d6cce 100644
--- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
@@ -45,9 +45,53 @@ namespace WMS.Web.Domain.Services
         }
 
 
-        public Task<Result> Erp()
+        public async Task<Result> Erp()
         {
-            throw new NotImplementedException();
+            //获取单点配置
+            var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1);
+            var codes = r.Where(w =>
+             w.ManagementSystem == 1 || w.ManagementSystem == 4).Select(s => (s.Code, s.ErpOrgCode)).ToList();
+
+            var res = await _erpService.BillQueryForInventory(codes);
+            if (!res.IsSuccess) return res;
+            List<ProductInventory> inventoryList = new List<ProductInventory>();
+
+            foreach (var item in res.Data)
+            {
+                var entity = new ProductInventory()
+                {
+                    Type = ProductInventoryType.JinDie,
+                    MaterialNumber = item.MaterialNumber,
+                    Customer = item.Erp_SubStockName,
+                    OrgCode = item.OrgCode,
+                    StockCode = item.StockCode,
+                    Qty = item.Qty,
+                    BeforeQty = item.BeforeQty
+                };
+                inventoryList.Add(entity);
+            }
+
+            IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
+            Result res_Rollback = Result.ReSuccess();
+            bool isSuccess = true;
+            //修改库存
+            //先删除之前的再添加
+            if (res_Rollback.IsSuccess)
+            {
+                isSuccess = await _repositories.Delete(ProductInventoryType.JinDie, false);
+                if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            if (res_Rollback.IsSuccess)
+            {
+                isSuccess = await _repositories.AddRange(inventoryList, false);
+                if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            //提交事务
+            isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction);
+            if (!res_Rollback.IsSuccess) return res_Rollback;
+            if (!isSuccess)
+                return Result.ReFailure(ResultCodes.DateWriteError);
+            return Result.ReSuccess();
         }
 
         public Task<Result> JuShuiTan()
@@ -95,7 +139,7 @@ namespace WMS.Web.Domain.Services
                 var stock = r.FirstOrDefault(f => f.WarehouseCodeOfLingxing.Equals(l_stock.Name));
                 if (stock == null) continue;
                 //店铺
-                var seller = sellerList.Data.FirstOrDefault(f=>f.Id== item.Key.SellerId);
+                var seller = sellerList.Data.FirstOrDefault(f => f.Id == item.Key.SellerId);
                 if (seller == null) continue;
                 var pList = resInventory.Data.Where(w => w.SKU == item.Key.SKU
                 && w.StockId == item.Key.StockId && w.SellerId == item.Key.SellerId).ToList();
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index e0c5f6f3..d3d397d6 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
         /// <param name="billNo">模糊搜索</param>
         /// <param name="sourceBillNos">单据编号集合精确查找</param>
         /// <returns></returns>
-        public async Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null, DateTime? beginTime = null,bool isCheck=true)
+        public async Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true)
         {
             string result_json = "";
             try
@@ -194,7 +194,7 @@ namespace WMS.Web.Domain.Services.Public
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 //param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
                 param.FilterString = " FMRPCloseStatus='A'";
-                if(isCheck) param.FilterString += " and FDocumentStatus='C'";
+                if (isCheck) param.FilterString += " and FDocumentStatus='C'";
                 for (int i = 0; i < stocks.Count(); i++)
                 {
                     if (i == 0)
@@ -2635,7 +2635,7 @@ namespace WMS.Web.Domain.Services.Public
             }
         }
 
-        public async Task<ResultList<ErpInventoryDto>> BillQueryForInventory(List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request)
+        public async Task<ResultList<ErpInventoryDto>> BillQueryForInventory(List<(string orgCode, string stockCode)> request)
         {
             try
             {
@@ -2648,51 +2648,76 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶采购订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_Inventory.ToString());
-                param.FieldKeys = "FBASEQTY,FMATERIALID.FNumber,FSTOCKORGID.FNumber,FSTOCKID.FNumber,FSTOCKLOCID";
-                param.Limit = 100;
-                //param.FilterString = $"FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}'";
-                //param.FilterString = $"";
+                // ORICO_AD,FF100004 ORICO_GD,FF100005 ORICO_HD,FF100007 ORICO_JD,FF100008
+                param.FieldKeys = "FMATERIALID.FNumber,FSTOCKORGID.FNumber,FSTOCKID.FNumber,FLot.FNumber,FBASEQTY,FSTOREURNOM,FSTOREURNUM,FSTOCKLOCID.FF100004.FName,FSTOCKLOCID.FF100005.FName,FSTOCKLOCID.FF100007.FName,FSTOCKLOCID.FF100008.FName";
+                param.Limit = 10000;
+                //param.FilterString = $" FMATERIALID.FNumber='G01-11-572474' and FSTOCKID.FNumber='AD' and FBASEQTY>0";
+                param.FilterString = $" FBASEQTY>0";
                 for (int i = 0; i < request.Count(); i++)
                 {
                     if (i == 0)
                     {
-                        param.FilterString = $"(FMATERIALID.FNumber='{request[0].materialNumber}' and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}' and FSTOCKLOCID={request[0].subStockId})";
+                        param.FilterString += $" and ((FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}' )";
+                        if (request.Count() == 1) param.FilterString += ")";
                     }
                     else
                     {
-                        param.FilterString += $" or (FMATERIALID.FNumber='{request[i].materialNumber}' and FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}' and FSTOCKLOCID={request[i].subStockId})";
+                        param.FilterString += $" or (FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}' ))";
                     }
                 }
-                query.Data = JsonConvert.SerializeObject(param);
-                var json = JsonConvert.SerializeObject(query);
-
-                //4.请求查询接口
-                var result_json = await _client.ExecuteBillQueryAsync(json);
-                var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
 
+                bool isHave = true;
                 var erp_list = new List<ErpInventoryDto>();
-                foreach (var item in result)
+                int skip = 0;
+
+
+                while (isHave)
                 {
+                    //4.1.页码：页码按照金蝶的要求从0开始
+                    param.StartRow = (Convert.ToInt32(skip) * param.Limit);
 
-                    var lis = erp_list.FirstOrDefault(f => f.MaterialNumber.Equals(item[1])
-                      && f.OrgCode.Equals(item[2])
-                      && f.StockCode.Equals(item[3]));
+                    query.Data = JsonConvert.SerializeObject(param);
+                    var json = JsonConvert.SerializeObject(query);
 
-                    if (lis == null)
+                    //4.请求查询接口
+                    var result_json = await _client.ExecuteBillQueryAsync(json);
+                    var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
+                    //4.4.判断数据是否全部拉取完成：并停止循环的条件
+                    if (result == null || result.Count == 0)
+                        isHave = false;
+
+                    foreach (var item in result)
                     {
-                        lis = new ErpInventoryDto();
-                        lis.Qty = Convert.ToDecimal(item[0]);
-                        lis.MaterialNumber = item[1];
-                        lis.OrgCode = item[2];
-                        lis.StockCode = item[3];
-                        lis.Erp_SubStockId = Convert.ToInt32(item[4]);
-                        erp_list.Add(lis);
-                    }
-                    else
-                        lis.Qty = lis.Qty + Convert.ToDecimal(item[0]);
-                }
+                        string name = GetName(item[7], item[8], item[9], item[10]);
+                        var lis = erp_list.FirstOrDefault(f => f.MaterialNumber.Equals(item[0])
+                          && f.OrgCode.Equals(item[1])
+                          && f.StockCode.Equals(item[2]) && f.Erp_SubStockName.Equals(name));
 
-                return ResultList<ErpInventoryDto>.ReSuccess(erp_list);
+                        if (lis == null)
+                        {
+                            lis = new ErpInventoryDto();
+                            lis.MaterialNumber = item[0];
+                            lis.OrgCode = item[1];
+                            lis.StockCode = item[2];
+                            lis.Batch = item[3];
+                            //查询库存单位数量FQTY：FMaterialid.FSTOREURNOM,FMaterialid.FSTOREURNUM，
+                            //查出结果后用(FBASEQTY*FSTOREURNOM/FSTOREURNUM)计算得到库存单位数量。
+                            lis.BeforeQty = Convert.ToDecimal(item[4]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6]);
+                            //lis.Qty= Convert.ToDecimal(item[10]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6]);
+                            lis.Erp_SubStockName = name;
+                            erp_list.Add(lis);
+                        }
+                        else
+                        {
+                            lis.BeforeQty = lis.BeforeQty + (Convert.ToDecimal(item[4]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6]));
+                            //lis.Qty = lis.Qty + Convert.ToDecimal(item[5]);
+                        }
+                    }
+                    //4.6页面的叠加
+                    skip++;
+                }
+                var list = erp_list.Where(w => w.BeforeQty > 0 || w.Qty > 0).ToList();
+                return ResultList<ErpInventoryDto>.ReSuccess(list);
             }
             catch (Exception ex)
             {
@@ -2700,9 +2725,16 @@ namespace WMS.Web.Domain.Services.Public
                 return ResultList<ErpInventoryDto>.ReFailure(ResultCodes.Erp_Inventory_Error);
             }
         }
+        
 
-
-
+        public string GetName(string name1,string name2,string name3,string name4)
+        {
+            if (!string.IsNullOrEmpty(name1)) return name1;
+            if (!string.IsNullOrEmpty(name2)) return name2;
+            if (!string.IsNullOrEmpty(name3)) return name3;
+            if (!string.IsNullOrEmpty(name4)) return name4;
+            return "";
+        }
 
         #endregion
     }
diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index 76440189..80a2220e 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -262,14 +262,14 @@ namespace WMS.Web.Domain.Services
                     int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0;
                     requestInventory.Add((d.MaterialNumber, d.OrgCode, d.StockCode, subStockId));
                 };
-                var res_s = await sc_erpService.BillQueryForInventory(requestInventory);
-                if (!res_s.IsSuccess)
-                {
-                    entity.Sync(false, res_s.Message, SyncStatus.Fail, "");
-                    await sc_takeStockRepositories.Edit(entity, true);
-                    _logger.LogInformation($"及时库存获取异常->错误:{res_s.Message} 数据: {JsonConvert.SerializeObject(entity)}");
-                    return Result<ErpTakeStockSaveDto>.ReFailure(res_s.Message, res_s.Status);
-                }
+                //var res_s = await sc_erpService.BillQueryForInventory(requestInventory);
+                //if (!res_s.IsSuccess)
+                //{
+                //    entity.Sync(false, res_s.Message, SyncStatus.Fail, "");
+                //    await sc_takeStockRepositories.Edit(entity, true);
+                //    _logger.LogInformation($"及时库存获取异常->错误:{res_s.Message} 数据: {JsonConvert.SerializeObject(entity)}");
+                //    return Result<ErpTakeStockSaveDto>.ReFailure(res_s.Message, res_s.Status);
+                //}
                 //组装dto
                 #region 组装dto
                 //子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004
@@ -278,9 +278,10 @@ namespace WMS.Web.Domain.Services
                 {
                     int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0;
                     var number = d.MaterialNumber;
-                    var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode
-                    && f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId);
-                    decimal qty = erpInventory?.Qty ?? 0;
+                    //var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode
+                    //&& f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId);
+                    //decimal qty = erpInventory?.Qty ?? 0;
+                    decimal qty = 0;
                     var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialNumber);
                     detils.Add(new ErpTakeStockDetailsSaveDto()
                     {