From d6cb644d0ccc0f73f68d60b3a43e82320d8c97f0 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 23 六月 2025 08:57:04 +0800
Subject: [PATCH] 米多泉州wms功能完善
---
src/main/java/com/zy/common/web/WcsController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8230f84..e070559 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.WrkMastMapper;
@@ -281,6 +282,7 @@
// wrkDetl.setManuDate(param.getManuDate());
// wrkDetl.setWeight(param.getWeight());
// wrkDetl.setManLength(param.getGrossWeight());
+// wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
// wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
// wrkDetl.setIoTime(now);
// wrkDetl.setAppeTime(now);
@@ -325,6 +327,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
wrkDetl.setInspect(1);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -378,6 +381,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume());
wrkDetl.setInspect(1); // 璐存爣鎴愬姛
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -671,6 +675,14 @@
return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
+ // 鑷姩鍑虹┖妗�
+ @PostMapping("/autoOutEmptyBucket")
+ @ResponseBody
+ public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+ workService.startupFullTakeStore(param, 29L);
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@PostMapping("auto/emptyOut/v1")
@ResponseBody
public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
@@ -871,7 +883,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(14D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
--
Gitblit v1.9.1