From c809a08cd4746f8c1c33c9158df4e35a55f5bc6e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 16 十二月 2025 11:02:20 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/web/WcsController.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3bc9a83..953753a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -17,6 +17,7 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.web.param.SearchEmptyParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +71,10 @@
private String url;
@Value("${wcs-slave.loc}")
private String loc;
+ @Value("${wcs-slave.warehouse}")
+ private String warehouse;
+ //鍏ㄦ澘鍏ュ簱
@PostMapping("/fromwcs/inware-task")
@ResponseBody
public synchronized Re getLocNo(@RequestBody SearchLocParam param) {
@@ -81,6 +85,12 @@
if (Cools.isEmpty(param.getFromPort())) {
return Re.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+ if(Cools.isEmpty(param.getWarehouse())){
+ return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+ }
+ if(!param.getWarehouse().equals(warehouse)){
+ return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+ }
List<WaitPakin> waitPakins = null;
if (param.getFromPort().equals("101")) {
@@ -90,7 +100,7 @@
return Re.error("鏈夌┖鏉垮嚭搴撳埌100绔欐椂鏃剁姝㈠叆搴�");
}
- if (Cools.isEmpty(param.getBarCode()) && param.getIoType() != 10) {
+ if (Cools.isEmpty(param.getBarCode())) {
return Re.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarCode()));
@@ -128,20 +138,48 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
+
+ //鍏ㄦ澘鍏ュ簱
+ param.setIoType(1);
+
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, waitPakins);
break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
- break;
+// case 10://绌烘墭鐩樺叆搴�
+// dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
+// break;
default:
break;
}
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarCode());
return Re.ok();
}
+
+ @PostMapping("/fromwcs/empty-pallet-task")
+ @ResponseBody
+ public synchronized Re getLocNo(@RequestBody SearchEmptyParam param) {
+ log.info("鏀跺埌WCS绌烘澘鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ if(Cools.isEmpty(param.getWarehouse())){
+ return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+ }
+ if(!param.getWarehouse().equals(warehouse)){
+ return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+ }
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+
+ StartupDto dto = null;
+
+ dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto);
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto);
+ return Re.ok();
+ }
+
+
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
@@ -201,9 +239,14 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- 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, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
+
+// StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+ StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
if (dto == null) {
throw new CoolException("娌℃湁妫�绱㈠埌绌哄簱浣�");
}
@@ -232,6 +275,8 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -279,7 +324,7 @@
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -301,7 +346,6 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
@@ -422,8 +466,10 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
- } else if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
+ } else if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && statusParam.getTaskStatus() != 8) {
wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 7 && statusParam.getTaskStatus() == 8){
+ wrkMast.setWrkSts(15L);//15.鍑哄簱鏇存柊瀹屾垚锛屼换鍔＄粨鏉�
}
}
wrkMastService.updateById(wrkMast);
@@ -446,16 +492,41 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
List<HashMap<String, Object>> mapList = new ArrayList<>();
for (LocMast locMast : locMasts) {
- if (locMast.getLev1() != 4) {
+ if (locMast.getLocSts() != "X" && locMast.getLocSts() != "G" ) {
HashMap<String, Object> map = new HashMap<>();
map.put("warehouse", "ddth");
map.put("posiX", locMast.getRow1());
map.put("posiY", locMast.getBay1());
map.put("posiZ", locMast.getLev1());
map.put("cargoNo", locMast.getLocNo());
- map.put("type", "0");
+ if(locMast.getLev1() == 1 && locMast.getRow1() == 8 && locMast.getBay1() == 1){
+ map.put("type", "6");
+ }else {
+ map.put("type", "0");
+ }
mapList.add(map);
}
+ if(locMast.getLocSts() == "G"){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("warehouse", "ddth");
+ map.put("posiX", locMast.getRow1());
+ map.put("posiY", locMast.getBay1());
+ map.put("posiZ", locMast.getLev1());
+ map.put("cargoNo", locMast.getLocNo());
+ map.put("type", "1");
+ mapList.add(map);
+ }
+ if(locMast.getLocSts() == "X"){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("warehouse", "ddth");
+ map.put("posiX", locMast.getRow1());
+ map.put("posiY", locMast.getBay1());
+ map.put("posiZ", locMast.getLev1());
+ map.put("cargoNo", locMast.getLocNo());
+ map.put("type", "5");
+ mapList.add(map);
+ }
+
}
if (mapList.size() > 0) {
String response = "";
--
Gitblit v1.9.1