From d51a3179dd086c902df4a6e8afeaef3a5d22bd93 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 21 八月 2025 08:57:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b1bc5a0..23e99f4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -89,11 +89,11 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
if (param.getBarcode().startsWith("11")) {
locTypeDto.setLocType2((short) 1);
- }else if (param.getBarcode().startsWith("13")) {
+ } else if (param.getBarcode().startsWith("13")) {
locTypeDto.setLocType2((short) 2);
- }else if (param.getBarcode().startsWith("16")) {
+ } else if (param.getBarcode().startsWith("16")) {
locTypeDto.setLocType2((short) 3);
- }else {
+ } else {
return R.error("鏈煡鎵樼洏鐮佽鍒�");
}
@@ -176,7 +176,8 @@
// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
- FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
//TODO 娴嬭瘯
// StartupDto dto = new StartupDto();
@@ -185,7 +186,7 @@
// dto.setStaNo(103);
// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
// dto.setLocNo(locMastxx.getLocNo());
-// dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
+// dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
if (dto == null) {
@@ -199,7 +200,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(30D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -214,6 +215,8 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -231,13 +234,7 @@
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(dto.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
// 鏇存柊婧愮珯鐐逛俊鎭�
--
Gitblit v1.9.1