From 3d474f3e7d195d117013cd1cf17f1de5bfe4bd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 2 Dec 2025 17:04:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-953=20PDA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E3=80=90=E9=92=A2=E6=9E=84=E4=BB=B6=E4=B8=8A=E6=9E=B6=E3=80=91?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=8C=E9=92=A2=E6=9E=84=E4=BB=B6=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=9B=B4=E6=8E=A5=E8=BF=87=E8=B4=A6=E5=88=B0SAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StructuralPackageOrderController.java  |  4 ++++
 .../WmsStructuralPackageDeliverOrderMapper.java       |  2 +-
 .../WmsStructuralPackageDeliverOrderServiceImpl.java  | 11 +++++------
 .../mapper/WmsStructuralPackageDeliverOrderMapper.xml |  4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

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 1dbdc506..1516b476 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
@@ -731,11 +731,15 @@ public class StructuralPackageOrderController extends BaseController {
      */
     @GetMapping("getInfoByDeliverOrderNo")
     public ApiResult<DeliverStructuralPackageOrderForPackageVO> getInfoByDeliverOrderNo(@Valid @RequestParam @NotBlank String orderNo) {
+        WmsStructuralPackageDeliverOrder order = structuralPackageDeliverOrderService.lambdaQuery().eq(WmsStructuralPackageDeliverOrder::getNo, orderNo).one();
+        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
+        VUtil.trueThrowBusinessError(Objects.equals(order.getState(), (short) 2)).throwMessage("该订单已收货");
         List<DeliverStructuralPackageOrderForPackageItemVO> datas = deliverStructuralPackageOrderService.getInfoByDeliverOrderNo(orderNo);
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("未找到数据");
         datas.forEach(it -> {
             it.setTrayNos(deliverStructuralPackageOrderTrayService.lambdaQuery()
                     .select(WmsStructuralPackageOrderTray::getNo)
+                    .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
                     .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId())
                     .list()
                     .stream()
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java
index f44fa97a..40ba45d9 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java
@@ -27,7 +27,7 @@ public interface WmsStructuralPackageDeliverOrderMapper extends BaseMapper<WmsSt
 
     String getNoByOrderId(Long id);
 
-    boolean allReceived(Long deliverId);
+    boolean hasNotReceived(Long deliverId);
 
     List<DeliverStructuralPackageOrderVO> getInfo(Long id);
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java
index eaf77607..be123a41 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java
@@ -24,9 +24,8 @@ import java.util.Optional;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
- *
  * @author 代码生成器生成
  * @since 2025
  */
@@ -39,10 +38,10 @@ public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl<Wms
     @Override
     public IPage<StructuralPackageDeliverOrderVO> search(StructuralPackageDeliverOrderSearchQO request) {
         List<Long> externalOrderIds = null;
-        if (StrUtil.isNotBlank(request.getExternalOrderNo())){
+        if (StrUtil.isNotBlank(request.getExternalOrderNo())) {
             externalOrderIds = Optional.ofNullable(baseMapper.getIdsByExternalOrderNo(request.getExternalOrderNo())).orElse(Collections.emptyList());
         }
-        return baseMapper.search(request,externalOrderIds,new Page<>(request.getPage(),request.getPageSize()));
+        return baseMapper.search(request, externalOrderIds, new Page<>(request.getPage(), request.getPageSize()));
     }
 
     @Override
@@ -52,9 +51,9 @@ public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl<Wms
 
     @Override
     public void updateStateByOrderId(Long orderId) {
-        WmsStructuralPackageDeliverOrderMap map=wmsStructuralPackageDeliverOrderMapService.lambdaQuery().eq(WmsStructuralPackageDeliverOrderMap::getOrderId, orderId).one();
+        WmsStructuralPackageDeliverOrderMap map = wmsStructuralPackageDeliverOrderMapService.lambdaQuery().eq(WmsStructuralPackageDeliverOrderMap::getOrderId, orderId).one();
         lambdaUpdate()
-                .set(WmsStructuralPackageDeliverOrder::getState, baseMapper.allReceived(map.getDeliverId())?2:1)
+                .set(WmsStructuralPackageDeliverOrder::getState, baseMapper.hasNotReceived(map.getDeliverId()) ? 1 : 2)
                 .set(WmsStructuralPackageDeliverOrder::getUpdateTime, LocalDateTime.now())
                 .set(WmsStructuralPackageDeliverOrder::getUpdateBy, UserUtil.getUserName())
                 .eq(WmsStructuralPackageDeliverOrder::getId, map.getDeliverId())
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
index 28d82ebd..c0f70799 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
@@ -57,11 +57,11 @@
         where pdom.order_id=#{id}
     </select>
 
-    <select id="allReceived" resultType="boolean">
+    <select id="hasNotReceived" resultType="boolean">
         SELECT EXISTS
            (
                SELECT
-                   om.*
+                   1
                FROM
                    wms_structural_package_deliver_order_map om
                        INNER JOIN wms_structural_package_order_tray ot ON om.order_id = ot.order_id