From 074d9d7a8152ffa5c45918a0f66bc014c843a3a7 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 9 Feb 2026 17:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ma/mapper/MachineMapper.java     |  7 +++++
 .../ma/service/impl/MachineServiceImpl.java   | 26 +++++++++++--------
 .../material/back/BackApplyInfoMapper.xml     |  2 ++
 .../mapper/material/ma/MachineMapper.xml      | 12 +++++++++
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
index d14cb3f5..282a52b7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
@@ -310,4 +310,11 @@ public interface MachineMapper
      * @return
      */
     LeaseApplyInfo getBackUnitAndProjectBySlt(LeaseApplyInfo leaseInfoBack);
+
+    /**
+     * 根据maId查询最新的领料数据
+     * @param machine
+     * @return
+     */
+    LeaseApplyInfo getLeaseDataByMaId(Machine machine);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
index 6977f445..171915d2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
@@ -555,17 +555,21 @@ public class MachineServiceImpl implements IMachineService
         Machine scrapTime = machineMapper.getScrapTimeByQrcode(machine);
         baseInfo.setScrapTime(scrapTime != null ? scrapTime.getScrapTime() : "暂无");
         // 查询领料任务
-        LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine);
-        if (leaseInfo == null || leaseInfo.getParentId() == null) {
-            baseInfo.setLeaseTime(null);
-            baseInfo.setLeaseUnit(null);
-            baseInfo.setLeaseProject(null);
-        } else {
-            LeaseApplyInfo leaseDetail = machineMapper.getLeaseUnitAndProject(leaseInfo);
-            baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime()));
-            baseInfo.setLeaseUnit(leaseDetail.getUnitName());
-            baseInfo.setLeaseProject(leaseDetail.getProjectName());
-        }
+        LeaseApplyInfo leaseInfo = machineMapper.getLeaseDataByMaId(machine);
+        baseInfo.setLeaseTime(leaseInfo.getLeaseTime());
+        baseInfo.setLeaseUnit(leaseInfo.getUnitName());
+        baseInfo.setLeaseProject(leaseInfo.getProjectName());
+//        LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine);
+//        if (leaseInfo == null || leaseInfo.getParentId() == null) {
+//            baseInfo.setLeaseTime(null);
+//            baseInfo.setLeaseUnit(null);
+//            baseInfo.setLeaseProject(null);
+//        } else {
+//            LeaseApplyInfo leaseDetail = machineMapper.getLeaseUnitAndProject(leaseInfo);
+//            baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime()));
+//            baseInfo.setLeaseUnit(leaseDetail.getUnitName());
+//            baseInfo.setLeaseProject(leaseDetail.getProjectName());
+//        }
         // 查询退料任务
         LeaseApplyInfo leaseInfoBack = machineMapper.getBackParentId(machine);
         if (leaseInfoBack == null || leaseInfoBack.getParentId() == null) {
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index 32580c91..0adc7dbd 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -478,6 +478,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND bu.del_flag = '0'
         WHERE
         sai.`status`= 0 and mm.qr_code = #{qrCode} and sai.is_slt = '0'
+        and sai.source='1'
         and mtr.user_id = #{userId}
           <if test="unitId != null">
               AND ba.unit_id = #{unitId}
@@ -2199,6 +2200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN bm_unit bu on bu.unit_id = ba.unit_id
             AND bu.del_flag = '0'
         WHERE sai.`status`=0
+          and sai.source='1'
           and mm.ma_id = #{maId}
         limit 1
     </select>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 7db9789e..6b621ca0 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -1363,6 +1363,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY sai.end_time DESC
         LIMIT 1
     </select>
+    <select id="getLeaseDataByMaId" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
+        SELECT bu.unit_name                            AS unitName,
+               bp.pro_name                             AS projectName,
+               DATE_FORMAT(sai.start_time, '%Y-%m-%d') AS leaseTime
+        FROM slt_agreement_info sai
+                 LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai.agreement_id
+                 LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
+                 LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id
+        WHERE sai.source = '1'
+          AND sai.ma_id = #{maId}
+        ORDER BY sai.start_time DESC LIMIT 1
+    </select>
 
     <insert id="insertMaStatusLog">
         insert into update_ma_status_log