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
- 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},'%')
)
order by pisi.CREATE_DATE desc
-