From d02cb33bf7424de0d0831bbf439ac6dc68b2d91a Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Wed, 11 Feb 2026 15:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/LdTwoPutStorage.java            |  5 +++++
 .../Impl/LdOneOutStorageServiceImpl.java        |  2 ++
 .../Impl/LdTwoPutStorageServiceImpl.java        | 17 +++++++++++++++++
 src/main/resources/mapper/UserMapper.xml        |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java
index e811471..4652d0c 100644
--- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java
+++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java
@@ -26,6 +26,11 @@ public class LdTwoPutStorage implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 一级出库单id
+     */
+    private Long oneOutStorageId;
+
     /**
      * 需求单信息
      */
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
index 2932aa1..40ee07c 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
@@ -98,6 +98,7 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
     private void handleSubmitOutStorage(LdOneOutStorageDto dto) {
         if(BatchConstant.SUBMIT.equals(dto.getStatus())){
             LdTwoPutStorage ldTwoPutStorage = new LdTwoPutStorage()
+            .setOneOutStorageId(dto.getId())
             .setDemandEndInfo(dto.getDemandEndInfo())
             .setOrderNo(serialNumberUtil.generateSimple("SI"))
             .setInDate(new Date())
@@ -376,6 +377,7 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
         for (LdOneOutStorageDetailVO detailVO : detailVOs) {
             detailVO.setShipperStatus(BatchConstant.TEMPORARY.equals(dto.getStatus()) ? BatchConstant.NO_SHIPPED_OUT : BatchConstant.SHIPPED_OUT);
             if (detailVO.getId() != null) {
+                detailVO.setOutboundQuantity(detailVO.getTheOutboundQuantity());
                 // 更新现有明细
                 boolean update = oneOutStorageDetailService.updateById(detailVO);
                 if (!update) {
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java
index 9db7934..826d33e 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java
@@ -1,9 +1,13 @@
 package com.nov.KgLowDurable.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.nov.KgLowDurable.constant.BatchConstant;
 import com.nov.KgLowDurable.exception.CustomerException;
+import com.nov.KgLowDurable.mapper.LdOneFormMapper;
+import com.nov.KgLowDurable.mapper.LdOneOutStorageDetailMapper;
+import com.nov.KgLowDurable.mapper.LdOneOutStorageMapper;
 import com.nov.KgLowDurable.mapper.LdTwoPutStorageMapper;
 import com.nov.KgLowDurable.pojo.dto.LdTwoPutStorageDto;
 import com.nov.KgLowDurable.pojo.entity.*;
@@ -44,6 +48,15 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl<LdTwoPutStorageMappe
     @Autowired
     ILdTwoInventoryRecordService twoInventoryRecordService;
 
+    @Autowired
+    LdOneOutStorageMapper oneOutStorageMapper;
+
+    @Autowired
+    LdOneOutStorageDetailMapper oneOutStorageDetailMapper;
+
+    @Autowired
+    LdOneFormMapper oneFormMapper;
+
     @Override
     public PageInfo<LdTwoPutStorageVO> getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartment, Integer pageNum, Integer pageSize) {
 
@@ -252,6 +265,10 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl<LdTwoPutStorageMappe
         // 3. 按类型分别处理
         processConsumerGoods(details, userInfo);      // 易耗品
         processDurableGoods(details, userInfo);       // 耐用品
+        //更新一级出库单状态
+        LdOneOutStorage oneOutStorage = oneOutStorageMapper.selectById(dto.getLdTwoPutStorage().getOneOutStorageId());
+        oneOutStorage.setStatus(BatchConstant.APPROVE);
+        oneOutStorageMapper.updateById(oneOutStorage);
 
         return true;
     }
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 242893a..d01a2fd 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -39,7 +39,7 @@
          select * from t_user where main_er_department = #{departmentId} and is_del=0
     </select>
     <select id="selectByLeaderInDept" resultType="com.nov.KgLowDurable.pojo.entity.User">
-        select * from t_user where leader_in_dept = #{topDepartmentId}
+        select * from t_user where leader_in_dept like concat('%',',',#{topDepartmentId},',','%')
     </select>