From 10b37eda16c4065672cfa0a8d60fe1250107d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 28 Nov 2025 15:25:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-935=20=E9=92=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BC=BA=E4=BB=B6=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StructuralPackageOrderController.java | 18 ++++++++++++---- ...StructuralPackageDeliverOrderSearchQO.java | 10 +++++++++ .../StructuralPackageOrderItemRemarkQO.java | 21 +++++++++++++++++++ .../vo/StructuralPackageDeliverOrderVO.java | 2 +- .../nflg/wms/common/pojo/vo/TrayItemVO.java | 5 +++++ .../WmsStructuralPackageDeliverOrder.java | 5 +++++ .../WmsStructuralPackageOrderTrayItem.java | 5 +++++ ...WmsStructuralPackageDeliverOrderMapper.xml | 13 ++++++------ .../WmsStructuralPackageOrderTrayMapper.xml | 1 + 9 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderItemRemarkQO.java 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 e096bea0..3889d31c 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 @@ -519,10 +519,6 @@ public class StructuralPackageOrderController extends BaseController { } return ivo; }).toList()); -// SAPMaterialInfoInOrderDTO dto = sapService.zim004(orderVO.getExternalOrderNo(), orderVO.getSupplierCode(), orderVO.getPackageNo()).get(0); -// if (Objects.nonNull(dto)) { -// vo.setMaxNum(dto.getTransportNum()); -// } return ApiResult.success(vo); } @@ -829,6 +825,7 @@ public class StructuralPackageOrderController extends BaseController { WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder() .setNo(deliverOrderNo) .setSupplierId(supplierId) + .setQuehuo(trays.stream().anyMatch(DeliverStructuralPackageOrderVO::getQuehuo)) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); structuralPackageDeliverOrderService.save(deliverOrder); @@ -1103,4 +1100,17 @@ public class StructuralPackageOrderController extends BaseController { public ApiResult> getTicketItems(@Valid @RequestParam @NotBlank String taskNo) { return ApiResult.success(inTaskItemService.getByNo(taskNo)); } + + /** + * 添加备注 + * @param request 请求参数 + */ + @PostMapping("itemRemark") + public ApiResult itemRemark(@Valid @RequestBody StructuralPackageOrderItemRemarkQO request) { + deliverStructuralPackageOrderTrayItemService.lambdaUpdate() + .set(WmsStructuralPackageOrderTrayItem::getRemark, request.getRemark()) + .eq(WmsStructuralPackageOrderTrayItem::getId, request.getId()) + .update(); + return ApiResult.success(); + } } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java index 59977db6..c49c4c3f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java @@ -19,4 +19,14 @@ public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{ * 供应商编号 */ private String supplierNo; + + /** + * 状态，0：待收货；1：已收货；2-已完结； + */ + private Short state; + + /** + * 是否存在缺货零件 + */ + private Boolean quehuo; } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderItemRemarkQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderItemRemarkQO.java new file mode 100644 index 00000000..20d0d91c --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderItemRemarkQO.java @@ -0,0 +1,21 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class StructuralPackageOrderItemRemarkQO { + + /** + * 托盘项ID + */ + @NotNull + private Long id; + + /** + * 备注 + */ + @NotBlank + private String remark; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java index de6a6a72..dd74cd70 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java @@ -17,7 +17,7 @@ public class StructuralPackageDeliverOrderVO { private String no; /** - * 状态，0：待收货；1：已收货；2-已完结； + * 状态，0：待收货；1：收货中；2：已收货 */ private Short state; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java index d32e8b34..cf4b62d1 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java @@ -98,4 +98,9 @@ public class TrayItemVO { * 线下收货时间 */ private LocalDateTime offlineReceiveTime; + + /** + * 备注 + */ + private String remark; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java index 9dfc83a0..575abd9a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java @@ -65,4 +65,9 @@ public class WmsStructuralPackageDeliverOrder implements Serializable { * 供应商id */ private Long supplierId; + + /** + * 是否存在缺货零件 + */ + private Boolean quehuo; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java index 1066bae0..b49a2596 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java @@ -106,4 +106,9 @@ public class WmsStructuralPackageOrderTrayItem implements Serializable { * 线下收货时间 */ private LocalDateTime offlineReceiveTime; + + /** + * 备注 + */ + private String remark; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml index f731820f..27f29393 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml @@ -3,12 +3,7 @@