From aa9f5df9a7ea885dcc157e1dd86dc6ee3c10d488 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 09 一月 2025 09:16:56 +0800
Subject: [PATCH] #拣料盘点重新找库位
---
src/main/java/com/zy/common/web/WcsController.java | 123 +++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a28c43a..f1d3197 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,6 +10,7 @@
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;
@@ -21,6 +22,7 @@
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,6 +59,8 @@
private WorkService workService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
@Value("${wcs-slave.url}")
private String url;
@Value("${wcs-slave.loc}")
@@ -76,7 +80,7 @@
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绔欐椂鏃剁姝㈠叆搴�");
}
@@ -97,15 +101,15 @@
if (countLoc > 0 || countWrk > 0) {
return Re.error(CodeRes.EXIST_500);
}
- }else {
+ } else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no",100).andNew().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("宸叉湁绌烘澘鍏ュ簱浠诲姟绂佹鍦ㄥ叆绌烘澘");
}
}
@@ -195,7 +199,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, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
- if(dto == null){
+ if (dto == null) {
throw new CoolException("娌℃湁妫�绱㈠埌绌哄簱浣�");
}
int workNo = dto.getWorkNo();
@@ -325,14 +329,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- 宸� 鎺�
@@ -341,41 +345,74 @@
* 浠诲姟涓柇,4-鏀捐揣
* 瀹屾垚,8-浠诲姟缁撴潫
*/
- if (statusParam.getTaskStatus()==0){
+
+ if (statusParam.getTaskStatus() == 0) {
//鎷ｆ枡鍜岀洏鐐瑰啀鍏ュ簱鍒ゆ柇
- if((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14){
+ 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(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setSourceLocNo(sourcecLocNo);
wrkMast.setModiTime(now);
+ wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
+
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
- locMast.setLocSts("Q");
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
+ LocMast locMast2 = locMastService.selectById(dto.getLocNo());
+ locMast2.setLocSts("Q");
+ locMast2.setModiTime(new Date());
+ if (!locMastService.updateById(locMast2)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- }else{
+ } else {
wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
}
- }else if (statusParam.getTaskStatus()==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){
- if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 ||wrkMast.getIoType() == 57){
+ } 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()==103 || wrkMast.getIoType()==107){
+ } 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) {
+ 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() + "]");
+ }
+ }
+ }
+ 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()==101 || wrkMast.getIoType()==110){
+ } else if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
}
}
@@ -384,22 +421,22 @@
}
@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.getLev1() != 4) {
+ 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");
mapList.add(map);
}
}
- if(mapList.size()>0){
+ if (mapList.size() > 0) {
String response = "";
boolean success = false;
try {
@@ -413,7 +450,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) {
@@ -425,14 +462,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