From f5c89a9b01b0cae70a7e0ccd878fb75121743929 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 13:18:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/MatMapper.java | 1 +
src/main/resources/mapper/MatMapper.xml | 8 ++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/MatController.java | 21 ++++++++++++++-------
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 6 ++++++
src/main/java/com/zy/asrs/service/MatService.java | 1 +
6 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index cb362ea..90cc015 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -58,16 +58,23 @@
return R.ok().add(mats);
}
+// @RequestMapping(value = "/mat/search/pda/auth")
+// @ManagerAuth
+// public R pdaSearch(@RequestParam(required = false)String condition){
+// EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+// if (!Cools.isEmpty(condition)) {
+//// wrapper.like("matnr", condition).or().like("maktx", condition);
+// wrapper.like("matnr", condition).or().like("specs", condition);
+// }
+// wrapper.orderBy("create_time", false);
+// List<Mat> mats = matService.selectList(wrapper);
+// return R.ok().add(mats);
+// }
+
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
public R pdaSearch(@RequestParam(required = false)String condition){
- EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- if (!Cools.isEmpty(condition)) {
-// wrapper.like("matnr", condition).or().like("maktx", condition);
- wrapper.like("matnr", condition).or().like("specs", condition);
- }
- wrapper.orderBy("create_time", false);
- List<Mat> mats = matService.selectList(wrapper);
+ List<Mat> mats = matService.selectByMatnrLink10(condition);
return R.ok().add(mats);
}
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index b094b2e..b8654d0 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -21,6 +21,7 @@
Mat selectLatest();
List<Mat> selectByMatnrLink(@Param("matnr")String matnr);
+ List<Mat> selectByMatnrLink10(@Param("matnr")String matnr);
Mat selectNewUpdateTime();
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index a467d5f..6660678 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -13,6 +13,7 @@
Mat selectByMatnr(String matnr);
List<Mat> selectByMatnrLink(String matnr);
+ List<Mat> selectByMatnrLink10(String matnr);
Mat selectLatest();
Page<Mat> getMatTurnPage(Page<Mat> page);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index b2458fa..45bbcfe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -38,6 +38,12 @@
return this.baseMapper.selectByMatnrLink(matnr);
}
+
+ @Override
+ public List<Mat> selectByMatnrLink10(String matnr) {
+ return this.baseMapper.selectByMatnrLink10(matnr);
+ }
+
@Override
public Mat selectNewUpdateTime() {
return this.baseMapper.selectNewUpdateTime();
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1e2fad7..b3d8d7a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -555,8 +555,8 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if(param.getBarcode().length()!=6){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸6浣�===>>" + param.getBarcode());
+ if(param.getBarcode().length()!=8){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 3586409..4bdd207 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -117,6 +117,14 @@
</if>
</select>
+ <select id="selectByMatnrLink10" resultMap="BaseResultMap">
+ select TOP 20 * from man_mat
+ where 1=1
+ <if test="matnr != null and matnr != ''">
+ and mm.matnr like concat('%',#{matnr},'%')
+ </if>
+ </select>
+
<select id="selectNewUpdateTime" resultMap="BaseResultMap">
select top 1 * from man_mat
where 1=1
--
Gitblit v1.9.1