From c732023df8f25a038d22dd29033c04b562f837e2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:04:27 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2 +
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 2 +
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +
src/main/resources/mapper/AgvLocDetlMapper.xml | 8 ++++
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++
src/main/resources/mapper/MatMapper.xml | 1
src/main/java/com/zy/asrs/entity/Mat.java | 7 +++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/controller/MatController.java | 30 +++++++++++++++
11 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 66fabfa..a7bb3f7 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -14,6 +14,8 @@
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.AgvLocDetlService;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +43,10 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -318,5 +324,29 @@
return R.ok().add(valueVos);
}
+ //涓夊嚡鏂版棫鐗╂枡鏇存柊鎺ュ彛
+ @RequestMapping("/mat/updateMatnrToMatnr2")
+ @Transactional
+ public R updateMatnrToMatnr2(@RequestParam String matnrOld, @RequestParam String matnrNew) {
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnrOld));
+ if (mat == null) {
+ return R.error("鐗╂枡涓嶅瓨鍦�");
+ }
+
+ //鏇存柊鐗╂枡
+ mat.setMatnr2(matnrOld);
+ mat.setMatnr(matnrNew);
+ if (!matService.updateById(mat)) {
+ throw new CoolException("鐗╂枡鏇存柊澶辫触");
+ }
+
+ //鏇存柊鍥涘悜搴撳簱瀛樼墿鏂欏彿
+ int count = locDetlService.updateNewMatnr(matnrOld, matnrNew);
+
+ //鏇存柊AGV搴撳簱瀛樼墿鏂欏彿
+ int count2 = agvLocDetlService.updateNewMatnr(matnrOld, matnrNew);
+ return R.ok("鐗╂枡鍙凤細" + matnrOld + "=====>鍙樻洿锛�" + matnrNew + "銆傚洓鍚戝簱搴撳瓨鐗╂枡鍙峰彉鏇存暟閲忥細" + count + "锛孉GV搴撳瓨鐗╂枡鍙峰彉鏇存暟閲忥細" + count2);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 84cf369..6900551 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -335,6 +335,13 @@
@ExcelProperty(value = "寤烘。鏃ユ湡")
private Date dInvCreateDatetime;
+ /**
+ * 鐗╂枡鍙�
+ */
+ @ApiModelProperty(value= "鏃х墿鏂欏彿")
+ @ExcelProperty(value = "鏃х墿鏂欏彿")
+ private String matnr2;
+
public Mat() {}
public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Double storeMax, Double storeMin, Integer storeMaxDate) {
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index dad9fa8..c1cf30b 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -46,4 +46,6 @@
int deleteLocDetl(@Param("locNo")String locNo, @Param("anfme")Double anfme, @Param("matnr")String matnr, @Param("batch")String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
AgvLocDetl selectLocdetl(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
+
+ int updateNewMatnr(String matnrOld, String matnrNew);
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c650abe..f32e78f 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -76,4 +76,6 @@
@Select("SELECT loc_no FROM asr_loc_detl WHERE matnr = #{matnr} GROUP BY loc_no")
List<String> selectLocNo(@Param("matnr") String matnr);
+ int updateNewMatnr(String matnrOld, String matnrNew);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 76dc097..0044800 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -45,4 +45,6 @@
public void compareToEss(MultipartFile file) throws IOException;
+ int updateNewMatnr(String matnrOld, String matnrNew);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 674438a..b99d17d 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -82,4 +82,6 @@
List<LocDetl> selectByLocWithoutContainer(String locNo);
+ int updateNewMatnr(String matnrOld, String matnrNew);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index db66bf1..66bfa57 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -252,4 +252,9 @@
}
}
}
+
+ @Override
+ public int updateNewMatnr(String matnrOld, String matnrNew) {
+ return this.baseMapper.updateNewMatnr(matnrOld, matnrNew);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 00fe50d..5ecdbb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -307,4 +307,9 @@
}
return locDetlsResort;
}
+
+ @Override
+ public int updateNewMatnr(String matnrOld, String matnrNew) {
+ return this.baseMapper.updateNewMatnr(matnrOld, matnrNew);
+ }
}
diff --git a/src/main/resources/mapper/AgvLocDetlMapper.xml b/src/main/resources/mapper/AgvLocDetlMapper.xml
index 7fdc6f0..835d026 100644
--- a/src/main/resources/mapper/AgvLocDetlMapper.xml
+++ b/src/main/resources/mapper/AgvLocDetlMapper.xml
@@ -196,4 +196,12 @@
) b
</select>
+ <update id="updateNewMatnr">
+ update agv_loc_detl
+ set matnr = #{matnrNew}
+ , modi_time = getdate()
+ where 1=1
+ and matnr = #{matnrOld}
+ </update>
+
</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 859c22a..d3c777c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -412,4 +412,12 @@
and loc_no = #{locNo}
and matnr = #{matnr}
</update>
+
+ <update id="updateNewMatnr">
+ update asr_loc_detl
+ set matnr = #{matnrNew}
+ , modi_time = getdate()
+ where 1=1
+ and matnr = #{matnrOld}
+ </update>
</mapper>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f199f1b..f1734b9 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -46,6 +46,7 @@
<result column="store_min" property="storeMin" />
<result column="store_max_date" property="storeMaxDate" />
<result column="stock" property="stock" />
+ <result column="matnr2" property="matnr2" />
</resultMap>
<select id="listByPage" resultMap="BaseResultMap">
--
Gitblit v1.9.1