From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/common/web/WcsController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5debc7f..8f5860d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -64,6 +64,11 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
+ 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);
+ }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -72,11 +77,6 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
- 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 (Cools.isEmpty(param.getLocType1())){
return R.error("瀹界獎妫�娴嬩俊鍙蜂笉鑳戒负绌�");
@@ -84,7 +84,15 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType2(param.getLocType1());
+
+ // 闀垮害>3500鏀惧搴撲綅
+ if (param.getIoType() == 1) {
+ if (sourceStaNo.getDevNo() == 1102 || sourceStaNo.getDevNo() == 2101 || sourceStaNo.getDevNo() == 2103) {
+ sourceStaNo.setLocType2((short) (waitPakins.get(0).getWeight() >= 800 ? 2 :1));
+ }else {
+ sourceStaNo.setLocType2((short) (waitPakins.get(0).getLength() >= 4600 ? 2 : 1));
+ }
+ }
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -238,7 +246,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
+// StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(sourceStaNo,locTypeDto, 10);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1