From 4dfc306f910a8b1ae1a2869bc8ffd38b2faf8f2e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 09:02:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3855940..90f1bb9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -21,14 +21,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* Created by vincent on 2020/10/30
@@ -124,10 +121,10 @@
StartupDto dto = null;
switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
+ case 1://婊¤揣鏋跺叆搴�
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2);
break;
- case 10://绌烘墭鐩樺叆搴�
+ case 10://绌鸿揣鏋跺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
break;
case 103:// 鎷ｆ枡鍏ュ簱
@@ -140,7 +137,7 @@
default:
break;
}
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ log.info("/pakin/loc/v1:"+dto + "======璐ф灦鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -202,10 +199,10 @@
StartupDto dto = null;
switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
+ case 1://婊¤揣鏋跺叆搴�
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
break;
- case 10://绌烘墭鐩樺叆搴�
+ case 10://绌鸿揣鏋跺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
@@ -216,7 +213,7 @@
default:
break;
}
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ log.info("/pakin/loc/v1:"+dto + "======璐ф灦鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -258,13 +255,13 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setBarcode(barcode); // 璐ф灦鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 璐ф灦绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
@@ -370,7 +367,7 @@
wrkMast.setLinkMis("Y");
wrkMast.setBarcode(barcode);
// wrkMast.setSteNo(findSte(wrkMast.getLocNo()));
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 璐ф灦绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
@@ -492,7 +489,7 @@
}
List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
- log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
+ log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛岃揣鏋剁爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
@@ -593,14 +590,12 @@
if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
}
-
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));
//鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
//缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());
//鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
@@ -615,7 +610,7 @@
//鍏ュ簱浠诲姟
if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
//缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());
//鐢熸垚宸ヤ綔妗�
List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
@@ -649,21 +644,21 @@
String devNo = param.getDevNo();
String currentContainerCode = currentContainerMap.get(devNo);
- //鍒ゆ柇瀹瑰櫒鏄惁鍙戠敓鍙樺寲
+ //鍒ゆ柇璐ф灦鏄惁鍙戠敓鍙樺寲
if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
- //鏌ヨ鏃у鍣ㄧ殑宸ヤ綔妗�
+ //鏌ヨ鏃ц揣鏋剁殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
- //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+ //灏嗗伐浣滃厷鐘舵�佹敼涓鸿揣鏋剁鍦�
agvWrkMast.setWrkSts(206L);
agvWrkMastService.updateById(agvWrkMast);
-// //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
+// //鍙戦�佽揣鏋剁珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
// List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
// agvWrkMastList.add(agvWrkMast);
// try {
// int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
// if(code == 0){
-// //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+// //灏嗗伐浣滃厷鐘舵�佹敼涓鸿揣鏋剁鍦�
// agvWrkMast.setWrkSts(206L);
// agvWrkMastService.updateById(agvWrkMast);
// }
@@ -690,7 +685,7 @@
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
- //鏌ユ壘璇ュ鍣ㄧ殑宸ヤ綔妗�
+ //鏌ユ壘璇ヨ揣鏋剁殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWrkMast)){
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -717,7 +712,7 @@
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
agvBasDevpDto.setAgvWrkMast(agvWrkMast);
}
- //鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
+ //鏌ユ壘璇ヨ揣鏋剁殑鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
if(!Cools.isEmpty(agvWaitPakinList)){
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
--
Gitblit v1.9.1