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 | 252 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 203 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7e5b636..953753a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,17 +10,20 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -57,26 +60,42 @@
private WorkService workService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+
@Value("${wcs-slave.url}")
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) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getCargoHeight())) {
- return Re.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ return Re.error("楂樹綆搴撶被鍨嬩笉鑳戒负绌�");
}
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("100")) {
+ if (param.getFromPort().equals("101")) {
//鏈夌┖鏉垮嚭搴撴椂绂佹鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",110).eq("sta_no",100).notIn("wrk_sts",7));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
if(wrkCount > 0){
return Re.error("鏈夌┖鏉垮嚭搴撳埌100绔欐椂鏃剁姝㈠叆搴�");
}
@@ -85,7 +104,7 @@
return Re.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarCode()));
- if (Cools.isEmpty(waitPakins)) {
+ if (Cools.isEmpty(waitPakins) && param.getIoType() != 10) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarCode());
if (wrkMast != null && wrkMast.getIoType() == 103) {
return Re.parse(CodeRes.PICK_600);
@@ -97,15 +116,15 @@
if (countLoc > 0 || countWrk > 0) {
return Re.error(CodeRes.EXIST_500);
}
- }else {
+ } else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",101).or().eq("io_type",110));
- if(wrkCount > 0){
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 100).andNew().eq("io_type", 101).or().eq("io_type", 110));
+ if (wrkCount > 0) {
return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
}
int countLoc = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 10));
- if (countLoc > 0 ) {
+ if (countLoc > 0) {
return Re.error("宸叉湁绌烘澘鍏ュ簱浠诲姟绂佹鍦ㄥ叆绌烘澘");
}
}
@@ -119,20 +138,48 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
- switch (param.getFromPort()) {
- case "100"://婊℃墭鐩樺叆搴�
+
+ //鍏ㄦ澘鍏ュ簱
+ param.setIoType(1);
+
+ switch (param.getIoType()) {
+ case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, waitPakins);
break;
- case "200"://绌烘墭鐩樺叆搴�
- 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
@@ -192,9 +239,17 @@
// 婧愮珯鐐圭姸鎬佹娴�
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("娌℃湁妫�绱㈠埌绌哄簱浣�");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -220,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("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -267,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);
// 妫�绱㈠簱浣�
@@ -289,7 +346,6 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
@@ -322,14 +378,14 @@
@ResponseBody
public Re status(@RequestBody StatusParam statusParam) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
- if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
- return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟");
- }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){
+ if (Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() != 8) {
+ return Re.error("娌℃湁鎵惧埌:" + statusParam.getTaskId() + "杩欐潯浠诲姟");
+ } else if (Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() == 8) {
return Re.ok();
- }else if(!Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8&&wrkMast.getIoType()==110){
+ } else if (!Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() == 8 && wrkMast.getIoType() == 110) {
return Re.ok();
}
- /**
+ /*
* 浠诲姟鐘舵��
* 鎵ц杩囩▼涓�
* 鐨勭姸鎬併�� 0- 宸� 鎺�
@@ -338,45 +394,141 @@
* 浠诲姟涓柇,4-鏀捐揣
* 瀹屾垚,8-浠诲姟缁撴潫
*/
- if (statusParam.getTaskStatus()==0){
- wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
- }else if (statusParam.getTaskStatus()==1){
+
+ if (statusParam.getTaskStatus() == 0) {
+ //鎷ｆ枡鍜岀洏鐐瑰啀鍏ュ簱鍒ゆ柇
+ if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ String sourcecLocNo = wrkMast.getSourceLocNo();
+ // 鑾峰彇鍚庝袱浣嶇殑灞傛暟锛堥珮浣庡簱浣嶆暟鎹級
+ String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
+ int layer = Integer.parseInt(layerStr);
+ // 鍒ゆ柇灞傛暟
+ Short locType1 = (short) ((layer == 1) ? 1 : 2);
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(locType1);
+ //娉ㄦ剰涓�涓澘鍙兘鏀惧悓涓�绉嶇墿鏂欙紙妫�绱㈡柊搴撲綅锛�
+ StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
+ Date now = new Date();
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
+ wrkMast.setSourceStaNo(101); // 婧愮珯
+ wrkMast.setStaNo(null); // 鐩爣绔�
+ wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setSourceLocNo(sourcecLocNo);
+ wrkMast.setModiTime(now);
+ wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
+
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast locMast2 = locMastService.selectById(dto.getLocNo());
+ locMast2.setLocSts("Q");
+ locMast2.setModiTime(new Date());
+ if (!locMastService.updateById(locMast2)) {
+
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
+ }
+ } else if (statusParam.getTaskStatus() == 1) {
wrkMast.setWrkSts(2L);//2.浠诲姟寮�濮�
- }else if (statusParam.getTaskStatus()==2){
+ } else if (statusParam.getTaskStatus() == 2) {
wrkMast.setWrkSts(3L);//3.鍙栬揣瀹屾垚
- }else if (statusParam.getTaskStatus()==3){
+ } else if (statusParam.getTaskStatus() == 3) {
wrkMast.setWrkSts(6L);//6.浠诲姟涓柇
- } else if (statusParam.getTaskStatus()==4 || statusParam.getTaskStatus()==8){
-// wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
- if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10){
+ } else if (statusParam.getTaskStatus() == 4 || statusParam.getTaskStatus() == 8) {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
- }else if (wrkMast.getIoType()==101){
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ String sourcecLocNo = wrkMast.getSourceLocNo();
+ //鏇存柊宸ヤ綔鏄庣粏骞舵竻绌烘簮搴撲綅
+ for (WrkDetl wrkDetl : wrkDetls){
+ LocDetl locDetl = locDetlService.selectItem(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ if (null != locDetl && wrkMast.getIoType() == 103) {//鎷ｆ枡
+ if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new CoolException("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }else if(wrkMast.getIoType() == 107){//鐩樼偣
+ if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new CoolException("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ }
+ LocMast locMast1 = locMastService.selectById(sourcecLocNo);
+ locMast1.setLocSts("O");
+ locMast1.setModiTime(new Date());
+ if (!locMastService.updateById(locMast1)) {
+
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
- } else if (wrkMast.getIoType()==110) {
- wrkMast.setWrkSts(7L);
+ } 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);
+ //宸插叆搴撴湭纭鍘嗗彶妗ｆ洿鏂�
+ if(wrkMast.getWrkSts() == 14){
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗ｅけ璐�");
+ }
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�");
+ }
+ }
return Re.ok();
}
@GetMapping("loc")
- public void loc(){
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>());
- List<HashMap<String,Object>> mapList=new ArrayList<>();
+ public void loc() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
+ List<HashMap<String, Object>> mapList = new ArrayList<>();
for (LocMast locMast : locMasts) {
- if (locMast.getLev1()!=4){
- HashMap<String,Object> map=new HashMap<>();
- map.put("warehouse","wzzy");
- 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.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());
+ 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){
+ if (mapList.size() > 0) {
String response = "";
boolean success = false;
try {
@@ -390,7 +542,7 @@
if (jsonObject.getInteger("returnStatus").equals(0)) {
success = true;
} else {
- log.error("wms鍚屾wcs搴撲綅澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+loc, JSON.toJSONString(mapList), response);
+ log.error("wms鍚屾wcs搴撲綅澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + "/" + loc, JSON.toJSONString(mapList), response);
throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
}
} catch (Exception e) {
@@ -402,14 +554,16 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"wms鍚屾wcs搴撲綅澶辫触",
- url+"/"+loc,
+ url + "/" + loc,
null,
"127.0.0.1",
JSON.toJSONString(mapList),
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e);
+ }
}
}
}
--
Gitblit v1.9.1