From a205964d4050e6515aa2c96c79a74786f218d130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 27 Jul 2025 21:05:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nflg-wms-admin/pom.xml | 5 + .../StructuralPackageOrderController.java | 105 ++++++++++++++---- .../template/钢构包送货单模版.xlsx | Bin 0 -> 12208 bytes ...tructuralPackageOrderForPackageItemVO.java | 15 +++ .../vo/DeliverStructuralPackageOrderVO.java | 2 +- .../WmsStructuralPackageStorageTask.java | 58 ---------- ...WmsStructuralPackageStorageTaskMapper.java | 20 ---- ...msStructuralPackageStorageTaskService.java | 21 ---- ...ructuralPackageStorageTaskServiceImpl.java | 27 ----- .../WmsStructuralPackageOrderMapper.xml | 2 +- .../WmsStructuralPackageStorageTaskMapper.xml | 26 ----- 11 files changed, 103 insertions(+), 178 deletions(-) create mode 100644 nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageStorageTask.java delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageStorageTaskMapper.java delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageStorageTaskService.java delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageStorageTaskServiceImpl.java delete mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageStorageTaskMapper.xml diff --git a/nflg-wms-admin/pom.xml b/nflg-wms-admin/pom.xml index 41faa6f7..c491945e 100644 --- a/nflg-wms-admin/pom.xml +++ b/nflg-wms-admin/pom.xml @@ -118,6 +118,11 @@ + + cn.idev.excel + fastexcel + 1.2.0 + diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 0b9dc184..bea71936 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -7,6 +7,12 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; +import cn.idev.excel.EasyExcel; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.data.ImageData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.write.metadata.WriteSheet; +import cn.idev.excel.write.metadata.fill.FillConfig; import com.nflg.wms.admin.pojo.document.PackageMaterialScanRecord; import com.nflg.wms.admin.pojo.document.PackageMaterialScanRecordItem; import com.nflg.wms.admin.pojo.dto.SAPMaterialInfoInOrderDTO; @@ -24,10 +30,7 @@ import com.nflg.wms.common.pojo.dto.SAPOrderDTO; import com.nflg.wms.common.pojo.dto.SAPSyncFromDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; -import com.nflg.wms.common.util.BeanUtil; -import com.nflg.wms.common.util.EecExcelUtil; -import com.nflg.wms.common.util.UserUtil; -import com.nflg.wms.common.util.VUtil; +import com.nflg.wms.common.util.*; import com.nflg.wms.repository.entity.*; import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.BaseController; @@ -41,6 +44,8 @@ import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ClassPathResource; import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -50,7 +55,10 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.net.URL; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.time.Instant; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -94,7 +102,10 @@ public class StructuralPackageOrderController extends BaseController { private IWmsStructuralPackageDeliverOrderMapService structuralPackageDeliverOrderMapService; @Resource - private IWmsStructuralPackageStorageTaskService structuralPackageStorageTaskService; + private IWmsInTaskService inTaskService; + + @Resource + private IUserSupplierService userSupplierService; /** * 搜索SAP订单 @@ -558,6 +569,52 @@ public class StructuralPackageOrderController extends BaseController { return ApiResult.success(structuralPackageDeliverOrderService.search(request)); } + /** + * 导出送货单 + * @param id 送货单id + */ + @GetMapping("exportDeliverOrder") + public void exportDeliverOrder(HttpServletResponse response, @Valid @RequestParam @NotNull Long id) throws Exception { + WmsStructuralPackageDeliverOrder deliverOrder=structuralPackageDeliverOrderService.getById(id); + VUtil.trueThrowBusinessError(Objects.isNull(deliverOrder)).throwMessage("送货单不存在"); + Map info = new HashMap<>(); + info.put("deliverOrderNo", deliverOrder.getNo()); + WriteCellData writeCellData = new WriteCellData<>(); + writeCellData.setType(CellDataTypeEnum.EMPTY); + ImageData imageData = new ImageData(); + imageData.setImageType(ImageData.ImageType.PICTURE_TYPE_PNG); + imageData.setImage(QRCodeUtil.generateQRCode(deliverOrder.getNo(), 100, 100)); + imageData.setTop(5); + imageData.setRight(5); + imageData.setBottom(5); + imageData.setLeft(5); + imageData.setRelativeFirstRowIndex(0); + imageData.setRelativeFirstColumnIndex(0); + imageData.setRelativeLastRowIndex(2); + imageData.setRelativeLastColumnIndex(0); + writeCellData.setImageDataList(List.of(imageData)); + info.put("qrCodeUrl", writeCellData); + UserSupplier supplier=userSupplierService.getByUserId(deliverOrder.getSupplierId()); + VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在"); + info.put("supplierName", supplier.getSupplierName()); + info.put("abbreviation", supplier.getAbbreviation()); + info.put("today", DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); + List datas = deliverStructuralPackageOrderService.getInfoByDeliverOrderNo(deliverOrder.getNo()); + datas.forEach(it -> { + it.setTrayNum(Math.toIntExact(deliverStructuralPackageOrderTrayService.lambdaQuery() + .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId()) + .count())); + }); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode(deliverOrder.getNo() + "送货单.xlsx", StandardCharsets.UTF_8)); + try (cn.idev.excel.ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(new ClassPathResource("template/钢构包送货单模版.xlsx").getInputStream()).build()) { + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + excelWriter.fill(datas, fillConfig, writeSheet); + excelWriter.fill(info, writeSheet); + } + } + /** * 根据送货单号查询订单信息（PDA使用） * @param orderNo 送货单号 @@ -605,6 +662,8 @@ public class StructuralPackageOrderController extends BaseController { @Transactional @PostMapping("receive") public ApiResult receive(@Valid @RequestBody @NotNull StructuralPackageOrderReceiveQO request) { + DeliverStructuralPackageOrderVO order=deliverStructuralPackageOrderService.getInfo(request.getId()); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); List trayNos = deliverStructuralPackageOrderTrayService.lambdaQuery() .select(WmsStructuralPackageOrderTray::getNo) .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId()) @@ -627,25 +686,23 @@ public class StructuralPackageOrderController extends BaseController { .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) .update(); //创建上架任务 - String deliverOrderNo = structuralPackageDeliverOrderService.getNoByOrderId(request.getId()); - String taskNo = "NFS" + deliverOrderNo; - if (Objects.isNull(structuralPackageStorageTaskService.lambdaQuery().eq(WmsStructuralPackageStorageTask::getNo, taskNo).one())){ - structuralPackageStorageTaskService.save(new WmsStructuralPackageStorageTask() - .setNo(taskNo) - .setSourceFrom(1) - .setSourceNo(deliverOrderNo) - .setCreateTime(LocalDateTime.now()) - ); - } + VUtil.trueThrowBusinessError(!inTaskService.generateTask(List.of(new WmsInTaskItem() + .setPoNum(order.getExternalOrderNo()) + .setPoLineNumber(order.getRowNo()) + .setLineNumber(String.valueOf(order.getId())) + .setNoteNum(structuralPackageDeliverOrderService.getNoByOrderId(request.getId())) + .setItemCode(order.getPackageNo()) + .setItemName(order.getPackageDesc()) + .setUnit("套") + .setIsQuality(false) + .setUnqualifiedQty(BigDecimal.ZERO) + .setQualifiedQty(BigDecimal.valueOf(order.getNum())) + .setFactory("1010") + .setDataStatus((short)0) + .setOperationUserId(UserUtil.getUserId()) + .setOperationUserName(UserUtil.getUserName()) + .setBatchNumber(order.getModelNo())), (short) 1)) + .throwMessage("创建上架任务失败"); return ApiResult.success(); } - - /** - * 搜索上架任务 - * @param request 查询参数 - */ - @PostMapping("searchStorageTask") - public ApiResult> searchStorageTask(@Valid @RequestBody @NotNull StructuralPackageStorageTaskSearchQO request){ - return ApiResult.success(structuralPackageStorageTaskService.search(request)); - } } \ No newline at end of file diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..0a6300638922d09abc4691bcfe98da40fe795230 GIT binary patch literal 12208 zcma)ibzGHO6D}nojUe42-6bF`-LUEI-gL<(rI8e*LApb_JETKex{>bYf_gkh&$-{d z>kl@+&BU7LnKdtK-jS1pgnA10xB_IB`5!<3T5u1)7y=FC?0`1*3~~=*=nr4OeivKA zg7>8X2Lq#r00Tq$rFRto9f`sxDxW~@9iQo8>J?>_V09N!AlR!JvUq6~8;mT$SVF_+H7bQRk> zm2(j$mm-KyD~t~c4mx>R5+frEqb3FLLoenu8>U7T7!~9Dv{sh@ zv+!lY5}1OyRLG)HTl2MQ$IXiHStH4^XW@JA6h&9u8uyCE*hP9|4_9{9i;Hk*#&#sY zsF|taN?SliA@F%I@`JPM@0Y?xEz4F1huYdOpRTS|U0k``U%6*&1&+QQWgR#G%6e66 zIWc&J3UXC_vy&qjE%5=t?LU_&XE*cn+b`4@^9T1Ot2a8xxN94nV6%E-It6EZP{+{r6$6 zk%`Z(c+D##s}wZwnd91$sxvC`p3h{GjYxOhT`MHvGCP$oNfRXyK~m#|+aGK2UGW2|d*2OfpZgBCLzhB;F0*4?w+IpvW42<#pc?a=fV6Lfim<}-GbIar z^mJ8UF^%g=67AY!UK94$Y-v}>Gj;Mh!aD9EXh~ol3Y};nj7%@3vd>Q&M_SX*z}PPv zAs|PSWkBK~JY!CKe>ojE&7#-Ja#&2l$_YPb+X}E=T~i`Z?&}0xUGZH()JO7mVH#|m z3wS)^2T92ghw*_uqW|A@=z#z*7t8Mz=)VP!eh4@N?JVp~jf@=rtX4<%&XI2sz`)2< z!N9QoCHq~4>5|A5 zoI~6|V}yuVcO7=0oopapk+)IEQNA`CU>_9s7-y9vs?lpI>bQbPzOeTj;&)WCO z@)HOQRrjs0!llb=agdykyUhW6(5Knz?F`7LP5}0Ujk8;u>S^UQkcMd`Uf9s!U_gOg z*F(#VN7%)V3n|eQ6nh_p znno(dn#T2;ikwe{SmGuNK3b@sQ!@m7Xmu=JPZkz7DeBz~$Qe+HaDl`;w=UCUO`YwV z;e28^8L>UCsc=h$9 z8C$C{Ui)k*;Q6J8{HuMLrt^fOxmk0yfy8ZsE{W#z`a12#JTTIkTUBDzNyPt9%;SEz);-o*J9TKv zCoHlN9g?wGI$+&W?>&w5hT9fcQhjQVY;7)Aj^DhZ!sr1S!s}v1_#kbz-<3gQN{wKl zv4~3v{?Tmq8N2QaQm8b})oJjv!?PW?3sj1UubA<>aNGixkx(!ScygQ(OI}^zD-aoD z{-H>S*lni-^f+}zjiwy=b1s3JZ0K+$Gf#9Q2#ej^a|;`Lrc*dIE8!b>Pc(xed!Kxz zEXR*o@^S*lnh!94p;vjCGNq!i=w%DONy+cy;k|UFc-=X#=rghiu?t#oghV2vw`u4> zhe1a&ih9)}7nGOpj9Zwr(8ql(POMi^#KP-`H<#yl_ES<&2A_|C$Ks2L!woIQ%oTe=r< zOudS*SnVtyxi?MYxxq4y2bsLNSB;FF=}L7v$RH>%7=!iYJdGhl-mHJYKZ}Bo6Kugs zftwTXHQWOWt+PkirynHC;EaBX^_uCyvR2>-FLFfpIbFvpL^cYezlosp0WY!r#$;E{ zuITZa^(xl9R+2cBs{(iiCG@E)g>Hq3i}PL`XEw?z6VJ0c-^!ByWF4~dJ-qh%5SF01 z%h0bXiVvdMD`C0tOfwrx4ZqBmQhcaA4so7HHgIvar6}W$mv^=mk#~*wAk|_zbg-xS z=9kSU_5H~j)9o75hbarSCS3l`m?ly3N#ajJ)8oRp)9E`*Qv;5F#nn2awLVC9>tLQQjY{j5l~HK=25bYFFRa+Ed>BL8gX!&gjr(DQaExPKU3kj>IC@ zJV_rkfAFzrO*^Mjrfd0b5ql!pOC0LE6cIzb*GP)q9NbSRTZPdE>Y2Rcf4J|Fb6 zZ?7KF+#g(9iW7|Jeq@(RY#pg3m%G~r#EaVAaNoZ4vl}e@^cf}8NsH= z`V~X%1$M4K>CFEW0+NWCg<1r3a&Q>0aQ-|70yxaz8L!&SdY(uT>mm%j&EFva&+6U9 zKgbWf^&2b}GP zqY;lJ$q4-81oYo0M=}SL)7|f3-SNnstbS~xf|Vw=i#6O7O-s-En!a>ZP;s|H6@f{KRiAn4Q2? z?Hqx-;8*1T%AEphePwAYp6p(xhJ4QGi@F+~?-}_JGR$K}{v%`on8e&HWukBkiC>lNd%#Z~0|s>dji6T2BhlL5A$T~m zxxK}8c_t4Lx8q-Oej1*gn|rT%Noq`?iw6FqW&*xfZVym^E$;AWhMJTI} z)c`A#_!;92OOpT3!t&j$+M4ppO(BW$U9uX6NtD^ol1BZbq^YbO*+>!hJQM__(>Ci) zrBaP0Y!78PCz_wd_djqnSANJKzJkCQPZQ#gajU@$j6!s3_C%kYoquGGcBkk*T=%q_HT5@+nr_m z@+aNrTjEpBWfRx*wb{qd*N*aLTJ=7r5`4YPY#eZs2QIAwxcx2ZjuU#^-`v8wR`qpW zK`MD%?7cyNUijp{Gn|xo7w&nz)aQA36av&eSzvHVG=ht7zBxF*zdO{?xx2|BygwYe zzr8MLW>{#PRVKu=3gWA%Bv25%lD=%ZGO7hNtM0o=a%y9Q$>X^i>`o z9%4Fu9kRW|rIr2z#M(N$Q$4{(gZ?LaX5A%P`Bwxokk6x7w=bMUeZ%RmQz9r4QH`kf zF6?P<3hD_xY@Y1)V7-`vyjI#t3nP?_-&LX}@zNusFGI*VuxxYjA#-1oCtux!x}m7} z1Sn#sfg{P=&!PmcuBLc~rt9gvR3+Q$OznpQOG!wbT<+)Ujk^hc95=uc+j)yzPxumn+WRXU z55`SFbh-xUwTmvCCT*aVc<9B|0}3SDh^Try)5x;VG%SS8FGSD`TR38%?zB zkncsZmkRcqFRo{08=F%==i8rEtQ!~)o9|Difz2LU&~3cx%x;&bV|*!mpv!>`&%1*T z@P!pq%QjK6*0%Z}*#>S}@5-%~ss6*b=J-xZk&aLNOczcydwo+7^GT%JZMz2CF6W$L zf$%O?XD!QIp_fu<-TfTP9S{UeBInr7(2M>FeSrt2u_Ak)FZ(;@1U9GGoH4VM&9BQ5 zDxzyNoeV5T8l>f^<=-mOzB&z+W^yXr<0V$s3>RyO*L}7%_hO!xWH2JMXNo#AYXn@J zh`}CHK&%oYG2_iVZ$>fT{GjaJTSV_%-y2v(n$XE%sq~IDySHfO&^IWbr(WA}Zg>ZM zgNKU`V>Hs{>kzE5w6;|(i9Eq2BHXJW9C6hrttC_ZFeKCw7qnAm#vvlU-i9QOlQgFN1`axX`q_puXaqmX1}ojj7pnwB1ao73AR>(-S~^UUR9G z4{LuXu)b+*;TlanXHgZ|bVv_NImrK24-%gy!dvtwKji+V_O$O#KuYxJ%C!)H6L?&{Ih#v{5-l;0Yv_RLPoBaQTA-` zx30Ck@wF_cFewePP`h&R&7MsH3VrnDbguDDSJMWw;@Q6U>L*H+!KzrS>L2dkb-uPo zbSjwPS5%}j-A;D6S$Bezpx{^QPHox6=cT~@5+?UTLzvX%5<@Hnco9M=+2yxGjJg3n znI2srAV{`OKrY^`(#J5yuUJH!pkW0MwUkUg39aTj*&{HzOSbYE3T9NQo++Iq+4G6t zP-WYtQlbuCA?-B6=&R87XFw^F8zdhziwbjUFJjb#;G9@d7P157Pw1bFZi`s61)T;a zed_#=Y=z6QFz`FkkMWAL8ZtAQW0)A5Ff9DNaEPgJmN*p+Ye!d}r zZ+6@6cL@)P%LjJ2*;@Yl5&UG8F*4y5dzGZDsAn?XTstyu^g^ zGrb|;p1672!C|l|NqcK<4lQbN%iaifOXpJ0rmcUDXE7O!KMW-mDi;UDb-ksodya7} z1WNa+j3ZE~2+HL=Ti){RPUlC=?2OE};G`bZqel9CzW8^888SrEd7Bn4Rl309{WgaK)u1SAL)o=K*_Dj&FIHV_z$oa!Z|u9!XQQiF@V zgSiF^SPdjLG3AO;z>pG=M{5oi^T&(S%nXo;)O!`y9k}fqSKIetaN6!OFHfU2(0KTQ zvvuq#bDD~$omuh+DP>+{lVw$aF4>S69;>5{ao6yQ=^*Cb>aomiqQTy$QLgugR}N0W z;3I?eT6eaQ81@ZEcl0&0Z>!gJ*k`XCF%wHtosNtc5;56#ir(oWxRugNdWiTE?n6i+W)P#yZS>9WEOO@Fo&}t+nm0d;&PY|Q=slm+7 z`J#03R%P1NX>@V6o7TC%7qcP4XbmG4IFlG6b306r_wvO?;f=q_5SLDf`|eJimLUwh z%&iYrmGhUP&wYJqo&Csi5tRvH zX4*!WcjYg@Js^t*-<_xUDc8Q~(2d34DPOBDUfZ2Xqq*XOS$93Pm*sFauB0w(1gncM z)H0k#!&}8H82>ccr14I1b0p8xCvYLAe@5+1voTvD`XluZ7HAq)EnI2lQ{C| z8Q$tc^Bn~W3=H}2j;%frXz@LN73G16j3^$d75BQAub3i+DJV0aN)J=B0b-1|&RAdC zKo#hc&SK|f-=0sSj4CHmq=a4H%$Y1Wckiq#J>PsG)(M4N#_hlekrMd+P$;n3dZiVL zG>b~sjF|K71qOOkyyqQjfuH*{{Gm@Mmrb- z8{8Dv5V^_Ilp$v2mf};ek$ktbtgRCzT_w3J6{@iae-}dq`F7kz1F~>{gQ4Hcu+OYJE#CRAdU)tcrl-*WWy4uo6Oik9s1Zo6Ck-seUg zD^H$o(B}}x3eA%Z2KL0x^WAL?=O>prA3OTL(yDN{j^6ek^ZlL>QkygeA0N8^nu=gx zh(D{EgR7;{_j0zYsZ}y7hTSB(%%@ts2ocG(@akn^rp?T|icueB^T-G=fXwo$>ILbP zOiVd!-Y^}^a|}2P%0gxRX#f@G2^hS7fzj+Oi*$m0r_N$B_AJXvs6n^1oux2?o2AKm zvPp{Tdh))RPIA1zgND84Tosqynw?rKtA#GIqs7=$iV3UkL>J5PgkN$loXU!L{!L%AzEKV>ZER0Z6!UBvQ<0UlA^9HS{#r{cGQO} zbfFqa9<^n0hNAm5s)Zk@A#Gq+DJUvS=$LXUOX5Zm2TNBS2MlGo4JHx$v!&3U(ZmrikcPgga!uZ_9!nG$I_N#yW zF!C@W>CPPhNp1+N$zgUFuUOr-^llJ8WmlGKgOrr$kf4bSwy|#?NANy1HiCi_j}VK(p9wWKpZK zp-R-l6p_HWs*mq@Ou_L%?xA;XXHa+hvneoR^mAu&D&19CI0v~y@i1M`gK2`bJ_3fhm2E zA&Rwe8J<~0!Z255zG=|+g*Fa+0#BAOZF(8J!5qoDz&Imtnkz+C_7hEBbdc?+?}_d9 zDk9NvHR;#8(en}*&dr=^yxB2m0__cf=~*o5lmrGSCDn6r`a<`JV9b!G0@MgZA#K!( zYPe-FG4Jm=a*TEC-CQE0CNNmTg%-}_YOy*7+K5GP&hSZUShi7?p48`Kg}rpHf(+=i zaq}a2TY^s9P$=Z$P3>iL?ltB^BqB4ZA|Qa$9+iN_T;Y&sRHm`i#?N(*B41BL?PAmD zs>g(+@A1v^i6a6?Ss?6-k-%}O|2TdDsv|f^POc6e{bDi%vXk`?FBje@*sOCYlKF|p z?Q&eO1$3)p3HZ1#T2Asud>Y!~IiV&l2CVp4B&;l>dV=MVy#UkPSI01UrIfhJfJN3E zqWB3!u>mTv>_dL){udJd;$KX9_{4PCQi=2ucnV*Z$``^?*2=4-G@xWi6hAxm45eC! zj)XyOc$x9}E81seyyBtgvC%=RIb(Cg$&Uli!Y%bMAq>f@PyMO(NH~uK9lksT{}eSF z+%EP>0ZK(X!UKo%0OG{eo;%w}NewEr^FZLWF0%qqp-78nr;b-`&E)w7%_i%@I{eM3 z<$K30!XuQEb!>dm>oji=^W=EDq#+94kb9(S&EjrPs?5{*c-NN=4D|H&^|DEHDF(A6 z3;vp9yS`I2+;Cuu)^jzCJzGw(j0bV822PE(S2J9`{pJB!BqxGm+3kLKM2H=(Jmb@i4?zUG8{&F442EN0QWV@AirY#!*FS zITz_%FFDg$gytn?TbKp}zfJ)=Td9bAi4CU`;xv;duApKSCW4IU9lt09PV6snGklqf zGSbu431&Yo*>N;f&#b8{i(0KCkfY{IEc2lV^3hf|54|~~pxhF6j?Z&1uN%5Qb>}bW z>~lyqW@bvwCFYs%8hKJ4AGaWZ7xtRW0j-vFD3w=>*CPOYK6TqaN5jwtywZfc?Y5pF zWiIu8Cud{-mMaii!XSM~>uSWb&yzQW@75LtymFrv-`$WHXK8IeRfr^{**_=^TO0=_ zbtj}No@J^@@lHDeXEQ8Fd@mEWO8uG@#YGB_l~_cvJts0fkM7=a|EBf0lY#KbR@x;M zPJkv5Mcm}>b9Z0)&=6rtqx*hx%!MhK)XK^V$p|av{l)R+R=t3a>C0phqH|_p1KQLZ zv%3Ok%;r~G4fh|22ojKWmzU(#S?8C1$BvObF*{oN2Bgr5Z~M9l!D~8`yWP!QFygw% zMGrbYi|c)RyD?%)7I*#3G*b6{n_EB?bs6@v=ZS=HK2g2FIV$8TLXclZx`0}U zw84OvH?23?xkx-9@iAhP@eI~9%A8dHyo2D}r|{;kXWbu6klQI6D0;*TOsPY{_h|19 zOg-*7j^8+A61qR{T5}ZG>kI56kJ1SWadKt+qT=W1c6dJ4nd}MkS-`1=Qc!w;@D+Uf zv9>SXd01Pbr`>b^jd3}Q{H2>gS#2H=n#hvYYe25wrAaFNy%Q!YujkRhP5b!=zWcb| z=Q92Fu4voo>UU8}Q434iX8s&X#2 zb~)QeV*|C1#x83UZ+qVv`6VpHXkb#Sv`B2KSu_|gA+dOyeE*hBat}|e2*cc8g&r>o zEiK51oE4I_^tJS0z32$6sy8$7E@EBpJ5=1-DI#;C*ax{uORd~#)gn2T2D{IWSn{l8 zg>oz{$ca=R?Vc2Rb+{|Hpj+@i2z=jz&8m!C&!fPD>=UrO@7sx536*EboTdL*93%T= zkXy^#3$?{YBpfvzThv9ifsCR?le|W{1^b-a4*9N9-AF2gq^|6BYxc-}L}9=lPe(Ua zdn8P*XYRW%c}sH$o;y7!m$(-_tfphgr?DQhXQe@5QmG5V-DkI9M0NVmqs+-vO;*tF zoDYgvuzZ?R}?qT7sMj< zio#^MNn5;Ef0ywsOXPND_{q~Xm^;_R{ zp7%5KWRY6#3d76++*HwKBU?&x{Hfe*uXA4V8Ibz2H(JYC_a2FKr4qbA4gGS+&XKoo-&rD{u*jGW z@wKL3oMQ0THO*#Q+W2lw8Ny)lw1G?hv9XP|*2oc!ias%}x8&*H?#YS(YfUvf2%n07FWwv;YXK0&p)q58~;$A&?iK9tO! zDQ_Q}7cHOYyZ4B$e0CPh7n2lyAVy{*2y8@(>Bap%{!A6e1zP_`Uu?(yc|uUNT<>h>lNcW%Uo#?j-zn}!h3+QG=$K}X5e#>igl@!nnZzE1{% z3ElskqNzPogGJFsFH}!=$taI(8S=|n3+qX2iqFAW3Y9K|fOlx3IM?oF^ZiXDf(VU8 zFuCxT`SC)XQ&n&ox2(BBW5VbUM=2O_Zx!2IVAwPuKaCt*nKP=vwD{!XPZWw%@z{iY z0;efG0>>MW0#%TVFb=w)*wGue0N*rn(>F>kD#WWJvg7fzD$z<&r>LB~St0WgQ0B3I zUR9V7gc2G{5~^UM^lp<7wms^xYi)^H%~g4tZW1z-D_e zwRNb2zV6GM^W(wN_6n-g-lw~RiyL%;Gobvf`O~Jzs%F}T95DV9qCe+m|JL?;Na&_^AJ`tHCIA2c literal 0 HcmV?d00001 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java index 65eca5b8..2fc94725 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java @@ -43,6 +43,16 @@ public class DeliverStructuralPackageOrderForPackageItemVO { */ private String packageDesc; + /** + * 钢构包图号 + */ + private String packageDrawingNo; + + /** + * 钢构包备注 + */ + private String packageRemark; + /** * 仓库编号 */ @@ -58,6 +68,11 @@ public class DeliverStructuralPackageOrderForPackageItemVO { */ private BigDecimal weight; + /** + * 数量 + */ + private Integer num; + /** * 机台号 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java index 4e6fa2a2..f6c1ba0e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; @Data public class DeliverStructuralPackageOrderVO { -// private Long id; + private Long id; /** * 单据号 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageStorageTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageStorageTask.java deleted file mode 100644 index 4e815ff5..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageStorageTask.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.nflg.wms.repository.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Getter -@Setter -@ToString -@Accessors(chain = true) -@TableName("wms_structural_package_storage_task") -public class WmsStructuralPackageStorageTask implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - /** - * 任务单号 - */ - private String no; - - /** - * 来源，1：采购单入库 - */ - private Integer sourceFrom; - - /** - * 来源单号 - */ - private String sourceNo; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 上架时间 - */ - private LocalDateTime storeTime; -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageStorageTaskMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageStorageTaskMapper.java deleted file mode 100644 index 9ee2415b..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageStorageTaskMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nflg.wms.repository.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.wms.common.pojo.qo.StructuralPackageStorageTaskSearchQO; -import com.nflg.wms.repository.entity.WmsStructuralPackageStorageTask; - -/** - *

- * Mapper 接口 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -public interface WmsStructuralPackageStorageTaskMapper extends BaseMapper { - - IPage search(StructuralPackageStorageTaskSearchQO request, Page objectPage); -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageStorageTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageStorageTaskService.java deleted file mode 100644 index 2cb07c0f..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageStorageTaskService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nflg.wms.repository.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.common.pojo.qo.StructuralPackageStorageTaskSearchQO; -import com.nflg.wms.repository.entity.WmsStructuralPackageStorageTask; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -/** - *

- * 服务类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -public interface IWmsStructuralPackageStorageTaskService extends IService { - - IPage search(@Valid @NotNull StructuralPackageStorageTaskSearchQO request); -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageStorageTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageStorageTaskServiceImpl.java deleted file mode 100644 index 4b9827ab..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageStorageTaskServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.common.pojo.qo.StructuralPackageStorageTaskSearchQO; -import com.nflg.wms.repository.entity.WmsStructuralPackageStorageTask; -import com.nflg.wms.repository.mapper.WmsStructuralPackageStorageTaskMapper; -import com.nflg.wms.repository.service.IWmsStructuralPackageStorageTaskService; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author 代码生成器生成 - * @since 2025 - */ -@Service -public class WmsStructuralPackageStorageTaskServiceImpl extends ServiceImpl implements IWmsStructuralPackageStorageTaskService { - - @Override - public IPage search(StructuralPackageStorageTaskSearchQO request) { - return baseMapper.search(request,new Page<>(request.getPage(),request.getPageSize())); - } -} \ No newline at end of file diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml index ea3e109d..269f4c88 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml @@ -62,7 +62,7 @@ - select * - from wms_structural_package_storage_task - - - and source_from=#{type} - - - and "no" like concat('%', #{request.taskNo}, '%') - - - and source_no like concat('%', #{request.orderNo}, '%') - - - and create_time >= #{request.startDate} - - - and create_time <= #{request.endDate} - - - -