From e46ea3878b409c8a999bf653c3584d122738efb7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 22:31:58 +0800
Subject: [PATCH] 完成部署服务器
---
src/main/java/com/zy/common/web/WcsController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bbe9aa6..66b5d65 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -105,6 +105,11 @@
}
}
}
+ // 1.姣嶆墭鐩橈紝2瀛愭墭鐩�
+ int flag = 0;
+ if(param.getIoType() == 10) {
+ flag = param.getBucketType() == 21 ? 1 : 2 ;
+ }
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
@@ -112,7 +117,7 @@
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakin, param.isTailSupportFlag());
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1);
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1, flag);
break;
default:
break;
@@ -210,7 +215,7 @@
wrkMast.setIoPri(13D); // 浼樺厛绾�
// wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(param.getSourceStaNo());
- wrkMast.setStaNo(1016);
+ wrkMast.setStaNo(1024);
// wrkMast.setLocNo(dto.getLocNo());
wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -762,7 +767,7 @@
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea) {
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea, int flag) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -786,6 +791,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
+ wrkMast.setPltType(flag); // 绌烘嫋绫诲瀷
// wrkMast.setBarcode(barcode);
// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
--
Gitblit v1.9.1