From 7f0031707fee239e5918de2feba90c17fa0d7bad Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 10 Dec 2024 16:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/ImportTemplate/workorder.xlsx     | Bin 11794 -> 11972 bytes
 DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs |  10 +++-
 DOAN.Model/MES/Product/ProWorkorder.cs        |  13 ++++-
 .../MES/Product/ProWorkorderService.cs        |  52 ++++++++++++++----
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx b/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx
index e49c91e89b73b19941caa5bee897fe7a6cb5c93c..be2589c509402a02728fdb0ffefe3f6ff726fcf8 100644
GIT binary patch
delta 7135
zcma)hWmpu<yFLpn-2x)rvFy?yUDAz&gmf(}At^2?4GT+mBMnP;hteP|DBYm6AaL}3
z|JU#Q&vl&-=lL)*&;2|z_cJq}X70q-117a_05C@GX__V?832aiKZZ8-OC5a<`Y!jA
zi`mY&R`~_V@s*NfV9l0CT9fgy7LmKhS-`LCQ|iRYrt+w@UQxqC)M9KIVyG!@*#gk-
z^~5GFsmNr5xn5PiwAdS{eooHTS1nWHmgYvlAxjH8yrJ+bDRi?lpF*q)F!-8;S~Q|!
z8MO1leqoX4;qyE!kY9G97IhN+9Iv@&5l^l`5l51KJhMtP@H+)aE3dQPK5>Jt2D9R8
zE}^K+mhQ}{TADqb_ZWG{Q_So6PrZu*>N9F>6b!Ja+^61zs~_vW99IkH@jcCQ#~oW}
z>L5{Z*za(zppH-SiYD`TPfXsGNMG%}y|Ak&Eb>r=Zv9+FXA(#prq+=AJx^TS#U<54
z*OobRh&gt4ltrYJxiGY&AvS)k`Pm(Aqw6Cb@AyU%_!E%jNrt-O09xLWJKbaS8I_hQ
z8agQo3JMlVxW<MwaZmIyf)Gs{SghVGi$G|hk;C)|3EUg9r#XrMLDC1y0@-WDKlZir
zfavpjZDoFiHaPJ!eR^I2$zS7b;f04qK-zp~oa+gE)fnf_)N*8ynPa#8_(#z0uv@tL
zidQ38U4o;G#x`{9jf9~cDP`B2A7jR}U(FI?%QU^b?tG{_TvFck#pmf&JHEWpKPv!>
ztRuG3s0=u_E54B$Pl~qKNOc%Ix0Ppx4tVqyy3;18KdTocV|dEnyD%7&U`NS%BbM_$
zdPpj)FM8^@Kl^k^t#P!p+O^63_xdoFT?Dd6N-)n&Y0*{a#<S|2yPgnEiEu}k!5O+H
zpV!7hK^bO2bfVM4RuKiFltZV@4v&~o(Vb!-2iRgofJ4!J3c1bIm|)?eI(`)Hg|NrN
z?fD0EwKMBOt$Ndji+DEfPj}2gN*}r(g<0mW*+(}o#F5$h!%YR}k`e>E%?bCple6Dw
zojJMt&KcBZJOq$1h1UDKbE!w(j*_M3-x5(c(TrK=3HPQj($rEfv2Wdqr97_1se5X6
zarRy~xVO*!9d}c~ID|I&Ix{C;qSwbd6uHi{>l}_GOcJ!40T+oUQX12(-(`^O*tq4e
z2U@c;&~p5XLZ5JO$4ldiTP3}B>vjh|8gvKVQP+kUrNae{nwrk0f==6c5?af?%P;6(
zAT=zmjyKO>RKPB+&8{Kk*T2D;#(L}^7q{vK$3wqQ#&`7}!;<KC^J&OV6itgtQ){t~
zcP;h<a~pHR!_$x>mCeXKVWgCZW^T5Brbbet)W%+h>aafXd;9|C<)_m@w^7by`!+N*
zxX)D*6C~JrL<biH?uS&klxFiQO!_>m@A0_41SYJ)7H|UE>Z{(E4SZwDwPw0=G}4kV
zoI<XUg~l1)+Iezu>X~LbjDiekjKN(-aLld7<!RvAV@g%w3(#V9CM(^m@vM~9xyi~G
zo_JD;ed-AApZPv?OCc$R?~YWEsx{~A@BK^XMegTmOkB-a+dmwY-wEWaPMIB&*1Opn
zm;O+M{R-G#_g~dFd#K%cRQqU=#7nFBrJs1+C$Aby?i-`lb@e5C00utVr5ycjHEP|^
zSIKL9H0^-VlIdowE#YomCKcvM;=@<s%3q#m77v!4^%0a`{WcQJ0`VW^;aql)m5)C%
zf-2Ltbz3bk8A-i3*Zr3aU1>@tFp9sQMqSNSz$A4ei_o-_^zyVH-J!R;TvIZ7H(i(X
z0iUVlLaGn6UTx*?<>3h46jx6dx04dS{pRlkALV0kmc$rcpJeUZwMa3Av?*&n7OXtI
z-`<ST1hAM}wcSk>Bptq3{%pT&QJnM9P@vW@OH-Vvtjs{;;?Bcv@j+vD%#?j7Id~ka
z5*ASr@{~r+lV`414bzFSq&)fD$2U2QAVt(*-@FP<6SGEiaj$2gS07W12Au?okZ4pC
zh$&OPSlH8^w8uZl_s;Z=W&No{SS)ehes>~WACX(CVUoG`5hs-sW1HTJwQJA3Af$}I
zmRdMlbmTRWWM_RXF1;!}r_7e*f?h>CIV>^!_9ZR+6+IQbBpd>#VOuq3LX~MdI*2M1
z$b68Bn<3T07o+`@U#(+2uj9cZq;y+8AgFYr`zcz+y+(x<<5LJIosv1e+}ainUG;Q<
z3okp>^Vl~`bO_it&^GYdH{jK%Q$hxFlnb|S=8C2hJ9zCIz;~>%DLYkvAYVJ!lxL$j
z<{y7|^7ZU-uduoIMuK{2EWhz}-JHE>{ZFN%$WmHNlkv}WQ&Zb6l;bK3Mbnk<c<lu^
z*;r$3x4-=HveE@Il06U#_3jo^7XqBAfAP;n(`Ow*_6_3xvP|C`{ETwU{!}qZm7iZ)
zzC4?gV)yNDT<}jEcB=L#5HvLsPzf8YcYgw1Zd6tb3C%I8z%1n@dPVf`_4Qh+3_pMm
z$cM&<i9|u7BT<nU8*Z}K$a0e!X(6r8m`LDDF8|~hAX0%he}5CQFYqL=C0L0S%iW(j
zO}dN&{tPYx2f|t4WN<;E_$N!~^qFm6oMSE<eS2#JlVRz`^kVcuYNW={#(C(RjOaKy
zeKma|BrhE$9W@=0j%J8rh-wHhMEfb6;0!<pz5M5v;L@y7*a9NY`GO$9$?HNG8#s*V
zC>hxB|CKCBK&as^-^}r#4q%PR43D(LT|J~+lKqzn_J5*k@N?clec~WQ@6O5mOgn!i
z02U05f_{L;L4%-?&@gE1$P=X|^l1#-+lZzJuLx9N+0fL>mgyhnj<%~5(k{h`v4FXv
zm#ZBaj2R3WOh)uZj7AJbOlRmXV_@rzsZ%@pS{VZkm|l;p<#xPsVsb&jx)pzpV+{20
zBI-BRn7&`Rze|{Pg|uLqE>bTqBj4fw=RMmd`ya$#IM2F&NhEZVYnf0m{i&A<4ak<P
zB7~vKuRBf*A%YNB5mgcUqH+xV@Kc6{z<>dA#{W`UL4B8;1|r_>LDDzR8pF@hcJ!5m
zFmN<LbC7w`X}oFbY1C<wX`E@w1UC3qA7=qR`312v@i7q)=Vfd@(3an7D;fGL*zySF
zAJTH=e|C+h=OKqHrz*!O=O~vW9mU&WO0sM&LpM!6O`x4eKSu#GvJ~Q1Fpb8sLTTMr
zHK3G3^5$jef|e+>#<c_$8>AcL8e|(3wy>F7e?&n;{!?rV?>j<N7`AT|vN_^dZ=@>V
z)~zJ>hu?*5VaeqXo}ZwCCJiN>ckZ4Z$(i1D<XQ)j>jDsZ*Bi9v_dv|b8&JQ>H+M<h
zmgDyshJ#@4j6?kR9UD_}x8m<-lEqCI_H^6#MxmVqJ<HlKg9Gl`n3r3(I5_uFHw2gL
zs_zI=Qo+{nDa0$H!B6Ayr0x~WiE}fP1J4fHjm_!ye9zOBJI_90#5*>r7o#%{X}6y3
zMJ<0J6sxi{&#NANKvzyzp-x0b_jLJ%dnA(H>;Yk<Fq$n8ZSSg`UX&1^T+fKR87vrq
znVF)^uK081m+I?|XpCt=cAYz(NQxqSVLWld*?tSt`So9B>-%S}&A;#L7rWe8*LlMR
zO8pFrC%E5kY}G={a%YTPd;K18;k5PRcuW}BsUdNmHmE2laKtYX8ko8(i44W?DeHSo
zq<8xlfgy@K%);lI2kDhZq(U~{Z)}^mo0}3)ov}kz?86*XR2k}CK2efx8%edW_11g`
zEX^n37hChn`S$3$^e8EoFbCnMSw_L4nu-FAs#>t1SE7Hx=X|EO*6n}4)k@MQSMLeI
zhY;yC0rd5);_2jhSYZq~j_V&28JW*z_1qYNYWUo}c(uZYAtPU~qza0n__3g(8UX3B
zhFbyZ_azw_799EL4G<DNef=c3^D{c<AMV5v^0ma#a0-d?y0t~A)t`<u-Cdf8>htV3
zb~YKE`NbA;EOilnHCYu)&XIFQYc}(f<VzMow4Qr;^3ijF)v$$h5wo=pKUG(n4ClHD
zpjhr$7SpMpx9C1{vfGDj{zk~-Kxa3}_Wb1I_)6Qo(2Bj=Gfq99>AP^cR8NXD#*jQ0
zHmqv_7kgHs%*T+{Ilx#peNa-vkmFJb#V$FTHPqfd7nt<+7cTZ9qY$cFI>wV01~$<d
zp<i)I^|bTK)Udf)9vQ;wy?0ItuCfhrIy_8O>2gykPY5F34dL<8^Nlnu?x9VgK2!tp
zh8bo6By-rA?dGV=r4cpaMrP!QlK%Gnn>5<f8TX%3M~4g$e7T`i2T=lRpH<w9n%V<R
zsaGWYi@xdES=#oEA|BaKl-VXa-YZt_oRBda89hQG+w8)`9lu79Eox76QjR~;CireT
zcF#X8JXvMSc%+SpV@=%Kup`}G>!lR~Ph@qhRF7rJqG%pmbCFg2mS`DqJvlFwQ*2jH
zp#ysgJU_d2PCo$+`(^jo<$fcyJpW}w9D(yZ{IlzqMY?)5vUjLBTDlgcJNPIlfu4w&
zr|dAdwn#*Rez}%Bt}Lpq`jIl9<q_|uTPE13Yzne!qRXtCS6e=StawQa4YV0dL9RaV
zH)e|e<o=QEv2#W<nXXE0Hl$7~&M*1x-n+}=GW~Ki+(f6XYz3|VK+vN&dN8Z#dRc#X
z@A$dLxAy9tLlOJ$(9SqpBZ<y*u^G(PQ7V|(<MM5f2;Ze6X4{EUPr-BO4gqy(w>~@G
zGN#`vs@Dy-euQ01^+(k^Jyo4%6c^4Whj>`p3*eDK%f_j>7}Gd6gTtm-o_&Wa%@6nQ
zRt~NNhZhCa`b7#l++Q|#UR}MPL^hf{(UoYRqP1(mt2?1|UZFJbpO81#tG&94X`+SA
z)apVOZ`DJ5N)uKLPVw6v7M>|NJ1%-;v_?HDS$^wSwckm4sbQ(mTuJcJ?Zs`1=laT1
zE>c&e)RD{hvzwDlDH@}RV)45?mbEs9ZJZqTu~#`;qY)3+XT0q_ma=9RW%=AoA-XC_
zY{_qmO~D$APsP8tm~~OR7V&+ODgs}^a)u=?svPaMuI;o-bSuu5se9?Hcy1?mj|xU5
zhvL`lp3+=D<WnW7x+a*Dzy9u2d1}~+BE{EB>Wi$C^igapOV>h+7Pv8bWp`b;Y1ZlY
zGf>=-4tj;+K*g!A&u*q5-di9b7;OUIv}e?;!M4=_P0D2^iVIRr<|!|9y}#{+9qw{t
zugER9V~me**GImLMA{pd*r;ATxbT<unGrusoN^5;1tk%b9jSq4y?W%`76L2P1VH9J
z1jNheUPPR_g2^;rmOXGQLwfu~hl@$~UJ(8|JJMF+h(WW@zKQMa!(U53ut0Lh-h7|a
zJ(C*!?zW@1<4nsI+vbupu~ozXs~ltV<oyV)upu*&h;ZgE!_L4+9ua7!BnsO8wayII
zTCH?09gC~4gEMa}mDHu(KqlJw1+h6Ko>@`Ekg3$;8^_ct;2H&|&j%Y=%zge1@#vRF
z<E<!%@HsTq=B<VSE)wu(FBDC-`Su0-5wUM60HSTHI_nDVH8pgX`K2?kkY3OyOQ1ei
z{zX?6O|tcJNf8r;LCG|O(NXhFPHK6Rk=#l3UD)*DUbtusPDN#R9H~ad>!M2iifIEl
z*f8vIaAdg>{-<@&^ZqhFVQCHEbBIPX*3YFqCs@tUaFbAMxwB**ruX0)jBZpY)aKSZ
zy!3m)kxI_pje174?FTCag-{Oqz7TYRJsVg6CHobBfhW&&=mc`YWNh`_NAdX+yOVgB
zeyL*fA76}h3-xy_zjXW$=HWcyoRcZwpi1x`h(8-W1LpjJrJ#7;mKnxjp>UQ;vIBez
zFc)+#`^T|me$28c2~ne%KQZ#cgr%6Wc#9CHsC3v-9hP+M_DIhNT@j9yT3vpsopGl&
zsQhYhO0nEEH>=hH=HU`&sa)zibK>8n?l~)ePF#skGnzfXO?1U|J%H53ESI&^)|#E=
zs{`}fHZ}2RvP9*CXV6mu9m_z>IFpugtJv$1^xudFWk!X5Qf#j<?8HDKScy`!5iP-+
zVXV$6&&xR8qg%aMx^3e2U2xyz2F^1jPQhXW9gutSFYzj;Ndm6kmNlID_cI@ew2N>V
z7?qyM%JJe-g}jY!5Mqq-6k-fc`qS4hFV=miwI3QTq*5Nxnlfje2|ZS0CN{`WLd?&H
zf;dtN%WJ`EsR<>OseKu+zPW4b%+?LJowjVio^iw5*$xF!fYjo-7zNIft9whh5LvGm
zH<D5F3X-6jrs&OWSQ@+<_)VBG%mvj_cZwq_FR|hMH}RK2V%y^<($a65<=drt?@R2D
zuG>UeTO5qz*1Yz18W`DYeC0=S1c#vr2)}dQ)Y3_Cf2XqE{`&%0vR1Os48Ht)wu*O4
zRj3YGo4pH*uDl+x7ie&y{1mUfy{&4dDp}@U`>9EL?Pv5S8yCGKGFQ3^jd)rl%;ISw
z#h*a3R$Tex3^o>}Bp1~wIu>~C?jVGa<zNRM1z9=XlTo+DZIXekI^1$=6Zy1UvU04+
z`i(($G6vNmeK)}CdvI2Rx#*X35OWB9P2V|1@@|Ym(oudJrb_R5F$YkrGC<Q!1v0C{
z=P<%Bik`!mow(f!DrX4|=yx+J!yWT+*PX@mU*IofayX=y!JLjIJemKk=)fM*qXF(l
zsM9{9CYvHj)KF-Y1F+fK0UNe%vC>suP^7-T%QA$tB7$kz0o#ZQS}GVPJW_g-Y>Kbl
znJ~&n<WD>QclcRuySP~b*l{zFvM~+ns8nmj;ifr>Ox*;CuJ!S@#u$A1@ll>%dySeh
z6LNmi^i`Sely-b7rKR`=ZB%G2$cDFpBG=tlGP)c=V~`(!Zm278WVN4Cby;&5Ub`85
zY!F$G*5}7nIrSDcWnatS$>XH{Q#%VXuC>Qdhh>6+Q(A7CHA-%}^mWr|(KceF^&puC
zIEbze?Vrt)Laj3jN-N?)XS}qfKus`$yqMxc$E=$Bc!FgFE!+70VXVpcO$jUR+p`JR
zVe#|R^vWoQlak;i-vTD5G~yV(LTJk_qR3BI&$Lya@iQDY2W5G~eL7w_25sm#;K0G;
z<ky2OM|DwNqOq)ejCvTlDCn6#_rkQ}XOgjVG=GnAZyWqL7%G*?lz>2Fv`*LCv1zWo
zI5;K1fAXI4P;)XA>*Sm7<;KI_y;;ut3*&e^2U12WwlQC+r8nDI?;fl#j&^AQ>2o++
zQ&yU++Z_+E%~$l+zrD?{@@S{0_{CZ66_lFk$YDpyXlV>8e&7LS79GNA6l-F92`hTJ
z^V9ZH!Y<0k+d8)Jv0+U8IvrfLuROOK^@z>XQo?vM*u~l>W{GqT!o7X&d^Vf7$IFFT
ze>y+ZPepH~dnVAci-dh|Q>R@esUIKKZl=G9i}J<7V)hn$-JfK{Np*SOexeh{X-fqr
zV6DQ=wsf>y-rZqy$2vK_*Z|4C<8dP)wIPdixsgT<)Aoq`9Y?rS8_S#=YVl{xj8l5@
zMy{`=RZi=RUi>hoSS#z+Z4GVA$?YEd&mZQBGf_$>64%8)A_9+NrmRDi;vRqB-sEfc
zS)tCuxPZ)?ny&GW7e1bk-i7VnLv*nH*|U~Fi9l2%j9)|$lQ#q#!1F%T<)2cgv96B`
zPZYiE3ZQlTqpVd_67Sbjck4fZLkISvt-8hIF$^O<%&v6%TppGESzLzP(&A$K90B_Z
zh>6dU6u;k^{)CwetYulbuT}3;0YB|#*e-?{2#M>P%gcXPXGzD8&qWeR%~=bHmzb-|
z=Ee3<cboPtO)YZ1*~<=;DSGuz$kT$OheAxqkAx?|6npVU3n#9JVbLp8p*LZ&CglCR
zF=SFd1F3{DWZx<Hv6%N;HGv15{)WZfM`gGEftX$qGrkHWld4bg9qYrsu<M1X^n4fw
z|Mt@8VV&UwP|>#jaMT85D%IRL_23JCiQ*B%=|JVRIK~%=pbJtbwiF`yn^Ye~RR2!_
zBYL4Du@@>m7{5beNf=*!CksqFBr^|thQ&*@pB#uEzx1EPDy)Qmp|3ddF10wgCU+AS
zKlq`0u+1sV$kGT6+Rpt)ycH=~h8=L9ZWwL>nhb8<(PwrnN251QVR!ndMzi~oAFD3~
za!&G37b|^r>fX|yjAcaTUf-<;ZRzH9_goXsDA%ydcY2pdfIEh>l&B(E;HNaxgZoLL
zcn5u6N%az#a4V`rO?o2glOCF*UJi1}Ifk}M*mr2iUf)_TM(_JzpYeMmcHy`(BA$G<
za(GC}cg91(QCupIL6NcRcj*LQc0+6FB3g_3fw#;^QH$?I6+XCe=6>Tk+YXbvTCh!-
zJ-bPPtHi##o-DqwiKj5(tMpeq0sSgoNVQqh@r9+bpxp`vm4~v-Yy+-3tpFYB?2<JN
z*e1(M$GmUHaPPWlkBHwQZz(k2UPw4YMHlY5Gh4skmRI%rSATvkw6bMQM={V^TtoRB
z5{`7(33k*sx>B`DI1%^5JCs~k*3@#FG!OlW)d6;KhW11%NmU3mHJ86_O|D_bXQ?@I
zI^B9+G3eK2;3Vh;a?o}j+4i;o6H~NW!TO>T{o=N!nu)%O)~aQzU@|TKh>oKz{7l!g
z^3(IKeIC*+OjEBw<_%tSk5rvyaM#_J=%*Eij8c28hxu0vc|vLB%^mX3JYSRP<=~*a
ztrlsTUI=*RiAAK^pOiswWpWru;J*~>D1gPR627Uzx*5{*dCsWN$aU^qPj7XC6ISIe
z*uCVCd={HMp4etmzQ9>E-qP~{4ah$?)doB`lg5%SC#70s*DQ%W4dq<oTrBV`?5oE2
z?iU?W@Xu?mGF4PcrFIKWT<7}9*kQ*fjT7sel%tlHmZ)JVM|{;7U?S*Q?;*c3Hy*?t
zr;*J}5@5z3{$oP5W@ySjQ&w6Y0~Y_DoJlppS{ftQ#2>4+B=v&WUxdmx|Cw)<A&*80
z=5d1JR=hYD{pa9e{H6=jXFbAHlEwMX(hkc@<$_J#x*}%WE_3H9hBaGM$yLrHx>Z%j
z&W+kh(N*4nv#q%-$8Z*#wgoeCsxS<HdA6(y{g?9?tR2j=UbC&4DK)^!3~~`qkFc!Q
zqeG8*LKHjCv?*?C2v%>T;FR^>S)|ZW2{{l9ASqNIR)i&p4>gMwkpfEme@YmHQ<VCz
zbOQpQpb-E0Qh4%5(D`cs6#Bm%8X|;K3ey-J1;xjS8{r3`Ms$M+00W2%P9eY{f)fm(
z{?A_o5C!G08uZuxoox98@jyb3hyoK)|M#mA1?A7<@gMs)$&Lci1QtQ%#z*`F3!>`d
oBiJEQfL{nGL>%xAQ4C?A`fr5=1%={&O#O&hhj3z)g8qX41(z;sSpWb4

delta 7010
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
QsQFMRC)=}2mcPmW0o}JwEC2ui

diff --git a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
index 8dc9614..e6d7b0f 100644
--- a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
+++ b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
@@ -79,10 +79,16 @@ namespace DOAN.Model.MES.product.Dto
 
         public string GroupCode { get; set; }
 
+
         /// <summary>
-        /// 订单号
+        /// 进料单号（领料）
         /// </summary>
-        public string OrderNumber { get; set; }
+        public string FeedOrder { get; set; }
+
+        /// <summary>
+        /// 客户单号（出货）
+        /// </summary>
+        public string CustomerOrder { get; set; }
 
         public string Remark01 { get; set; }
 
diff --git a/DOAN.Model/MES/Product/ProWorkorder.cs b/DOAN.Model/MES/Product/ProWorkorder.cs
index f40d881..c9e177d 100644
--- a/DOAN.Model/MES/Product/ProWorkorder.cs
+++ b/DOAN.Model/MES/Product/ProWorkorder.cs
@@ -127,11 +127,18 @@ namespace DOAN.Model.MES.product
         public string GroupCode { get; set; }
 
         
+
         /// <summary>
-        /// 订单号
+        /// 进料单号（领料）
         /// </summary>
-        [SugarColumn(ColumnName = "ordernumber")]
-        public string OrderNumber { get; set; }
+        [SugarColumn(ColumnName = "feed_order")]
+        public string FeedOrder { get; set; }
+
+        /// <summary>
+        /// 客户单号（出货）
+        /// </summary>
+        [SugarColumn(ColumnName = "customer_order")]
+        public string CustomerOrder { get; set; }
 
         /// <summary>
         /// 备注 
diff --git a/DOAN.Service/MES/Product/ProWorkorderService.cs b/DOAN.Service/MES/Product/ProWorkorderService.cs
index 38e1786..93ecb7e 100644
--- a/DOAN.Service/MES/Product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/Product/ProWorkorderService.cs
@@ -254,7 +254,8 @@ namespace DOAN.Service.MES.product
             int result = 0;
             proWorkorder.Id = XueHua;
             proWorkorder.WorkorderDate=  DOANConvertDate.ConvertLocalDate(proWorkorder.WorkorderDate??DateTime.MinValue);
-
+            // 获取 产品代号
+            List<SysDictData> ProductCodeList = Context.Queryable<SysDictData>().Where(it => it.DictType == "product_code").ToList();
             DateTime handleDate = proWorkorder.WorkorderDate.Value;
             //插入工单
             if (!string.IsNullOrEmpty(next_id) && next_id != "-1")
@@ -270,8 +271,10 @@ namespace DOAN.Service.MES.product
                         index = Convert.ToInt32(maxs.Workorder.Substring(maxs.Workorder.Length - 3)) + 1;
 
                     }
-                    proWorkorder.Workorder = "K" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.RouteCode + "_" + index.ToString("000");
+                   // proWorkorder.Workorder = "K" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.RouteCode + "_" + index.ToString("000");
 
+                    string nickCode = ProductCodeList.Where(it => it.DictLabel == proWorkorder.productionCode).Select(it => it.DictValue).FirstOrDefault();
+                    proWorkorder.Workorder = "K" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.RouteCode + proWorkorder.GroupCode + "_" + nickCode + "_" + index.ToString("000");
 
 
                     int sortNum = Context.Queryable<ProWorkorder>().Where(it => it.Id == next_id).Select(it => it.Sort.Value).First();
@@ -323,7 +326,10 @@ namespace DOAN.Service.MES.product
                     index = Convert.ToInt32(maxs.Substring(maxs.Length - 3)) + 1;
                     proWorkorder.Sort = maxWorkorder.Sort + 10;
                 }
-                proWorkorder.Workorder = "H" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.RouteCode + "_" + index.ToString("000");
+                //proWorkorder.Workorder = "H" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.RouteCode + "_" + index.ToString("000");
+
+                string nickCode = ProductCodeList.Where(it => it.DictLabel == proWorkorder.productionCode).Select(it => it.DictValue).FirstOrDefault();
+                proWorkorder.Workorder = "H" + handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.RouteCode + proWorkorder.GroupCode + "_" + nickCode + "_" + index.ToString("000");
 
 
                 proWorkorder.Status = 1;
@@ -411,6 +417,8 @@ namespace DOAN.Service.MES.product
             int result = 0;
             List<ProWorkorder> workorderList = new();
             DateTime dateValue = DateTime.MinValue;
+            // 获取 产品代号
+             List<SysDictData>  ProductCodeList= Context.Queryable<SysDictData>().Where(it => it.DictType == "product_code").ToList();
             using (var stream = formFile.OpenReadStream())
             {
                 try
@@ -629,10 +637,18 @@ namespace DOAN.Service.MES.product
                             NPOI.SS.UserModel.ICell currentCell_22 = currentRow.GetCell(15);
                             workorder.Beat = (int)currentCell_22?.NumericCellValue;
 
-
-                            //16备注
+                            //16进料单号（领料）
                             NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(16);
-                            workorder.Remark01 = currentCell_010.StringCellValue;
+                            workorder.FeedOrder = currentCell_010.StringCellValue;
+
+                            //17 客户单号（出货）
+                            NPOI.SS.UserModel.ICell currentCell_011 = currentRow.GetCell(17);
+                            workorder.CustomerOrder = currentCell_011.StringCellValue;
+
+
+                            //18备注
+                            NPOI.SS.UserModel.ICell currentCell_012 = currentRow.GetCell(18);
+                            workorder.Remark01 = currentCell_012.StringCellValue;
 
                             workorder.Id = XueHua;
                             workorder.CreatedBy = username;
@@ -641,8 +657,10 @@ namespace DOAN.Service.MES.product
                             workorder.Status = 1;
                             //工单 2024-9-13-组-线-序号
                             int index = (row - 3);
-                            workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + index.ToString("000");
+                            string nickCode= ProductCodeList.Where(it=>it.DictLabel==workorder.productionCode).Select(it=>it.DictValue).FirstOrDefault();
+                            workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.RouteCode+ workorder.GroupCode + "_" + nickCode + "_" + index.ToString("000");
                             workorder.Sort = index * 10;
+                          
 
 
                             CultureInfo culture = CultureInfo.CurrentCulture;
@@ -687,7 +705,8 @@ namespace DOAN.Service.MES.product
             List<ProWorkorder> workorderList = new();
             DateTime dateValue = DateTime.MinValue;
 
-
+            // 获取 产品代号
+            List<SysDictData> ProductCodeList = Context.Queryable<SysDictData>().Where(it => it.DictType == "product_code").ToList();
             using (var stream = formFile.OpenReadStream())
             {
                 try
@@ -910,9 +929,18 @@ namespace DOAN.Service.MES.product
                             workorder.Beat = (int)currentCell_22?.NumericCellValue;
 
 
-                            //16备注
+                            //16进料单号（领料）
                             NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(16);
-                            workorder.Remark01 = currentCell_010.StringCellValue;
+                            workorder.FeedOrder = currentCell_010.StringCellValue;
+
+                            //17 客户单号（出货）
+                            NPOI.SS.UserModel.ICell currentCell_011 = currentRow.GetCell(17);
+                            workorder.CustomerOrder = currentCell_011.StringCellValue;
+
+
+                            //18备注
+                            NPOI.SS.UserModel.ICell currentCell_012 = currentRow.GetCell(18);
+                            workorder.Remark01 = currentCell_012.StringCellValue;
                             #endregion
 
 
@@ -934,8 +962,10 @@ namespace DOAN.Service.MES.product
                             int flowNum = index +
                                 Convert.ToInt16(MaxWorkorder.Workorder.Substring(MaxWorkorder.Workorder.Length - 3, 3));
 
-                            workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + flowNum.ToString("000");
+                          //workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.GroupCode + "_" + workorder.RouteCode + "_" + flowNum.ToString("000");
 
+                            string nickCode = ProductCodeList.Where(it => it.DictLabel == workorder.productionCode).Select(it => it.DictValue).FirstOrDefault();
+                            workorder.Workorder = dateValue.ToString("yyyyMMdd") + "_" + workorder.RouteCode + workorder.GroupCode + "_" + nickCode + "_" + index.ToString("000");
 
                             workorder.Sort = index * 10 + Convert.ToInt16(MaxWorkorder.Sort);