From 6a8aca42f21b6a17cf5b80cd5423512269351fbf Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 29 Aug 2024 18:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=85=A5=E5=BA=93=E5=90=8E=E6=98=BE=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=AE=A2=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InventoryAndWarehousingServiceImpl.java   | 1 +
 .../mapper/material/InventoryAndWarehousingMapper.xml      | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
index 3eb48b8..418ea9a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
@@ -186,6 +186,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
             machIneDto.setCreator(dto.getCreator());
             machIneDto.setNum(dto.getNum());
             machIneDto.setIsCode(dto.getIsCode());
+            machIneDto.setTypeId(dto.getTypeId());
             machIneDto.setUnitId(dto.getUnitId());
             machIneDto.setProId(dto.getProId());
             machIneDto.setRemarks(dto.getRemarks());
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
index f6633bc..69bea61 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
@@ -77,6 +77,7 @@
                     </if>
                 </otherwise>
             </choose>
+            <if test="typeId != null and typeId != ''">TYPE,</if>
             <if test="creator != null and creator != ''">CREATOR,</if>
             <if test="unitId != null and unitId != ''">UNIT_ID,</if>
             <if test="proId != null and proId != ''">PROJECT_ID,</if>
@@ -97,6 +98,7 @@
                     </if>
                 </otherwise>
             </choose>
+            <if test="typeId != null and typeId != ''">#{typeId},</if>
             <if test="creator != null and creator != ''">#{creator},</if>
             <if test="unitId != null and unitId != ''">#{unitId},</if>
             <if test="proId != null and proId != ''">#{proId},</if>
@@ -199,8 +201,6 @@
         su.user_name AS modelName,
         pisi.CREATE_DATE AS createDate,
         pisi.REMARKS AS remark,
-        -- move to mysql5, don't support "PARTITION"
-        -- ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num
         (
         SELECT COUNT(*)
             FROM ma_type_put_in_storage_info pisi2
@@ -208,10 +208,9 @@
         ) AS row_num
         FROM
         ma_type_put_in_storage_info pisi
-        LEFT JOIN ma_type_put_in_storage_details pisd ON pisi.id = pisd.INFO
         LEFT JOIN bm_project_lot lot ON lot.lot_id = pisi.PROJECT_ID
         LEFT JOIN bm_unit_info bui ON bui.unit_id = pisi.UNIT_ID
-        LEFT JOIN ma_type mt ON mt.type_id = pisd.TYPE
+        LEFT JOIN ma_type mt ON mt.type_id = pisi.TYPE
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         LEFT JOIN sys_user su ON su.user_id = pisi.CREATOR
         WHERE