From bdf413e1c0f1d0fe1198c469caa66e14edf851ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 26 Mar 2026 18:02:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(common):=20=E6=B7=BB=E5=8A=A0Base62?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=B9=B6=E4=BC=98=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增Base62Util工具类，实现long类型数字到Base62字符串的编码功能 - 修改工装台账搜索对象继承关系，从PageQO改为SearchBaseQO - 统一生产相关单据标题命名，将"生产订单退料单"改为"生产退料单" - 修复盘点任务项负责人ID字段类型，从Integer改为Long以支持更大数值范围 - 在物料码搜索功能中新增状态过滤条件，支持按状态查询未开始、打包中、已完成的记录 - 修复物料控制器服务中缺少版本号设置的问题，在创建新物料时设置版本号为1 - 新增成本中心领料单模板，完善生产领料相关单据类型 - 优化生产领料单标题显示逻辑，根据数据类型区分生产领料单和成品发货领料单 - 修复包装删除对象验证注解，将@NotNull改为@NotEmpty以适配列表验证 - 调整二维码模板中采购单号列宽度，提升界面显示效果 - 优化结构化包装订单中的供应商信息处理，增加供应商编码和名称关联 - 实现二维码编码优化，使用Base62编码替换原有ID编码方式 - 修复数据库查询中日期范围参数映射错误，统一使用startDate和endDate参数名 - 在工具物料搜索中新增名称模糊查询功能，提升搜索便利性 - 修复操作记录中操作类型字段的格式化问题，确保数据一致性 --- .../controller/InProduceBackController.java | 4 ++-- .../controller/OutCostCenterController.java | 2 ++ .../controller/OutProduceController.java | 6 +++-- .../controller/QrCodeMasterController.java | 1 - .../StructuralPackageOrderController.java | 24 ++++++++++++------- .../service/MaterialControllerService.java | 1 + .../main/resources/template/qrcode/qitao.html | 2 +- .../template/成本中心领料单.html | 2 +- .../resources/template/生产补料单.html | 2 +- .../resources/template/生产退料单.html | 2 +- .../pojo/qo/GongZhuangTaiZhangSearchQO.java | 2 +- .../pojo/qo/InventoryCheckTaskSaveItemQO.java | 2 +- .../common/pojo/qo/MaterialCodeSearchQO.java | 7 ++++-- .../nflg/wms/common/pojo/qo/PackingDelQO.java | 3 ++- .../common/pojo/qo/ToolMaterialSearchQO.java | 7 +++++- .../pojo/vo/InventoryCheckTaskItemVO.java | 2 +- .../com/nflg/wms/common/util/Base62Util.java | 23 ++++++++++++++++++ .../entity/WmsInventoryCheckTaskItem.java | 2 +- .../WmsGongzhuangTaizhangServiceImpl.java | 5 ++++ .../impl/WmsToolMaterialServiceImpl.java | 8 +++++++ .../resources/mapper/WmsPackageMapper.xml | 4 ++-- .../mapper/WmsQrCodeMasterMapper.xml | 4 ++-- .../mapper/WmsReturnRequestMapper.xml | 4 ++-- .../mapper/WmsTransferOrdersMapper.xml | 4 ++-- .../controller/MaterialCodeController.java | 1 + 25 files changed, 91 insertions(+), 33 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index 7cedc9e0..74b2bec9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -407,7 +407,7 @@ public class InProduceBackController extends BaseController { List list = inProduceBackItemService.getList(id); list.forEach(it -> it.setNum(null)); Map base = new HashMap<>(); - base.put("title", "生产订单退料单"); + base.put("title", "生产退料单"); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); Map variables = new HashMap<>(); @@ -428,7 +428,7 @@ public class InProduceBackController extends BaseController { // order.setNo(order.getTicketNo()); List list = inProduceBackTicketItemService.getList(id); Map base = new HashMap<>(); - base.put("title", "生产订单退料单"); + base.put("title", "生产退料单"); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); Map variables = new HashMap<>(); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 6a9c739d..7c713bc5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -580,6 +580,7 @@ public class OutCostCenterController extends BaseController { Map base = new HashMap<>(); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); + base.put("title", "成本中心领料单"); Map variables = new HashMap<>(); variables.put("info", order); variables.put("base", base); @@ -602,6 +603,7 @@ public class OutCostCenterController extends BaseController { Map base = new HashMap<>(); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); + base.put("title", "成本中心领料出库单"); Map variables = new HashMap<>(); variables.put("info", order); variables.put("base", base); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index f7309e16..a4f1ac74 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -717,7 +717,7 @@ public class OutProduceController extends BaseController { // list.add(new WmsOutProduceItem().setMatnr(RandomUtil.randomNumbers(10))); // } Map base = new HashMap<>(); - base.put("title", order.getDataType() == 0 ? "生产订单领料单" : "成品发货领料单"); + base.put("title", order.getDataType() == 0 ? "生产领料单" : "成品发货领料单"); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); Map variables = new HashMap<>(); @@ -745,6 +745,7 @@ public class OutProduceController extends BaseController { Map base = new HashMap<>(); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); + base.put("title", "生产补料单"); Map variables = new HashMap<>(); variables.put("info", order); variables.put("base", base); @@ -767,6 +768,7 @@ public class OutProduceController extends BaseController { Map base = new HashMap<>(); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100)); + base.put("title", "生产补料出库单"); Map variables = new HashMap<>(); variables.put("info", order); variables.put("base", base); @@ -787,7 +789,7 @@ public class OutProduceController extends BaseController { List list = outProduceTicketItemService.getList(id); list.forEach(it -> it.setAufnr(order.getAufnr())); Map base = new HashMap<>(); - base.put("title", order.getDataType() == 0 ? "生产订单发料单" : "成品发货出库单"); + base.put("title", order.getDataType() == 0 ? "生产领料出库单" : "成品发货出库单"); base.put("createDate", DateUtil.format(order.getCreateTime(), "yyyy-MM-dd")); base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")); Map variables = new HashMap<>(); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java index 58f7a66c..70b73b17 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java @@ -69,7 +69,6 @@ public class QrCodeMasterController extends BaseController { @PostMapping("search") @ApiMark(moduleName = "获取二维码详细信息", apiName = "获取二维码详细信息") public ApiResult> search(@Valid @RequestBody QrCodeItemSearchQO request) { - return ApiResult.success(qrCodeMasterService.search(request)); } 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 454c38bc..d1126cdb 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 @@ -161,7 +161,7 @@ public class StructuralPackageOrderController extends BaseController { ) .toList(); if (Objects.equals(request.getType(), 2) - || Objects.equals(request.getType(), 4) ) { + || Objects.equals(request.getType(), 4)) { datas.forEach(it -> { it.setBatchNo(NoUtil.getBatchNo(it.getSupplierNo())); }); @@ -303,14 +303,18 @@ public class StructuralPackageOrderController extends BaseController { List packages = structuralPackageService.lambdaQuery() .in(WmsStructuralPackage::getId, request.getItems().stream().map(PackageDeliverOrderSaveItemQO::getPackageId).toList()) .list(); + List suppliers = userSupplierService.listByIds(ordersForAdd.stream().map(WmsStructuralPackageOrder::getSupplierId).collect(Collectors.toSet())); qrCodeMasterService.saveBatch( ordersForAdd.stream() - .filter(it -> Objects.isNull(it.getId())) .map(it -> { WmsStructuralPackage p = packages.stream() .filter(pt -> pt.getId().equals(it.getPackageId())) .findFirst() .get(); + UserSupplier supplier = suppliers.stream() + .filter(pt -> pt.getId().equals(it.getSupplierId())) + .findFirst() + .get(); return new WmsQrCodeMaster() .setBarcodeCode(KeyUtil.next()) .setProcessStage(BarCodeProcessStage.Unpackaged.getState()) @@ -324,6 +328,9 @@ public class StructuralPackageOrderController extends BaseController { .setPoNumber(it.getExternalOrderNo()) .setPoLineNumber(it.getRowNo()) .setExtendId(it.getId()) + .setSupplierId(it.getSupplierId()) + .setSupplierCode(supplier.getSupplierCode()) + .setSupplierName(supplier.getSupplierName()) .setCreateUserId(UserUtil.getUserId()) .setCreateUserName(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); @@ -504,17 +511,18 @@ public class StructuralPackageOrderController extends BaseController { List list = structuralPackageOrderTrayItemService.getListVOByTrayId(id); List datas = new ArrayList<>(); for (DeliverStructuralPackageOrderTrayItemVO it : list) { + String code = Base62Util.encode(it.getId()); for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) { DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class); - vo.setQrCodeId(it.getId() + "-" + (i + 1)); - vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1"); + vo.setQrCodeId(code + "-" + (i + 1)); + vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1"); vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200)); datas.add(vo); } if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) { DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class); - vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1)); - vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE)); + vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1)); + vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE)); vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200)); datas.add(vo); } @@ -996,7 +1004,7 @@ public class StructuralPackageOrderController extends BaseController { VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空"); BigDecimal num = BigDecimal.valueOf(order.getNum()); OptRecordDTO optRecordDTO1 = new OptRecordDTO(); - optRecordDTO1.setOperationType((short)1); + optRecordDTO1.setOperationType((short) 1); optRecordDTO1.setOrderId(order.getOrderNo()); optRecordService.add(optRecordDTO1); Pair, Pair> pair = sapService.zwm3a17(new ZWM3A17DTO() @@ -1023,7 +1031,7 @@ public class StructuralPackageOrderController extends BaseController { ); if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) { OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); + optRecordDTO.setOperationType((short) 1); optRecordDTO.setOrderId(order.getOrderNo()); optRecordService.add(optRecordDTO); sapService.zwm3a18(new ZWM3A18DTO() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index 4246fab2..d5c548ff 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -83,6 +83,7 @@ public class MaterialControllerService { VUtil.trueThrowBusinessError(Objects.nonNull(old) && !old.getComplete()) .throwMessage("该物料存在草稿版本"); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); + wmsMaterial.setVersion(1); wmsMaterial.setCreateBy(UserUtil.getUserName()); wmsMaterial.setCreateTime(LocalDateTime.now()); materialService.add(wmsMaterial); diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html index b6040b54..e4b66c6c 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html @@ -48,7 +48,7 @@ - + 采购单号: diff --git a/nflg-wms-admin/src/main/resources/template/成本中心领料单.html b/nflg-wms-admin/src/main/resources/template/成本中心领料单.html index 998ddac5..b7385c0f 100644 --- a/nflg-wms-admin/src/main/resources/template/成本中心领料单.html +++ b/nflg-wms-admin/src/main/resources/template/成本中心领料单.html @@ -139,7 +139,7 @@
福建南方路面机械股份有限公司
-
部门领料单
+
部门领料单
diff --git a/nflg-wms-admin/src/main/resources/template/生产补料单.html b/nflg-wms-admin/src/main/resources/template/生产补料单.html index 954b63b0..01fec4e9 100644 --- a/nflg-wms-admin/src/main/resources/template/生产补料单.html +++ b/nflg-wms-admin/src/main/resources/template/生产补料单.html @@ -166,7 +166,7 @@
福建南方路面机械股份有限公司
-
补 料 单
+
生产补料单
diff --git a/nflg-wms-admin/src/main/resources/template/生产退料单.html b/nflg-wms-admin/src/main/resources/template/生产退料单.html index f90a577f..bec2cf61 100644 --- a/nflg-wms-admin/src/main/resources/template/生产退料单.html +++ b/nflg-wms-admin/src/main/resources/template/生产退料单.html @@ -166,7 +166,7 @@
福建南方路面机械股份有限公司
-
生产订单退料单
+
生产退料单
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java index 18b882f1..b4ae6577 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java @@ -3,7 +3,7 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; @Data -public class GongZhuangTaiZhangSearchQO extends PageQO { +public class GongZhuangTaiZhangSearchQO extends SearchBaseQO { /** * 工装编号 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java index 95c63232..66b43054 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java @@ -25,5 +25,5 @@ public class InventoryCheckTaskSaveItemQO { * 盘点负责人id */ @NotNull - private Integer chargeUserId; + private Long chargeUserId; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java index 3076370b..09469b2d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java @@ -2,8 +2,6 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; -import java.time.LocalDate; - @Data public class MaterialCodeSearchQO extends SearchBaseQO { @@ -36,4 +34,9 @@ public class MaterialCodeSearchQO extends SearchBaseQO { * 下单结束日期 */ private String orderEndDate; + + /** + * 状态，0：未开始；1：打包中；2：已完成 + */ + private Integer status; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java index 3f34085d..9b9c6ee8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,6 @@ public class PackingDelQO { /** * 包装箱id */ - @NotNull + @NotEmpty private List id; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java index 2f56bac7..f4228824 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java @@ -3,10 +3,15 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; @Data -public class ToolMaterialSearchQO extends PageQO{ +public class ToolMaterialSearchQO extends SearchBaseQO{ /** * 物料号 */ private String no; + + /** + * 工具名称 + */ + private String name; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java index d1e7524a..a9542ef4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java @@ -67,7 +67,7 @@ public class InventoryCheckTaskItemVO { /** * 盘点负责人id */ - private Integer chargeUserId; + private Long chargeUserId; /** * 所在地点 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java new file mode 100644 index 00000000..4ef71153 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java @@ -0,0 +1,23 @@ +package com.nflg.wms.common.util; + +public class Base62Util { + + private static final String BASE62_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + private static final int BASE = 62; + + /** + * 将 long 类型数字编码为 Base62 字符串 + */ + public static String encode(long num) { + if (num == 0) { + return String.valueOf(BASE62_CHARS.charAt(0)); + } + StringBuilder sb = new StringBuilder(); + while (num > 0) { + int remainder = (int) (num % BASE); + sb.append(BASE62_CHARS.charAt(remainder)); + num = num / BASE; + } + return sb.reverse().toString(); + } +} \ No newline at end of file diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java index 47354dc9..44923a97 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java @@ -47,5 +47,5 @@ public class WmsInventoryCheckTaskItem implements Serializable { /** * 盘点负责人id */ - private Integer chargeUserId; + private Long chargeUserId; } 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 7edcb368..d37e74bc 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 @@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** *

@@ -66,6 +67,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl search(GongZhuangTaiZhangSearchQO request) { return lambdaQuery() + .ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate()) + .le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate()) .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo()) .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName()) .orderByDesc(WmsGongzhuangTaizhang::getId) @@ -75,6 +78,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl searchAll(GongZhuangTaiZhangSearchQO request) { return lambdaQuery() + .ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate()) + .le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate()) .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo()) .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName()) .list(); 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 faa8de91..9966bec4 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 @@ -10,6 +10,7 @@ import com.nflg.wms.common.pojo.qo.ToolMaterialAddQO; import com.nflg.wms.common.pojo.qo.ToolMaterialSearchQO; import com.nflg.wms.common.pojo.qo.ToolMaterialUpdateQO; import com.nflg.wms.common.util.UserUtil; +import com.nflg.wms.repository.entity.WmsGongzhuangTaizhang; import com.nflg.wms.repository.entity.WmsToolMaterial; import com.nflg.wms.repository.entity.WmsToolMaterialCheck; import com.nflg.wms.repository.entity.WmsToolMaterialMaintain; @@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -62,7 +64,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl search(ToolMaterialSearchQO request) { return lambdaQuery() + .ge(Objects.nonNull(request.getStartDate()), WmsToolMaterial::getCreateTime, request.getStartDate()) + .le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate()) .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo()) + .like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName()) .orderByDesc(WmsToolMaterial::getId) .page(new Page<>(request.getPage(), request.getPageSize())); } @@ -85,7 +90,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl searchAll(ToolMaterialSearchQO request) { return lambdaQuery() + .ge(Objects.nonNull(request.getStartDate()),WmsToolMaterial::getCreateTime, request.getStartDate()) + .le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate()) .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo()) + .like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName()) .list(); } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml index cb8ee5eb..3775467c 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml @@ -40,10 +40,10 @@ and a.supplier_id = #{request.supplierId} - and a.create_time>= #{request.inStartDate} + and a.create_time>= #{request.startDate} - and a.create_time <= #{request.inEndDate} + and a.create_time <= #{request.endDate} order by a.package_type asc, a.create_time desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml index 0bd50d0b..942253c3 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml @@ -43,10 +43,10 @@ and a.material_code =#{ request.materialCode} - and a.create_time>= #{request.inStartDate} + and a.create_time>= #{request.startDate} - and a.create_time <= #{request.inEndDate} + and a.create_time <= #{request.endDate} diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml index ac884c84..08c8babb 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml @@ -64,10 +64,10 @@ and a.purchase_group =#{ request.purchaseGroup} - and a.approve_time>= #{request.inStartDate} + and a.approve_time>= #{request.startDate} - and a.approve_time <= #{request.inEndDate} + and a.approve_time <= #{request.endDate} diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml index 50a5b561..3f42da7f 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml @@ -31,10 +31,10 @@ and a.storage_location = #{request.storageLocation} - and a.create_time>= #{request.inStartDate} + and a.create_time>= #{request.startDate} - and a.create_time <= #{request.inEndDate} + and a.create_time <= #{request.endDate} order by a.create_time DESC diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java index 023230d0..d867fe49 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java @@ -153,6 +153,7 @@ public class MaterialCodeController extends BaseController { public ApiResult> search(@Valid @RequestBody MaterialCodeSearchQO request) { return ApiResult.success( materialCodeService.lambdaQuery() + .eq(Objects.nonNull(request.getStatus()),WmsShipmentMaterialCode::getStatus, request.getStatus()) .ge(Objects.nonNull(request.getOrderStartDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderStartDate()) .le(Objects.nonNull(request.getOrderEndDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderEndDate()) .ge(Objects.nonNull(request.getStartDate()), WmsShipmentMaterialCode::getCreateTime, request.getStartDate())