From ccc693f973698fc6b0d333ccab8068114c53921b Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 28 十月 2022 16:44:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 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();
+ }
+
}
--
Gitblit v1.9.1