From 8f285642657b63dbeb775bb14aba546766147b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 20 Apr 2026 17:44:24 +0800
Subject: [PATCH] =?UTF-8?q?PDABug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repository/po/MaterialInventoryQueryListPO.java | 8 ++++++++
.../service/StockShelfOrderDomainService.java | 3 ++-
.../mapper/materialInventory/MaterialInventoryMapper.xml | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
index 0d5b8b575..1ee31ffcd 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryQueryListPO.java
@@ -130,6 +130,14 @@ public class MaterialInventoryQueryListPO extends MaterialBasePO {
@Excel(name = "批次号")
private String batchNumber;
+ @ApiModelProperty("入库单号")
+ @Excel(name = "入库单号")
+ private String inOrderNumber;
+
+ @ApiModelProperty("批号/LOT")
+ @Excel(name = "批号")
+ private String lotNumber;
+
@ApiModelProperty("物料状态编码")
@Excel(name = "物料状态编码")
private String materialStatusCode;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index 691004ab0..755faff0d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -694,7 +694,8 @@ public class StockShelfOrderDomainService {
updateShelfMaterialDetailShelvesStatusWhenOrderCompleted(stockShelfOrderPO, loginUser, userRealNameComplete);
//推送业务数据到BMS系统
// pushSyncBmsDomainService.pushInShelfOrder(stockShelfOrderPO.getInOrderNumber());
- stockShelfOrderService.updateOmsOrder(stockShelfOrderPO.getInOrderNumber(),4,stockShelfOrderPO.getShelvesQuantity());
+ stockShelfOrderService.updateOmsOrder(stockShelfOrderPO.getInOrderNumber(), 4,
+ shelvesQuantity == null ? null : shelvesQuantity.intValue());
return true;
}
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index fef0a4ce9..c4a45d740 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -295,6 +295,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+