From a7d8ad5ef818fc8b6c2b87b45ede32001f9956e6 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Sat, 20 Apr 2024 14:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=85=A5=E5=BA=93=E4=B8=8D?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RepairTestInputServiceImpl.java         | 6 ++++--
 .../mapper/material/PurchaseAccessoryMapper.xml          | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
index 20c2c109..fa790853 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
@@ -77,9 +77,11 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
                 dto.setUpdateBy(updateBy);
                 if (Objects.equals("2", dto.getCheckType())) {
                     RepairAuditDetails detail = new RepairAuditDetails();
-                    detail.setRepairId(Long.valueOf(dto.getRepairId()));
+                    detail.setRepairId(Long.valueOf(dto.getId()));
                     detail.setTypeId(Long.valueOf(dto.getTypeId()));
-                    detail.setMaId(Long.valueOf(dto.getMaId()));
+                    if (StringHelper.isNotEmpty(dto.getMaId())){
+                        detail.setMaId(Long.valueOf(dto.getMaId()));
+                    }
                     detail.setRepairNum(new BigDecimal(dto.getRepairNum()));
                     detail.setRepairedNum(new BigDecimal(dto.getRepairNum()));
                     detail.setScrapNum(new BigDecimal("0"));
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
index 87b917b8..72db829b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
@@ -274,8 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName,
             CASE
                 tk.task_status
-                WHEN 69 THEN '待入库'
-                WHEN 70 THEN '已入库'
+                WHEN 69 THEN '待审核'
+                WHEN 70 THEN '已审核'
                 ELSE ''
                 END taskStatusResult,
             su.user_name purchaserName
@@ -314,6 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt.pa_name specificationType,
         mt1.pa_name typeName,
         pcd.check_num as checkNum,
+        ppi.remark,
         pcd.`status`,
         CASE
         WHEN pcd.`status` = 0 THEN '待验收'
@@ -339,6 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ''
         END as inputBy
         FROM purchase_part_details pcd
+        LEFT JOIN purchase_part_info ppi on ppi.task_id=pcd.task_id
         LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id
         LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id
         LEFT JOIN tm_task tt on tt.task_id = pcd.task_id
@@ -482,6 +484,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt1.pa_name typeName,
         pcd.check_num as checkNum,
         pcd.`status`,
+        ppi.remark,
+        mt.unit_id as unitName,
         CASE
         WHEN pcd.`status` = 0 THEN '待验收'
         WHEN pcd.`status` = 1 THEN '待入库'
@@ -506,6 +510,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ''
         END as inputBy
         FROM purchase_part_details pcd
+        LEFT JOIN purchase_part_info ppi on ppi.task_id=pcd.task_id
         LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id
         LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id
         LEFT JOIN tm_task tt on tt.task_id = pcd.task_id