From a8ff50ab2bbeae3ce6095d85083ee37d43542940 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, 16 Jun 2026 14:40:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(inventory):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将排序字段从按ID降序改为按物料号、工厂号、仓库号、库位、批次排序
- 确保库存数据按业务关键字段有序返回
- 提高库存查询结果的一致性和可预测性
---
 .../src/main/resources/mapper/WmsInventoryMapper.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml
index fd173501..442f4f87 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml
@@ -28,7 +28,7 @@
                 AND i.detection_results = #{request.detectionResults}
             </if>
         </where>
-        order by i.id desc
+        order by i.material_no,i.factory_no,i.warehouse_no,i.bin_location,i.batch_no
     </select>
 
     <select id="getNum" resultType="com.nflg.wms.common.pojo.dto.InventoryInDTO">

From 339620ab9e4f9bf57575a5d2574dc9802b03b5e6 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, 16 Jun 2026 15:00:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(normal-pgi):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=94=B6=E8=B4=A7=E6=A3=80=E6=9F=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 delivery_qty-receipt_qty>0 条件避免已完成收货的订单被重复处理
- 防止已收货订单触发业务错误异常
---
 .../com/nflg/wms/admin/service/NormalPGIControllerService.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
index bc99cd99..aed27663 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
@@ -139,6 +139,7 @@ public class NormalPGIControllerService {
         // 查询订单行项目列表
         List<WmsSrmOrderItem> orderItemList = wmsSrmOrderItemService.lambdaQuery()
                 .eq(WmsSrmOrderItem::getOrderId, order.getId())
+                .apply("delivery_qty-receipt_qty>0")
                 .list();
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orderItemList)).throwMessage("此收货单[" + orderNo + "] 已完成收货，无需再次操作");