From c918e0734bd2844431a7c7872b191cb2cc083b04 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 18 Apr 2024 09:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/wms/WmFgentryInspectController.cs | 12 +++++ .../ZrAdmin.NET-仓库操作日志-0418091737.zip | Bin 0 -> 8631 bytes .../ZrAdmin.NET-成品入库检验-0417171806.zip | Bin 0 -> 8608 bytes ZR.Model/MES/wms/Dto/WmFgentryInspectDto.cs | 13 ++++++ .../wms/IService/IWmFgentryInspectService.cs | 2 + ZR.Service/mes/wms/WmFgentryInspectService.cs | 41 ++++++++++++++++++ 6 files changed, 68 insertions(+) create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-仓库操作日志-0418091737.zip create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-成品入库检验-0417171806.zip diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs index d04636eb..e4576ff8 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs @@ -40,6 +40,18 @@ namespace ZR.Admin.WebApi.Controllers return SUCCESS(response); } + /// + /// 查询成品入库检验列表 一级 + /// + /// + /// + [HttpGet("first_level_list")] + [ActionPermissionFilter(Permission = "wmsManagement:wmfgentryinspect:list")] + public IActionResult QueryWmFgentryInspect_first([FromQuery] WmFgentryInspectQueryDto parm) + { + var response = _WmFgentryInspectService.GetList_first(parm); + return SUCCESS(response); + } /// /// 查询成品入库检验详情 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-仓库操作日志-0418091737.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-仓库操作日志-0418091737.zip new file mode 100644 index 0000000000000000000000000000000000000000..7eeca3d54e201c26f9bbf0234b683c996b813ee8 GIT binary patch literal 8631 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 uFTddbjCsuYvL(cmD(a2bWI( literal 0 HcmV?d00001 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-成品入库检验-0417171806.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-成品入库检验-0417171806.zip new file mode 100644 index 0000000000000000000000000000000000000000..8c540a2d335872de6a52fd4a8bd2a93bde9e4cda GIT binary patch literal 8608 zcmbt)byQsawq!$acY?dSyEJZ%Tae)HH14j!U4pwyaCZwKxCfWuB*ATX_r7oPzP!0J z_pRyw`kb?Bul1`_wf3%kl;z(*VF3UDIDmLmg0{mzg~SL10H6y40K9#@3U;z((Xx}W zFtc}Y_LQ{;JDQoeFuz`$PX^jx0s6+wZbZrVYO~mXI4sx zMahZH&3z&C8(VfZ$7dP=A3>~r_Gm?_$l9FO0SbhFb8|>>{>iR4u-X`{RO)gz(YREn z$f;>LuyNf9X}e?4Cmf+d{cc>a>_sF+D|dD_=^gzdP5}n{HEdFGa3ab^jDdf8sIxB_ zEs}Sc)Ax<>xbuTTTmy^xHElRVc40iw&pa&5Lj=xDU3Uc5I`FC$KQz`-Hn(I=TkHhz zTHpm&`ETTNay_~+z5xJ65C8z?SMqgKnbpjk-Kedy{;*&Zr6mU@>`ot7stk zU|^J*C*duJE8I(v{;CtDsOlI+~T%G~LD;f>qi}{|R>p z4Rl<8MQN)l9Yp;)zAFN5Fz|q_QV)1(ncxzDDZesmB#$(YGbH9^q}fe0r#}J z&c@kC)gE$`4iwB9Yp}-VwBk_tpj`>?MU~klOi0)@$$)#(Nl57PxplNGWs|vNNsQfn z-iocc#D+sB!YmR?f@wv85mlN(tZIz?EQri{aqOcumKm}>bhpe~t%m4Dp}cNGQoJ6) zADOB^VS;q>v>>3%XS1k%Z{uN8-OXnBBSPrFgC@;!BUf`Fcr`7~WEZUAG~s0Ri><<% z8VG1A_^Re?6~kgZ(`n}-w6>4x$_eyx9*1i<6fsHqQCC~zsYN;E!Z1p4!4@nq(j@n& zEiB5&$U6?!WZs$?zVGl6>iMkSmX_XSkA2U#M!uR03#^!T+JJWoR95jkShz!?zlrmQ z>Tvj>?*TEybXW6SS}=t#g)`Aaf-s<{D8o3NZ2~@Y($I$3Gm;_~cM=L@wy!lG&1&J> z@+xF6XoM z2dvb_Ww{$oD3D+D7|r{b31%c^;Pws%LY6vG^E2S@x;uYx(J6S zKyWVye3l0OaZz zY%!u_VS)wUFz* z;YL7UaLwK9@9)pe$;&Co$}8x&Z_95+fMXo10%VI2tmmUDp);H*PjNwrV91&bQrXu@ z1s?C%shK<_+}t*|G=D!8w(o3fy19HW?Qw1R*iR+l)YSd9CTeg`MkBRDY~ zZ_#c)4?&CFsAz{dqZN|Ar0;EnR1+AQ!m!`4%nr^i{ElWWUQc?bujJ+eWC|`K7ZHfE zfsqa%e}l1F^+qVuScbkebMvBnB^)sd#H3Sb23=%4g5~5uw^R6T0|&V%qGQgyf4$uXmQinWjW4dX zB0arnZ?D4{oB3M>p9ItA-3RPWN$XWouLhR+1OiR2Lll&D4vaTQR&#IG$c<~p`Xq6u zy*@P_^&5R<7#&7p!dR7! zSt2f`0+Q)6h|lgTh&fU?lO45kP>B*{`M7O1dNjv@C&z~$n9%k#_ckc~M$PmmIH}D! zzjAb+h}QBsjvo;t;^>5yUY>UET#O;f7|xfm+Vhy@CZ}77uNp*-IX1O}jr7hR7WY@e zLwV;|ze_&s9yHa^p>g*3%UczThTg$JJ?&&NKDnXUiI8*!20rc2BFqW}eHCjY)95vj zRyYtVoDFGrT&(;sFdT+^XiO0=Ii#R!QM&viIx52@?}xUwu5$4U@PXgYFLAj79X-M) z^ckPqg5~aTm&4{@GKl0$PtV!v^`74R-2vvi_0AJs+b&ut0D$qI4ghj6HM3=raB=w8 zl7GGVs`cWe3Aq7LtgxHV?tx7?p3`q$eGD!tAXA{tgFa>qV<;() zQ>Nk+lBX#at6^cHp>PALli7{3Oux@*@`wH!H*d6*pcP|v9}$kz2`}}tTiocm?$SB7 zF7@`Fh~r`8|ZYD=)s3q#i_0 zsae>!wy)*_tj|fB2Tdgth9VcwREr(S5ps2!@^$5mDEpg82On@n;Z9?urbQbs*MvG8 zxMKypSti34yDwqF7KHm)#|kj^K%YYCNx?Eut0N%^++>~?pftQ%c6-PdyxVtWz6Lkv zicd)+yrryF5iu3{2I8u1klfsi_!~9S#L|*q6wII;92FCa;3Yp(X_!8>+!c}~nN2j4 zJ-c~NQlX8f%4(GG8p7`v5g;Clpx`h;?)XyECJr<5?dO_^?LVXomq(xS{GD2L6Qv&n zkN^NO+#l5bgW&&*p}$gFoor__D+(Cdz`ZAm?am~vyk7`6T0{Wyi&Z1hsMd@%5l>*= z1SGS4#T`Ik!fEHr7stvF>*F(Wp(@{?9viLng|4M`0=ra!(s0MtFT)@9++Qd^vggH? zL1RNL$VE%4Nv;^js@amt&6dafr>S};AM;bjz*@-rHSV}>c<4UltY7tXquf`6FHc_X z4wO8I64|S)Ey;e$)y^G_8WySa!8FD9v-7+U;fvPdsscy`CkJUfsk}|&%jHqs5I#Dw0Y62`^@7w7$nFHKFP!O&|VWg-B2EOaW8pwGw4D%)tfm@WQ zz9S&kA?y2`deOJb?!|AH-$;}o2u`K&`lN`eGELVh>B%Fnh4^mwo(>gS&OantD;Fj) zO0Kc1FJP-Q6}7KzoMz}_=l@Xsj~nA2?(2WxsA;ohBI#o?qa#oOJJo^PW9_x~T?pRawz4 zFJe7MC}!8ZSe?7fb?%*C4b6Nnb6q{=e43(QYu`axz1&^@U`Zv>Hk^pvviy^9wdwRO zvoIL}bt2S<>c&>prl3)m8jihaA0Hfl-w|whbLeF_p<2%h&%;7Hp)D=XcIlCLvgR%Q z96r!?>dfcgv|gIZAHE*{i~nS}PHQzLf~AE4Cd>bi4nm4j-ksppKlEQ;G|_+2xy%05 z!~fOO%l1&i1+9x^m*iTTWlUebk3JO|x+!AQZc=eT%nj3xTMP||8U(A7 zpR4S3iTRidb&q@2Y-NWDB)qQsx!=VTN2h!g5-a~H4+T<{aW!k=f)O*`E#P9wT;K7~ zTXao9(``#7wFFH!!wN|{uWxio1+t(G^0Oz>H)EuI#o;<0pV(Uc_jd2QrkX!Z*YL8~tKq4YGo?o=4b;rbLat;c zT7B04K@G89YCDRa*}PH0#F#m-AyQ8jJ=RT%KttT|Jn{J4|tGg50e#-Lo;Q3ySo8g}a zujy*W0(LfGF?#LXjQ<*&-2a@Rt-(z*J@T)<4SOLJ|FUIgRT~w|P;>?P&sQ0vGau7lL<(8+>QU;yPLC0MeXEL0q183rn%ehG2Dw1Pd zWkx{XOsIqP%fo3{Q%CXcqlzH+ok-mr{jI_JKFSXc+6)@DU>%0l&qLTbNnk4`R96j% zHiDb7r+Q=NF91Pn9N_A&xAkl$_dc*f)|E_3HcX#eh$ts2Z#kk{OeG^|hB9)sutj7~ z*P_2k;%AHc)v}|>x#gZ!A>xT$#D!L&+vud*)6KWk3O}L&9!t+003QRWKy5?{T z4ghE7-Hd4#xxVJZJngaYE?ao{ctlfVlj=gX`DL+c3$_zl^=7RIr(qDJEEVo{>#V^7 zS_38KX1`|6uw3|QLgQm*dtu~y@T0WSjbrkdvRXxyc-W5nnNEw zVYS`$)-={VH!)l`l=HF#lZAwtl2A{gu|G+3)Vr1CyQs_a#Pp!cCNE!{>}|2|m{*{$ zKaM5N0kLbgu;ast2M*?>X%tZx(|(rCHh&6HDLfJC>(cETxd~Ex+FWTWdZ+)uTG0|% zv&Egfl1wgGzv?4HK5;3 zeV15O*)Hs)46LJe)B(jV|K#TAV`xW#X}thD?pWtX1ze3_4;@?K*CFLpm?+t0hN0Lk zS!WI3&fuXTMh#NMbJ=O} z=*>Z(D2#_Lfc2H>^%J}WS3_}>6|;EBIv+EHgDHv2Rhxxj?Xo?W_afAr-}kh-*`eDKUD)0|f6Pra@PT=qsOp<9!jW}z z9ee^!Chema74L(7Ydchf?MJXo4qC6VF%~?E)>Nn#%S&@JFZTOxWKd7_#|mf*+<{}8 z3r?X{f1S?kwfm4v8`1cM7fzB@?@QIX6_Q^MN;+yj^pH$yNujvsvCPjuiVlvaA1R`7 z-rqydoT{P4D5apqfUcJcu)olbs%2-9ecmy$yHO_xBh1AL&R$RCn9s7x`Ry7-Vlh~B zR`-Wu0mcT9g|B7B2x|0~JZ>dF#4Q^T$J45~F~l2F%ic%NGCu6W%b`;QQGOnkhS5Vy zedfUp0fveJDZMo?%`}r&%%tPhgza#VV^@ZYIsxCINw4Ag?ZptRI^3paRMuO3v9lwd z19&0wY4@Mzq()Sq#>iYj#5 zFqnN42kH1VK^@4p9Qv~){VCN%kQQ!sn5I_cCDQl@b>TpQ>~~)|^Fjvii|0v0Id)|u z5yYSOuNB_7Ncqob5aTtl)cjIi;#7%KpusWB30KXtfgG*?VQvgEjaSS2pm5<^@;~_& zP%8k_mJ6k2wV;m?5!;G2U?S~@CwVdDWoVGYRC75Xmz=$XBk1Tl$hT-5-6jv0s5?26 zV^X{cP^Zv)B4{E_>L|z6(p1IX(GhAgnq~k|$!tQqoD)n4rLX0B!Cfa|;@!-YnnhmW z)e*x`2Fh69m1tKB83VDBc%5w>A_6S(S(K0BXb3!g*}udCOFaYJZ1dH4Jve49sJ{_2 z$jk5tH;>@ziXGmu%g@^84kZ~1!{3gia#f)HfChc3k7=-PTaZa+G^rF%=7nBaV#i&@ zI^L$I)0c^nG<)y)Y&BkpyBwXx3Z}r*Mdh;fF%#&#KQVtAzbx z=0`eYUsaqn+~6B5ijaAvwZ zI`l=jF3HNx>dsN+MTkD3P6(^(#j@OJK%v7MJ^9YSO_dZ_C~GyfFX-3Uck-HnS1#^N zQN1y+H~#(ny`Q#@qzm30JFeYd_YL+kXyx}pi1Iw1@n+jZ5xXgo&$z8qW9m-8ZQmfaWd z6+2WBn*A(14q1uN4eU0?TM|aS%+S6sbR?`MkcLA%jAt{D#?;PT8d__L{bsfbaegMI zGZLU(zKGtGUWFGa1^OC+;1sE@?j0v@r=yI?RU^Sj|9*t(+8g*mD^zwk4~;PG>sbUt z+st@fDt*mx@v|6XBdsOnj0!RbbDId9bEkQ{<(OH2>+XB3-M9Ox<#y=iaRNK?#=~%{ z<6)SNZhF@K3Mv!;a`Cvn5GdL9wJ0B99bR;#q$~3H#oJ#6l9c(`NJCEP3Y0K@<{cjB z0u%EtDVi4=DYd`a8zsMm_yIAlLm3_%3`sEN-suF*{6^r`Lx zll5pA{6^~J>RMGyG`Ru&OcI$4g9t7xp4M`iygB+FSPDvENm}o7d$NfX^yP?U2}slT zKg0|b*fYmPfLcYFKgwQH?DK&kHrc=`3#0L1DF@10^RiiDua}5SR>>@VDPt+4SjIe( zCsHm5Au7vJxdAU>(#S*$Kle`jA6}kb47civ?9`NbpP{w*EX)|I5?DJ*!`J0$)qUS z#q$|P=3{cBd~Th!Xe>0p8E=Ad1f04%CvSgt?buc^A&+Z?6HK22E|j2LZ-VVaU6nhgMAr%n#IucpUX8q&DLKa~+-!Cn~q|5J4EEZ}I~Q z@MW!W8lrmD^1&8FdctWj>w;7BrBozqP@&2K>a>8QneuEls)!UD@;0Q1518kS{q~YM zaSdh=i`1Ph?@)xbGlDy$=hCU}lQlV~$s&gexj8>V@;u?30_V{^QjtF?{$IB%JjVw3lkP~vcOVnwi-%Wq@lt!0aaND)od zOlGF}8^BSZdST>6rtJnDp^M>fJYNqVc?cL7C};^u{1S+<_&_Q-l>U4VJxZG1f{0HW zHs{loiH|gu?j_?ln=i1+@(_?%fPcNBex17i%kN(;tp7y$bJzJB;^}pq|DSC>|HS@t zpYt2r75X38|DW5PKkNOO9{;ZA4*!pO|8|!AC-R@+f|3 public class WmFgentryInspectQueryDto : PagerInfo { + + public string Workorder { get; set; } + + + public string Packcode { get; set; } + + public string Partnumber { get; set; } + + public DateTime starttime { get; set; } + public DateTime endtime { get; set; } + + + } /// diff --git a/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs b/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs index 8c887a6e..55bff388 100644 --- a/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs +++ b/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs @@ -13,6 +13,8 @@ namespace ZR.Service.mes.wms.IService public interface IWmFgentryInspectService : IBaseService { PagedInfo GetList(WmFgentryInspectQueryDto parm); + PagedInfo GetList_first(WmFgentryInspectQueryDto parm); + WmFgentryInspect GetInfo(int Id); diff --git a/ZR.Service/mes/wms/WmFgentryInspectService.cs b/ZR.Service/mes/wms/WmFgentryInspectService.cs index 3bf77ebb..7c8d0a86 100644 --- a/ZR.Service/mes/wms/WmFgentryInspectService.cs +++ b/ZR.Service/mes/wms/WmFgentryInspectService.cs @@ -10,6 +10,7 @@ using System.Linq; using ZR.Service.mes.wms.IService; using ZR.Model.MES.wms; using ZR.Model.MES.wms.Dto; +using Mapster; namespace ZR.Service.mes.wms { @@ -35,6 +36,46 @@ namespace ZR.Service.mes.wms return response; } + /// + /// 查询成品入库检验列表 + /// + /// + /// + public PagedInfo GetList_first(WmFgentryInspectQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder)) + .AndIF(!string.IsNullOrEmpty(parm.Packcode), it => it.Packcode.Contains(parm.Packcode)) + .AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber)) + .AndIF(parm.starttime!=null&&parm.starttime>new DateTime(1999,1,1), it => it.CreatedTime>parm.starttime) + .AndIF(parm.endtime!=null&&parm.endtime>new DateTime(1999,1,1), it => it.CreatedTime(parm); + List inspects = Queryable() + .Where(predicate.ToExpression()).GroupBy(it => it.Workorder) + .Select(it => new WmFgentryInspect() + { + Workorder = it.Workorder, + ProductionNum = SqlFunc.AggregateSum(it.ProductionNum ?? 0), + Partnumber = SqlFunc.AggregateMax(it.Partnumber) + }).ToList(); + int totalPages = (int)Math.Ceiling((double)inspects.Count / parm.PageSize); + var pageProducts = inspects.Skip((parm.PageNum - 1) * parm.PageSize).Take(parm.PageSize); + + PagedInfo response = new PagedInfo() + { + PageSize = parm.PageSize, + PageIndex = parm.PageNum, + TotalPage = totalPages, + Result= pageProducts.Adapt>() + }; + + return response; + } + /// /// 获取详情