From a7f5647b67e738106e15d6d8ab99c03d893ada23 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Thu, 19 Mar 2026 08:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E8=BE=85=E5=8A=A9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/storagelog/StorageLogDO.java   |  2 ++
 .../heli/service/storage/StorageServiceImpl.java  | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java
index 2e2f2d8c..ca2bd3d0 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java
@@ -91,6 +91,8 @@ public class StorageLogDO extends BaseDO {
     @TableField(exist = false)
     private String pnName;
     @TableField(exist = false)
+    private String projectNo;
+    @TableField(exist = false)
     private List<MaterialDO> materialDOList;
 
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java
index f129cc1f..01dae8c7 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java
@@ -21,6 +21,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestockboom.Outsou
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestockmaterial.OutsourceStockMaterialDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
@@ -39,6 +40,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.outsourcestockboom.OutsourceSt
 import com.chanko.yunxi.mes.module.heli.dal.mysql.outsourcestockmaterial.OutsourceStockMaterialMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.pn.PnMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper;
+import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorder.PurchaseOrderMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.storageinventory.StorageInventoryMapper;
@@ -149,6 +151,8 @@ public class StorageServiceImpl implements StorageService {
     private StorageLogService storageLogService;
     @Resource
     private  ProjectOrderMapper projectOrderMapper;
+    @Resource
+    private ProjectOrderSubMapper projectOrderSubMapper;
     /*
     *
     * 委外验收取消提交，作废入库单
@@ -517,7 +521,6 @@ public class StorageServiceImpl implements StorageService {
         // 将物料信息转化日志信息
         List<StorageLogDO> logList = BeanUtils.toBean(matList,StorageLogDO.class);
         // 同步库存单状态到日志，便于以后统计
-        ProjectOrderDO projectOrderDO = projectOrderMapper.selectByStockId(stockId);
         StorageDO storageDO = storageMapper.selectById(stockId);
         for (StorageLogDO log : logList){
             log.setId(null);
@@ -535,9 +538,15 @@ public class StorageServiceImpl implements StorageService {
                 log.setStockType(2);
                 log.setGoodsType(1);
                 log.setCodeNo(stockNo);
-                if (ObjectUtil.isNotEmpty(projectOrderDO)){
-                    log.setAuItem(projectOrderDO.getAuItem());
+                ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(Long.valueOf(log.getProjectNo()));
+                if (ObjectUtil.isNotEmpty(projectOrderSubDO)){
+                    ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(projectOrderSubDO.getProjectOrderId());
+                    if (ObjectUtil.isNotEmpty(projectOrderDO)){
+                        log.setAuItem(projectOrderDO.getAuItem());
+                    }
                 }
+
+
             }
         }
         // 批量保存当前库存物料日志信息