From c84237206940d1e32bd4db52e0408c8b20edd227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 25 May 2026 09:55:01 +0800 Subject: [PATCH] =?UTF-8?q?bug-1508=20PDA-=E5=8D=B8=E8=B4=A7=E6=B8=85?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WmsShipmentPackagingCode.java | 2 +- .../mapper/WmsShipmentPackagingCodeMapper.java | 2 ++ .../IWmsShipmentPackagingCodeService.java | 3 +++ .../WmsShipmentPackagingCodeServiceImpl.java | 5 +++++ .../mapper/WmsShipmentPackagingCodeMapper.xml | 18 ++++++++++++++++++ .../wms/shipment/controller/H5Controller.java | 3 ++- 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsShipmentPackagingCode.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsShipmentPackagingCode.java index 65ccf570..0cdd64a1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsShipmentPackagingCode.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsShipmentPackagingCode.java @@ -47,7 +47,7 @@ public class WmsShipmentPackagingCode implements Serializable { private Long type; /** - * 状态，0：未装货；1：已装货；2：已装车；3：已发车；4：已卸车 + * 状态，0：未装货；1：已装货；2：已装车；3：已发车；4：已收货 */ private Integer status; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentPackagingCodeMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentPackagingCodeMapper.java index 68b183d6..6a723074 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentPackagingCodeMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentPackagingCodeMapper.java @@ -32,4 +32,6 @@ public interface WmsShipmentPackagingCodeMapper extends BaseMapper getForInstall(Long id); IPage getItemsVOById(ShipmentSiteStockItemQO qo, Page objectPage); + + void updateMaterialStatus(List ids, int status); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentPackagingCodeService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentPackagingCodeService.java index 4f8f72ff..f09ff6c0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentPackagingCodeService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentPackagingCodeService.java @@ -8,6 +8,7 @@ import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.repository.entity.WmsShipmentPackagingCode; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import java.util.List; @@ -36,4 +37,6 @@ public interface IWmsShipmentPackagingCodeService extends IService getForInstall(Long id); IPage getItemsVOById(ShipmentSiteStockItemQO qo); + + void updateMaterialStatus(List ids, int status); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentPackagingCodeServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentPackagingCodeServiceImpl.java index e9dffd42..5049e12f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentPackagingCodeServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentPackagingCodeServiceImpl.java @@ -59,4 +59,9 @@ public class WmsShipmentPackagingCodeServiceImpl extends ServiceImpl getItemsVOById(ShipmentSiteStockItemQO qo) { return baseMapper.getItemsVOById(qo, new Page<>(qo.getPage(), qo.getPageSize())); } + + @Override + public void updateMaterialStatus(List ids, int status) { + baseMapper.updateMaterialStatus(ids, status); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml index 641c1951..9d46fa3d 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml @@ -86,4 +86,22 @@ INNER JOIN wms_shipment_material_code_item mci ON mciq.item_id=mci."id" where mciq.status!=5 and pci.packaging_code_id=#{qo.id} + + + UPDATE wms_shipment_material_code_item_qr wsmciq + SET status = #{status} + FROM wms_shipment_packaging_code_item wspci + WHERE wspci.material_code_item_qr_id = wsmciq.id AND wspci.packaging_code_id in + + #{id} + ; + UPDATE wms_shipment_material_code_item wsmci + SET status = #{status} + FROM wms_shipment_material_code_item_qr wsmciq + JOIN wms_shipment_packaging_code_item wspci ON wspci.material_code_item_qr_id=wsmciq."id" + WHERE wsmci."id" = wsmciq.item_id AND wspci.packaging_code_id in + + #{id} + ; + diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java index e70594e6..4caebeda 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java @@ -80,9 +80,10 @@ public class H5Controller extends BaseController { List items = packagingCodeItemService.getList(ids); packagingCodeService.lambdaUpdate() .set(WmsShipmentPackagingCode::getStatus, 4) - .eq(WmsShipmentPackagingCode::getStatus, 3) + .ne(WmsShipmentPackagingCode::getStatus, 4) .in(WmsShipmentPackagingCode::getId, ids) .update(); + packagingCodeService.updateMaterialStatus(ids,4); List deliveries = deliveryService.listByIds(items.stream() .map(ShipmentPackagingCodeMaterialVO::getDeliveryId) .collect(Collectors.toSet())