From 8bc35cc4f75cfb435577e34763002f69def6a1a2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 07 二月 2026 16:53:18 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/common/web/WcsController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6d8de64..f9e25d6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -107,11 +107,23 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("5")){
+ locTypeDto.setLocType2((short) 5); // 2000*1500*170 1宸烽亾 4銆�5灞�
+ }else if (param.getBarcode().startsWith("6")){
+ locTypeDto.setLocType2((short) 6); // 1500*1500*170(鏈変袱绉� 鎵樼洏涓�鏍� 杞介噸涓嶄竴鏍� 闇�瑕佸崟鐙牴鎹� 鎵樼洏鐮� + 楂樹綆 鏉ュ啓鍒嗗簱浣嶇殑閫昏緫) 1宸烽亾 1銆�2銆�3灞�
+ }else if (param.getBarcode().startsWith("7")){
+ locTypeDto.setLocType2((short) 7); // 2600*1500*160 2宸烽亾 1銆�2灞�
+ }else if (param.getBarcode().startsWith("8")){
+ locTypeDto.setLocType2((short) 8); // 1300*1500*160 2宸烽亾 3銆�4銆�5銆�6灞�
+ }else {
+ return R.error("鏉＄爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
+ }
+
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), param.getWeight(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -333,8 +345,7 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
-// StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto,barcode);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -374,6 +385,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setModel(waitPakin.getModel());
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
@@ -417,10 +429,8 @@
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+// locMast.setScWeight(weight); // 鏁存墭閲嶉噺璁板叆搴撲綅 涓哄苟鏉垮嚭搴撶瓫閫夋墭鐩樺仛鍑嗗
locMast.setModiTime(now);
- if (locMast.getBarcode()==null){
- locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
- }
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
@@ -435,7 +445,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto,barcode);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -473,9 +483,6 @@
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (locMast.getBarcode()==null){
- locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
- }
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
--
Gitblit v1.9.1