From d0785c1420794a0a8be33893e1f1e93ac23da82d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 28 十月 2022 14:26:46 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 3 +
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 1
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 ++
src/main/resources/mapper/LocDetlMapper.xml | 4 ++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/controller/WrkMastController.java | 42 ++++++++++++++++++++
src/main/java/com/zy/asrs/service/WrkDetlService.java | 1
9 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 9a28809..c3cc1ee 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -188,7 +188,7 @@
if (wrkMast.getIoType() != 107) {
return R.error("宸ヤ綔妗ｉ潪鎹℃枡浠诲姟");
}
- if (wrkMast.getWrkSts() != 14){
+ if (wrkMast.getWrkSts() != 17){
return R.error("鐩樼偣浠诲姟姝ｅ湪鎵ц涓�,璇风瓑寰呰澶囪繍琛岀粨鏉熷悗杩涜鎿嶄綔");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -284,5 +284,45 @@
return R.ok("搴撳瓨鏇存柊宸叉垚鍔�");
}
+ @GetMapping("/wrkMast/pickToFill")
+ public R pickToFill(String barcode){
+ Date now = new Date();
+ if (Cools.isEmpty(barcode)) {
+ return R.error("鎵樼洏鐮佷负绌�,璇锋鏌�");
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒拌宸ヤ綔妗�,璇锋鏌ユ墭鐩樼爜鏄惁姝ｇ‘");
+ }
+ if (wrkMast.getIoType() != 103) {
+ return R.error("浠呮湁鎹℃枡鍑哄簱鍙互浣跨敤璇ュ姛鑳�");
+ }
+ if (wrkMast.getWrkSts() != 17) {
+ return R.error("鎹℃枡鍑哄簱鏈畬鎴�,璇风瓑寰呰澶囪繍琛屽畬鎴�");
+ }
+ wrkMast.setIoType(101);
+ wrkMast.setMemo("鎹℃枡杞叏鏉垮伐浣滄。");
+ wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
+ .eq("wrk_no",wrkMast.getWrkNo()));
+ wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+ for (LocDetl locDetl : locDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setZpallet(wrkDetl.getBarcode());
+ wrkDetl.setBarcode(wrkMast.getBarcode());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setAppeUser(1L);
+ wrkDetl.setModiUser(1L);
+ wrkDetlService.insert(wrkDetl);
+
+ }
+ locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 141f768..8386e2e 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -68,4 +68,6 @@
Double selectSumByMatnr(@Param("matnr") String matnr);
List<LocDetl> selectGroupPage(Map<String, Object> param);
+
+ List<LocDetl> selectByLocNo(@Param("locNo") String locNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e74b6f5..f1310f2 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -28,4 +28,5 @@
int updateOrderNo(@Param("orderNo")String orderNo, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ void deleteByWrkNo(@Param("wrkNo") Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 7b1aa6e..b35d733 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -62,4 +62,6 @@
Double selectSumByMatnr(String matnr);
List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit);
+
+ List<LocDetl> selectByLocNo(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 7018d0f..aaf7798 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -24,4 +24,5 @@
boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch);
+ void deleteByWrkNo(Integer wrkNo);
}
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 6247c31..3bee2dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -133,6 +133,11 @@
return this.baseMapper.selectGroupPage(param);
}
+ @Override
+ public List<LocDetl> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
+
@Override
public LocDetl selectItem(String locNo, String matnr, String batch) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 47bede0..e459a0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -91,4 +91,9 @@
return baseMapper.updateOrderNo(orderNo, wrkNo, matnr, batch) > 0;
}
+ @Override
+ public void deleteByWrkNo(Integer wrkNo) {
+ this.baseMapper.deleteByWrkNo(wrkNo);
+ }
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 5bf4832..a0621d2 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -412,5 +412,9 @@
SELECT * FROM [dbo].[asr_loc_detl_group] WHERE 1 = 1
<include refid="groupListCondition"></include>
</select>
+ <select id="selectByLocNo" resultMap="BaseResultMap">
+ SELECT * FROM asr_loc_detl WHERE loc_no = #{locNo}
+
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 388b37f..b1af620 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -70,6 +70,9 @@
and matnr = #{matnr}
<include refid="batchSeq"></include>
</delete>
+ <delete id="deleteByWrkNo">
+ DELETE FROM asr_wrk_detl where wrk_no = #{wrkNo}
+ </delete>
<update id="updateAnfme">
update asr_wrk_detl
--
Gitblit v1.9.1