From 78f99ec50dc5c43e95bbc9cfe8a0fad545703d77 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 20 Jun 2024 14:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/domain/PurchaseInput.java   |  1 -
 .../material/PurchaseCheckInfoMapper.xml      | 76 ++++++++++++-------
 .../PurchaseCheckServiceCenterMapper.xml      |  5 +-
 .../material/PurchaseMacodeInfoMapper.xml     |  1 +
 .../newPurchase/serviceCenter/index.vue       | 12 +--
 .../warehousing/newTools/index.vue            |  4 +-
 6 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInput.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInput.java
index 3c345af6..3ba3149f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInput.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInput.java
@@ -97,7 +97,6 @@ public class PurchaseInput extends BaseEntity
 
     /** 不通过原因 */
     @ApiModelProperty(value = "不通过原因")
-    @Excel(name = "不通过原因")
     private String reason;
 
     /** 数据所属组织 */
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index cd15965e..fd3dc9dc 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime})
-        or (pci.arrival_time BETWEEN #{startTime} AND #{endTime})
+            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
+        or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
         </if>
         GROUP BY pcd.task_id
         order by pci.create_time desc
@@ -215,10 +215,11 @@ WHERE ma_machine.ma_code =
             LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
             WHERE pcd.task_id = pci.task_id
             )
+        </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime})
-                or (pci.arrival_time BETWEEN #{startTime} AND #{endTime})
-            </if></if>
+                AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
+                or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
+            </if>
         order by pci.id desc
     </select>
     <select id="exportList" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
@@ -226,7 +227,7 @@ WHERE ma_machine.ma_code =
             tk.CODE,
             pci.purchase_time as purchaseTime,
             pci.arrival_time as arrivalTime,
-            su.user_name purchaserName,
+            su.nick_name purchaserName,
             mt1.type_name as purchasingTypeName,
             mt.type_name AS purchasingTypeCode,
             mt.manage_type as manageType,
@@ -256,29 +257,50 @@ WHERE ma_machine.ma_code =
     </select>
     <select id="putInExportList" resultType="com.bonus.sgzb.material.domain.PurchaseInput">
         SELECT pcd.task_id as taskId,
-               tk.`code`,
-               pci.purchase_time as purchaseTime,
-               pci.arrival_time as arrivalTime,
-               pci.purchaser,
-               su.user_name        purchaserName,
-               mt1.type_name as purchasingTypeName,
-               mt.type_name     as purchasingTypeCode,
-               pcd.input_time   as inputTime,
-               su.user_name     as inputUser,
-               pcd.input_status as inputStatus
+        tk.`code`,
+        pci.purchase_time as purchaseTime,
+        pci.arrival_time as arrivalTime,
+        pci.purchaser,
+        su.user_name purchaserName,
+        mt1.type_name as purchasingTypeName,
+        mt.type_name as purchasingTypeCode,
+        CASE
+        pcd.input_status
+        WHEN 0 THEN
+        ''
+        WHEN 1 THEN
+        tk.update_time ELSE ''
+        END inputTime,
+        CASE
+        pcd.input_status
+        WHEN 0 THEN
+        ''
+        WHEN 1 THEN
+        sus.user_name ELSE ''
+        END inputUser,
+        pcd.input_status as inputStatus
         FROM purchase_check_details pcd
-                 LEFT JOIN purchase_check_info pci on pci.task_id = pcd.task_id
-                 left join tm_task tk on pcd.task_id = tk.task_id
-                 left join sys_user su on pci.purchaser = su.user_id
-                 left join ma_type mt on pcd.type_id = mt.type_id
-                 left join ma_type mt1 on mt.parent_id = mt1.type_id
+        LEFT JOIN purchase_check_info pci on pci.task_id = pcd.task_id
+        left join tm_task tk on pcd.task_id = tk.task_id
+        LEFT JOIN sys_user sus ON tk.update_by = sus.user_id
+        left join sys_user su on pci.purchaser = su.user_id
+        left join ma_type mt on pcd.type_id = mt.type_id
+        left join ma_type mt1 on mt.parent_id = mt1.type_id
         where task_type = 23
-          and tk.task_status in (26, 28)
-        <if test="keyWord != null  and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</if>
-        <if test="purchaseTime != null  and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
-        <if test="arrivalTime != null  and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
-        <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
-        <if test="companyId != null "> and pci.company_id = #{companyId}</if>
+        <if test="taskStatus != null">and tk.task_status = #{taskStatus}</if>
+        <if test="taskStatus == null">and tk.task_status in (28,105,107,123)</if>
+        <if test="keyWord != null  and keyWord != ''">and tk.code like concat('%',#{keyWord},'%')</if>
+        <if test="purchaseTime != null  and purchaseTime != ''">and pci.purchase_time = #{purchaseTime}</if>
+        <if test="arrivalTime != null  and arrivalTime != ''">and pci.arrival_time = #{arrivalTime}</if>
+        <if test="purchaser != null ">and pci.purchaser = #{purchaser}</if>
+        <if test="companyId != null ">and pci.company_id = #{companyId}</if>
+        <if test="typeId != null">AND #{typeId} IN (SELECT mt2.type_id
+            FROM purchase_check_details pcd
+            LEFT JOIN ma_type mt on mt.type_id=pcd.type_id
+            LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
+            WHERE pcd.task_id = pci.task_id
+            )
+        </if>
         ORDER BY pcd.task_id desc
     </select>
     <select id="selectPutInListExamine" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
index 03d6271e..0a09758e 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
@@ -299,8 +299,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime})
-            or (pci.arrival_time BETWEEN #{startTime} AND #{endTime})
+            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
+            or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
         </if>
         GROUP BY pcd.task_id
         order by pci.id desc
@@ -402,6 +402,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and pcd.`status`!=3
         <if test="dictName != null and dictName != ''">
             and (mt.type_name like concat('%',#{dictName},'%') or
+            pmi.ma_code like concat('%',#{dictName},'%') or
             mt1.type_name like concat('%',#{dictName},'%'))
         </if>
         order by status
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index 3e2cd785..70615c26 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -389,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND pcd.`status` != 7
         <if test="dictName != null and dictName != ''">
             and (mt.type_name like concat('%',#{dictName},'%') or
+            pmi.ma_code like concat('%',#{dictName},'%') or
             mt1.type_name like concat('%',#{dictName},'%'))
         </if>
         ORDER BY
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
index 31ec87a7..003c5fa3 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
@@ -320,12 +320,12 @@
                     width="200"
                 />
 
-                <el-table-column
-                    label="不通过原因"
-                    align="center"
-                    prop="remark"
-                    :show-overflow-tooltip="true"
-                />
+<!--                <el-table-column-->
+<!--                    label="不通过原因"-->
+<!--                    align="center"-->
+<!--                    prop="remark"-->
+<!--                    :show-overflow-tooltip="true"-->
+<!--                />-->
                 <el-table-column label="状态" align="center" prop="status">
                     <template slot-scope="scope">
                         <span v-if="scope.row.status == '0'">待审核</span>
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 2e93d7d8..ae3406a9 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -133,13 +133,13 @@
             <el-table-column
                 label="入库人员"
                 align="center"
-                prop="updateBy"
+                prop="inputUser"
                 show-overflow-tooltip
             />
             <el-table-column
                 label="入库时间"
                 align="center"
-                prop="updateTime"
+                prop="inputTime"
                 show-overflow-tooltip
             />
             <el-table-column