From 8e50919bbf442ed17f4d75aa55786e3acb07304c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 07 三月 2026 09:18:01 +0800
Subject: [PATCH] 组托时没有入库通知档的数据，自动生成空托盘数据入库
---
src/main/java/com/zy/common/web/WcsController.java | 21 ++++++++++++++++++++-
src/main/java/com/zy/common/model/LocTypeDto.java | 4 ++--
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index bc0c41e..5a4d804 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -28,10 +28,10 @@
}
public LocTypeDto(BasDevp basDevp) {
- if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
+ if (basDevp.getLocType1() == null) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
- if (basDevp.getLocType1() == 1) {
+ if (basDevp.getLocType1() == 0) {
this.locType1 = 1; // 浣庡簱浣�
} else {
this.locType1 = 2; // 楂樺簱浣�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c9d23a5..a4d3b9e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -70,7 +70,26 @@
if (wrkMast != null && wrkMast.getIoType() == 103) {
return R.parse(CodeRes.PICK_600);
}
- return R.parse(CodeRes.NO_COMB_700);
+ Date now = new Date();
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setMatnr("emptyPallet");
+ waitPakin.setBatch("");
+ waitPakin.setAnfme(1D);
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakin.setIoStatus("N");
+ waitPakin.setStatus("Y");
+ waitPakin.setAppeUser(9999L);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(9999L);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ return R.error("鑷姩鐢熸垚鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ return R.error("鑷姩鐢熸垚鍏ュ簱閫氱煡妗ｅ悗鏈煡璇㈠埌鏁版嵁");
+ }
+ log.info("WCS鍏ュ簱鎺ュ彛鑷姩鐢熸垚鍏ュ簱閫氱煡妗�, zpallet:{}, matnr:{}, anfme:{}", param.getBarcode(), "32149", 1D);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
--
Gitblit v1.9.1