From c8722c267a65394e20e4dabe122382cf79f1a6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 26 Sep 2025 18:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lombok.config | 1 + nflg-wms-admin/pom.xml | 11 +++++---- .../InCostCenterBackController.java | 7 +++--- .../controller/InProduceOrderController.java | 4 +-- .../admin/controller/MaterialController.java | 2 +- .../StructuralPackageOrderController.java | 13 +++++++--- .../service/PositionControllerService.java | 1 + .../template/钢构件老鼠图.html | 23 +++++++++++++----- .../template/钢构包送货单模版.xlsx | Bin 12208 -> 12215 bytes .../pojo/qo/InCostcenterBackSubmitItemQO.java | 5 ++-- .../qo/InProduceOrderReceiveMaterialQO.java | 5 ++-- .../common/pojo/qo/MaterialStorageItemQO.java | 4 +-- ...liverStructuralPackageOrderTrayItemVO.java | 2 +- .../common/pojo/vo/UserSupplierItemVO.java | 2 +- .../repository/mapper/WmsStorageMapper.java | 2 +- .../service/IWmsStorageService.java | 2 +- .../service/impl/ParamConfigServiceImpl.java | 1 + .../service/impl/WebComponentServiceImpl.java | 1 + ...WmsGongzhuangTaizhangCheckServiceImpl.java | 1 + .../WmsGongzhuangTaizhangServiceImpl.java | 1 + .../impl/WmsInCostcenterBackServiceImpl.java | 1 + .../impl/WmsInProduceOrderServiceImpl.java | 1 + .../impl/WmsOutPurchaseServiceImpl.java | 1 + .../service/impl/WmsSrmOrderServiceImpl.java | 2 +- .../service/impl/WmsStorageServiceImpl.java | 2 +- .../impl/WmsToolMaterialCheckServiceImpl.java | 4 ++- .../WmsToolMaterialMaintainServiceImpl.java | 4 ++- .../impl/WmsToolMaterialServiceImpl.java | 1 + .../src/main/resources/mapper/AdMapper.xml | 1 + .../mapper/DictionaryItemTranslateMapper.xml | 3 +++ .../resources/mapper/DictionaryMapper.xml | 1 + .../src/main/resources/mapper/MenuMapper.xml | 1 + .../src/main/resources/mapper/RoleMapper.xml | 2 ++ .../src/main/resources/mapper/UserMapper.xml | 1 + .../resources/mapper/UserRoleMapMapper.xml | 3 +++ .../main/resources/mapper/WmsBinMapper.xml | 1 + .../main/resources/mapper/WmsBomMapper.xml | 1 + .../mapper/WmsComponentPackingMapper.xml | 2 +- .../WmsInCostcenterBackTicketItemMapper.xml | 1 + .../mapper/WmsInProduceBackItemMapper.xml | 1 + .../WmsInProduceBackTicketItemMapper.xml | 1 + .../mapper/WmsInProduceBackTicketMapper.xml | 1 + .../mapper/WmsInProduceOrderItemMapper.xml | 1 + .../resources/mapper/WmsStorageMapper.xml | 7 ++++-- ...msStructuralPackageOrderTrayItemMapper.xml | 1 + .../WmsStructuralPackageOrderTrayMapper.xml | 1 + .../resources/mapper/WmsWarehouseMapper.xml | 6 ++++- 47 files changed, 101 insertions(+), 39 deletions(-) create mode 100644 lombok.config diff --git a/lombok.config b/lombok.config new file mode 100644 index 00000000..29ceb170 --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +lombok.equalsandhashcode.callSuper = SKIP \ No newline at end of file diff --git a/nflg-wms-admin/pom.xml b/nflg-wms-admin/pom.xml index e8cf7e1c..a7a00a4e 100644 --- a/nflg-wms-admin/pom.xml +++ b/nflg-wms-admin/pom.xml @@ -83,7 +83,7 @@ org.xhtmlrenderer flying-saucer-pdf - 9.11.2 + 9.13.3 bcprov-jdk14 @@ -93,13 +93,14 @@ com.itextpdf - itextpdf - 5.5.13.4 + itext7-core + 7.2.6 + pom com.itextpdf - itext-asian - 5.2.0 + font-asian + 7.2.6 com.sap.conn.jco diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index cd4af47e..556f6494 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -178,7 +178,7 @@ public class InCostCenterBackController extends BaseController { .setMatnr(item.getMatnr()) .setNum(item.getLeft()); if (StrUtil.isBlank(vo.getLgort2())) { - vo.setLgort2(storageService.getWarehouseNo(order.getWerks(), item.getMatnr())); + vo.setLgort2(CollectionUtil.get(storageService.getWarehouseNo(order.getWerks(), item.getMatnr()), 0)); } if (StrUtil.isNotBlank(vo.getLgort2()) && StrUtil.isBlank(vo.getLgpbe())) { vo.setLgpbe(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), vo.getLgort2()))); @@ -324,20 +324,21 @@ public class InCostCenterBackController extends BaseController { WmsInCostcenterBack info = inCostcenterBackService.getById(id); VUtil.trueThrowBusinessError(Objects.isNull(info)).throwMessage("退料单不存在"); InCostcenterBackInfoVO order = Convert.convert(InCostcenterBackInfoVO.class, info); - List list = inCostcenterBackItemService.getList(id); + List list = Convert.toList(InCostcenterBackItemVO.class, inCostcenterBackItemService.getList(id)); // InCostcenterBackInfoVO order = new InCostcenterBackInfoVO(); // order.setNo(NoUtil.getOutCostcenterNo()); // List list = new ArrayList<>(); // for (int i = 0, count = RandomUtil.randomInt(1, 100); i < count; i++) { // list.add(new WmsInCostcenterBackItem().setMatnr(RandomUtil.randomNumbers(11)).setMaktx("非金属联件和紧固件等 M6 DIN 982 不锈钢304")); // } + list.forEach(item -> item.setLgort(order.getLgort())); Map base = new HashMap<>(); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); Map variables = new HashMap<>(); variables.put("info", order); variables.put("base", base); - variables.put("pages", PdfPageDTO.create(list, 17, new WmsInCostcenterBackItem())); + variables.put("pages", PdfPageDTO.create(list, 17, new InCostcenterBackItemVO())); String html = ThymeleafUtil.generator("/template/", "成本中心退料单", ".html", variables); PdfGeneratorUtil.generatePdf("成本中心领料单" + order.getNo(), html, response); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 7de7f9af..acce04c4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -433,7 +433,7 @@ public class InProduceOrderController extends BaseController { materialNos.add(it.getMaterialNo()); } //是否更改了储位 - syncStorage(it,materialQO.getBinNos()); + syncStorage(it, StrUtil.split(materialQO.getBinNos(), "/")); } }); VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(materialNos)) @@ -457,7 +457,7 @@ public class InProduceOrderController extends BaseController { return ApiResult.success(); } - private void syncStorage(InProduceOrderItemVO it, Set binNos) { + private void syncStorage(InProduceOrderItemVO it, Collection binNos) { produceOrderItemService.lambdaUpdate() .set(WmsInProduceOrderItem::getBinNos, StrUtil.join(",", binNos)) .eq(WmsInProduceOrderItem::getId, it.getId()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java index 873b061b..fe6f167c 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java @@ -121,7 +121,7 @@ public class MaterialController extends BaseController { */ @Transactional @PostMapping("uploadZip") - public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotEmpty MultipartFile file) throws Exception { + public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotNull MultipartFile file) throws Exception { return materialControllerService.uploadZip(response,file); } 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 f6677e3d..788ec03a 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 @@ -678,7 +678,7 @@ public class StructuralPackageOrderController extends BaseController { imageData.setRelativeLastColumnIndex(0); writeCellData.setImageDataList(List.of(imageData)); info.put("qrCodeUrl", writeCellData); - UserSupplier supplier = userSupplierService.getByUserId(deliverOrder.getSupplierId()); + UserSupplier supplier = userSupplierService.getById(deliverOrder.getSupplierId()); VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在"); info.put("supplierName", supplier.getSupplierName()); info.put("abbreviation", supplier.getAbbreviation()); @@ -725,6 +725,9 @@ public class StructuralPackageOrderController extends BaseController { } else { it.setWarehouseNo(dto.getWarehouseNo()); it.setBinNos(binService.getBinNos(it.getPackageNo(), dto.getWerks(), dto.getWarehouseNo())); +// if (dto.getTransportNum().compareTo(new BigDecimal(it.getNum()))<0){ +// it.setNum(dto.getTransportNum().intValue()); +// } } }); DeliverStructuralPackageOrderForPackageVO vo = new DeliverStructuralPackageOrderForPackageVO(); @@ -765,6 +768,9 @@ public class StructuralPackageOrderController extends BaseController { .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) .update(); structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()); + SAPMaterialInfoInOrderDTO dto = CollectionUtil.get(sapService.zim004(order.getExternalOrderNo(), order.getSupplierCode(), order.getPackageNo()), 0); + VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据"); + VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空"); //创建上架任务 VUtil.trueThrowBusinessError(!inTaskService.generateTask(List.of(new WmsInTaskItem() .setPoNum(order.getExternalOrderNo()) @@ -779,9 +785,9 @@ public class StructuralPackageOrderController extends BaseController { .setUnqualifiedQty(BigDecimal.ZERO) .setQualifiedQty(BigDecimal.valueOf(order.getNum())) .setInspectionQty(BigDecimal.valueOf(order.getNum())) - .setFactory("1010") + .setFactory(dto.getWerks()) .setDataStatus((short) 0) - .setReceivedWarehouse(storageService.getWarehouseNo("1010", order.getPackageNo())) + .setReceivedWarehouse(dto.getWarehouseNo()) .setOperationUserId(UserUtil.getUserId()) .setOperationUserName(UserUtil.getUserName()) .setBatchNumber(order.getWorkbenchCode()) @@ -838,6 +844,7 @@ public class StructuralPackageOrderController extends BaseController { it.setReceivedQty(it.getInspectionQty().subtract(qo.getNum())); it.setBins(StrUtil.join(",", qo.getBinNos())); it.setDataStatus((short) 1); + it.setReceivedWarehouse(qo.getReceivedWarehouse()); }); inTaskItemService.updateBatchById(datas); inTaskService.updateState(request.getTaskNo()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java index e2e263d6..d3e47d9a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java @@ -86,6 +86,7 @@ public class PositionControllerService { public PageData search(PositionSearchQO request) { return PageUtil.convert(positionService.lambdaQuery() .like(StrUtil.isNotBlank(request.getName()), Position::getName, request.getName()) + .orderByDesc(Position::getId) .page(new Page<>(request.getPage(), request.getPageSize())), d -> Convert.convert(PositionVO.class, d)); } diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html index 8384e3e1..bc03095a 100644 --- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html +++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html @@ -36,7 +36,7 @@ td { border: 1px solid #000; - padding: 8px; + padding: 7px; } tr:first-child td { @@ -82,7 +82,14 @@ .cell { border-bottom: 1px solid #000; - padding: 8px; + padding: 7px; + overflow: hidden; + } + + .cell1 { + border-bottom: 1px solid #000; + padding: 7px; + height: 25px; overflow: hidden; } @@ -124,15 +131,19 @@
-
+
-
SAP编码：2222222222
-
图号：12255665451615
-
名称：2222222222
+
图号：图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号 +
+
名称：名称名称名称名称名称名称名称名称名称名名称名名称名称名称称名称名称名称称名称名称名称 +
数量：1    重量：348.41
diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx index 0a6300638922d09abc4691bcfe98da40fe795230..36ed9974a371a0184c04cafe7b468526a8de2d5f 100644 GIT binary patch delta 7187 zcmZvBWmHsc+xE~cpv2IOgh&n`B@I$asdP8eF|@$YIpm0RNjFF{bT>$dlys*wN_?O` z_w(KF`|cmJ_F8l1ah&I|_O-5Z{aXFdkBZI zouetcn~k+stb$?(m?+>}b`EqTQk`0rQ$40~mCwQqB1APZpDrtr+I>-zxyN8I@^So> zgntXaM2vMW@!WmAZ`v(qU=y$SZ5$bB2E>F+$6PSz89*H-CnOegJSVHChA#aM5BebD z__$JjLSBVr-&)oG6kCT#wwv>H)M)#!B*WcKp=pKd*-lr&?n5b#XBe zHChYm17^AlxKPn4#1dbv=VVCpbA z*bGsqb+K}G?N&Seb<*p6)KVZVB{ellebPv{imbFIg>tB)!$>dO?53)4szl*)NxUk~ z>4GpjFT$%v>AcwUe0G~`rlD*^jyUjo2&B)oGig_y0JTfjJsyo*AF{MA`f9hfb}?qP zVfp=4fYaB)8E>~4Pqa|J(K^@gwNKY`Jg)kg4Z`d0-rm&0b}m_$Gn32N{;}#S4GQTl zHkA)mwejrA1W^`jdupf7aW^qWe&>$lB(jXd{ zDeB1L9;b)hj>2Epw7&xN=~!w^z*pc`!j|4f-T1RspM&u^|;w(a+lXH zH||Ct1H3Hw*M;j)Wg+PSjrO}%r;}8vxEpeaX;N( z?pTii-ogjZ$8!$0UEJK3snaB^_B#4ZOu}51Iu1hf%=axW=0x#AHKHU4bxW4Ug`d~2 zl6vl^1&v&fzr7hRn;So@FFU*3T+SZZRO`SVSEUj;k4lfoeG(-}Ly+pSMIEekUdO%v z(+0XtDTn}rOY|-b_2*7hz`9zFKx#8F?JoHAX38G_G=9vgr-uX4-qiF1H$gDM(9Uds z@3h99y0s9UA^C?Oigu0u13Gf_fn2U|2S+sGKyjPHsaDB%Ur+t966!ILfXvaR7~gtk zD|dd#B&b2oWgDIho`9o5z|nz7Wavj=0CfBt2|}sRhE||N)-k^qsP+CGms66(5z%wl zq{-qn<1FChTV@|zQcf3VT)3hvwcJ-d*mj`ZrwU21Ri0zbP;43i+m)<%+w#pwX*Zm$ z!>0ymlR>Oe(Klu$0%cQFEia+ElLCWxlY3Lajd}45f`1 ziKUZ$D6bL7*;79;%?4&nKx61el~gkx{F2Z2!tmWqOU)wT!bd!}npkDh?to@6BT*1% zCMOIl4m3!wa`(!0_i8Agk82FoQ$|0odTX}e5rV}l;Mvwnmx0^ta2Eb8HC+BdOcg01 zyW{7&6X10CYE#IzRG41&u2fZc3YFzWx74od!B#we;}pTX{Z$&;uv150As1HnR;rYN zlqjnZD7KrBQ06oLV?z1_E_ce;B))4uzkQ;8MJUtH|4FV>+i7v<;~GvKG=U?yHO$po zuiPyAV`fSie{9!Xf8y#J4lgtVh)DhzKSD3tXEki?3J~agM8djQU@B|qKp#%`P+Y?B zUuI^_FwJgU;M;Xzzf8XYs(&94)|sG8;r}`k)Ww+)+x9N$$9x+p(MalST574+(s|i!Zv%c9#AgK7wZVc_&# zvl~L{CO2duwaNFN92uez^ejrqHv7pN@ZUV*fo}T%SVJZ59{X?z{jdqHw2}M>)f=@| zrg)6rm0xPDM7X&o;3TM-r|Y3e8)W0GJMR>KeL&ZUY(_VQ5GF+C9|L@J;y!Hf!T6nP zjV{q!uA|@Oe~;f7wuzN<{g^r5MP@iGM7LwvZ9w0BG6yn6gE_i0aiIA>C4=RXEl}%c``UBL7Luy(HQ*D*keEXGqQBO(1&=xwhy?{fcK?Ft>38III{)O>43k@Q1u+|@RV#Y1~d47dA5S^ z5A95HeFVtbXO%>RbGOGyt^KApO)y&oDNBcXCUr=XlYuVkzH29f5h|b8ckuiaO6??T zGvGp}<77OHV*oFT!a6lUIC;DzPAOi zbX43dQ5!xK<(4CZ8G!#q4-7&qO|8J)EXc36SYNq;UnRH-dwiJea@)y%fe7*;#QhJH zⓈ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 delta 7189 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 binNos; + @NotBlank + private String binNos; /** * 二维码列表 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java index 1ad09580..a2865367 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java @@ -5,7 +5,6 @@ import jakarta.validation.constraints.NotEmpty; import lombok.Data; import java.util.List; -import java.util.Set; @Data public class InProduceOrderReceiveMaterialQO { @@ -19,8 +18,8 @@ public class InProduceOrderReceiveMaterialQO { /** * 储位编号列表 */ - @NotEmpty - private Set binNos; + @NotBlank + private String binNos; /** * 二维码列表 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java index 1c88c67d..581ce95b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotEmpty; import lombok.Data; import java.math.BigDecimal; -import java.util.Set; +import java.util.List; @Data public class MaterialStorageItemQO { @@ -38,7 +38,7 @@ public class MaterialStorageItemQO { * 储位列表 */ @NotEmpty - private Set binNos; + private List binNos; /** * 越库数量 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java index adea7f80..63432c1e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.math.BigDecimal; @Data -@Accessors +@Accessors(chain = true) public class DeliverStructuralPackageOrderTrayItemVO implements Serializable { /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java index 3d4bfbf8..f5178ecc 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; import java.util.Collection; @Data -@Accessors +@Accessors(chain = true) public class UserSupplierItemVO { //所属角色 private Collection roleIds; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java index 5e71c34b..dc184376 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java @@ -26,7 +26,7 @@ public interface WmsStorageMapper extends BaseMapper { List searchNonPage(@Param("request") StorageSearchQO request); - String getWarehouseNo(String factoryNo, String materialNo); + List getWarehouseNo(String factoryNo, String materialNo); String getBinNos(String materialNo, String factoryNo, String warehouseNo); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java index f43a55c8..e7d49743 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java @@ -37,7 +37,7 @@ public interface IWmsStorageService extends IService { List searchNonPage(@Valid StorageSearchQO request); - String getWarehouseNo(String factoryNo,String materialNo); + List getWarehouseNo(String factoryNo, String materialNo); Set getBinNos(String materialNo, @NotBlank String factoryNo, String warehouseNo); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java index cde941b9..2784a7f5 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java @@ -69,6 +69,7 @@ public class ParamConfigServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); if (CollectionUtil.isEmpty(page.getRecords())) { return new PageData<>(); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java index 1ff556cf..42263821 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java @@ -80,6 +80,7 @@ public class WebComponentServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); Map userMap = new HashMap<>(); return PageUtil.convert(page, (d) -> { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java index 511306ee..025020ec 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java @@ -45,6 +45,7 @@ public class WmsGongzhuangTaizhangCheckServiceImpl extends ServiceImpl search(GongZhuangTaiZhangCheckListQO request) { return lambdaQuery() .eq(WmsGongzhuangTaizhangCheck::getNo, request.getNo()) + .orderByDesc(WmsGongzhuangTaizhangCheck::getId) .page(new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java index 877c3ecc..7edcb368 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java @@ -68,6 +68,7 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java index 3a21ee94..5a0639f2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java @@ -30,6 +30,7 @@ public class WmsInCostcenterBackServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java index 4d1fdf3a..ae61dfd4 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java @@ -33,6 +33,7 @@ public class WmsInProduceOrderServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java index 1761ef30..28cea0b7 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java @@ -30,6 +30,7 @@ public class WmsOutPurchaseServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java index 2f8a868d..b6108208 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO; import com.nflg.wms.common.pojo.qo.SearchDeliverOrderQO; -import com.nflg.wms.common.pojo.vo.PoReceiveTaskItemVO; import com.nflg.wms.common.pojo.vo.PoReceiveTaskVO; import com.nflg.wms.common.pojo.vo.SrmOrderVO; import com.nflg.wms.repository.entity.WmsSrmOrder; @@ -34,6 +33,7 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl(request.getPage(),request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java index 0ba0064d..8e9e1289 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java @@ -94,7 +94,7 @@ public class WmsStorageServiceImpl extends ServiceImpl getWarehouseNo(String factoryNo, String materialNo) { return baseMapper.getWarehouseNo(factoryNo,materialNo); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java index a610a91b..27f79f23 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java @@ -45,7 +45,9 @@ public class WmsToolMaterialCheckServiceImpl extends ServiceImpl search(GongZhuangTaiZhangCheckListQO request) { - return lambdaQuery().eq(WmsToolMaterialCheck::getNo, request.getNo()) + return lambdaQuery() + .eq(WmsToolMaterialCheck::getNo, request.getNo()) + .orderByDesc(WmsToolMaterialCheck::getId) .page(new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java index 6f116f4c..d287f908 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java @@ -45,7 +45,9 @@ public class WmsToolMaterialMaintainServiceImpl extends ServiceImpl search(GongZhuangTaiZhangCheckListQO request) { - return lambdaQuery().eq(WmsToolMaterialMaintain::getNo, request.getNo()) + return lambdaQuery() + .eq(WmsToolMaterialMaintain::getNo, request.getNo()) + .orderByDesc(WmsToolMaterialMaintain::getId) .page(new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java index c070b780..faa8de91 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java @@ -63,6 +63,7 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl search(ToolMaterialSearchQO request) { return lambdaQuery() .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo()) + .orderByDesc(WmsToolMaterial::getId) .page(new Page<>(request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml index 2c5911bc..f1d46535 100644 --- a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml @@ -7,6 +7,7 @@ from ad a inner join ad_sync ac on a.id = ac.ad_id where a.enable + order by a."id" desc diff --git a/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml index 658e7ab7..d47371d1 100644 --- a/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml @@ -7,5 +7,6 @@ FROM "dictionary" d INNER JOIN dictionary_item di ON d."id"=di.dictionary_id WHERE d.code=#{code} AND di.code=#{itemCode} + order by di.id diff --git a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml index 918a3e3f..43b58676 100644 --- a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml @@ -11,6 +11,7 @@ WHERE mb.enable = TRUE AND mb.menu_id = #{menuId} AND urm.user_id = #{userId} + order by mb.id diff --git a/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml index e959c942..e0a05e40 100644 --- a/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml @@ -33,5 +33,6 @@ and vu.create_time <= #{request.endDate} + order by vu.id desc \ No newline at end of file diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml index dc5c18f1..77070702 100644 --- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml @@ -7,6 +7,7 @@ FROM user_role_map urm INNER JOIN "role" r ON urm.role_id=r."id" WHERE urm.user_id=#{id} + ORDER BY r."id" diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml index d5077bc2..11feb8c5 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml @@ -22,6 +22,7 @@ #{item} + order by bin.id desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml index a5339e5d..058fa3aa 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml @@ -32,7 +32,7 @@ and datum <= #{request.endDate} - order by create_time desc + order by id desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml index 14f226f5..bbcc6af5 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml @@ -6,5 +6,6 @@ select * from wms_in_produce_back_item where order_id=#{id} + order by id desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml index 3ee6bd34..9f5b7380 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml @@ -8,5 +8,6 @@ INNER JOIN wms_in_produce_back_item ipbi ON ipbti.produce_back_item_id=ipbi."id" inner join wms_in_produce_back ipb on ipb.id=ipbi.order_id WHERE ipbti.ticket_id=#{id} + ORDER BY ipbti.id diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml index 24405890..ed93e927 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml @@ -20,6 +20,7 @@ and ipbt.create_time <= #{request.endDate} + ORDER BY ipbt.id DESC diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml index 71186293..b46a6ba1 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml @@ -27,7 +27,7 @@ and t."binNos" like concat('%', #{request.binNo}, '%') - order by id desc + order by t.id desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml index 2f913d5b..fa276d42 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml @@ -19,5 +19,6 @@ from wms_structural_package_order_tray ot inner join wms_structural_package_order_tray_item oti on ot."id"=oti.tray_id where ot.no=#{trayNo} + order by oti.id diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml index 0e367f5b..c1b3af45 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml @@ -55,6 +55,7 @@ #{item} + order by o.id desc