From b09865e3b4e43ec7110ca7472188478fcdb6fb0f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 22 三月 2023 09:41:32 +0800
Subject: [PATCH] #库存档案同步上报
---
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 06099a0..8fb2c05 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -67,10 +67,14 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
+ int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
+ .eq("io_status", "Y"));
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
+ if (countLoc > 0 || countWrk > 0 || countWait > 0) {
+ if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
+ return R.error(CodeRes.EXIST_500);
+ }
}
}
if (Cools.isEmpty(param.getLocType1())){
@@ -79,7 +83,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType1(param.getLocType1());
+// sourceStaNo.setLocType1(param.getLocType1());
+ sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -94,7 +99,7 @@
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},pack鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
@@ -143,6 +148,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setDeadWarn(waitPakin.getDeadWarn());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
--
Gitblit v1.9.1