From af012454888020de13ca1908588a3261a7ce087e Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 17 Apr 2024 15:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/InventoryAndWarehousingMapper.java      |  7 -------
 .../impl/InventoryAndWarehousingServiceImpl.java   |  9 ---------
 .../material/InventoryAndWarehousingMapper.xml     | 14 ++++----------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
index 63350019..db0c20d9 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
@@ -66,13 +66,6 @@ public interface InventoryAndWarehousingMapper {
      */
     int insertLabelBind(MachIneDto machIneDto);
 
-    /**
-     * 根据code从ma_machine表查询是否有数据，去重
-     * @param code
-     * @return
-     */
-    int selectByCode(String code);
-
     /**
      * 查询
      * @param nowDate
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 70715454..a1344df1 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
@@ -106,15 +106,6 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
         return AjaxResult.success(res);
     }
 
-    /**
-     * 根据code从ma_machine表查询是否有数据，去重
-     * @param code
-     * @return
-     */
-    private int selectByCode(String code) {
-        return inventoryAndWarehousingMapper.selectByCode(code);
-    }
-
     /**
      * 编号新增，插入ma_machine、ma_machine_label和ma_label_bind
      * @param dto
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 adb1fef1..aafe7720 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
@@ -196,24 +196,18 @@
         where
         1 = 1
         <if test="keyWord != null and keyWord != ''">
-        and (pisi.PUT_IN_TYPE like concat('%',#{keyWord},'%') or
+        and (
+            pisi.`CODE` like concat('%',#{keyWord},'%') or
+            pisi.PUT_IN_TYPE like concat('%',#{keyWord},'%') or
         lot.lot_name like concat('%',#{keyWord},'%') or
         bui.unit_name like concat('%',#{keyWord},'%') or
         mt2.type_name like concat('%',#{keyWord},'%') or
         su.user_name like concat('%',#{keyWord},'%') or
-        pisd.REMARKS like concat('%',#{keyWord},'%')
+        pisi.REMARKS like concat('%',#{keyWord},'%')
         )
         </if>
         order by pisi.CREATE_DATE desc
     </select>
-    <select id="selectByCode" resultType="java.lang.Integer">
-        select count(*)
-        from ma_machine
-        where
-              1 = 1
-            <if test="code != null "> and qr_code = #{code}</if>
-
-    </select>
     <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
         select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
     </select>