From 18e957852e3163107c9bdcd37162f0fc9fcbfb00 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 13 十二月 2023 10:55:18 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/common/web/WcsController.java | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 274 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d7f2974..4f3ee00 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,7 +10,7 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
-import com.zy.common.service.erp.ErpService;
+import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -48,7 +48,83 @@
@Autowired
private MatService matService;
@Autowired
- private ErpService erpService;
+ private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvWorkService agvWorkService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+// @Autowired
+// private ErpService erpService;
+
+ @PostMapping("/pakin/loc/v2")
+ @ResponseBody
+ public synchronized R getLocNoV2(@RequestBody SearchLocParam param) {
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ List<WaitPakin> waitPakins = null;
+ ArrayList<Mat> mats = new ArrayList<>();
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+
+ if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
+ return R.parse(CodeRes.PICK_600);
+ }
+ return R.parse(CodeRes.NO_COMB_700);
+ }
+
+ for (WaitPakin waitPakin : waitPakins) {
+ Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
+ mat.setWeight(waitPakin.getAnfme());
+ mats.add(mat);
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
+ }
+ if (Cools.isEmpty(param.getLocType1())){
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ }
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1(param.getLocType1());
+
+ StartupDto dto = null;
+ switch (param.getIoType()) {
+ case 1://婊℃墭鐩樺叆搴�
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2);
+ break;
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
+ break;
+ case 103:// 鎷ｆ枡鍏ュ簱
+ dto = pickWrkIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+ break;
+ case 104:// 骞舵澘鍏ュ簱
+ case 107:// 鐩樼偣鍏ュ簱
+ dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+ break;
+ default:
+ break;
+ }
+ log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ return R.ok().add(dto);
+ }
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -104,6 +180,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1(param.getLocType1());
StartupDto dto = null;
switch (param.getIoType()) {
@@ -111,7 +188,7 @@
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
case 104:// 骞舵澘鍏ュ簱
@@ -125,17 +202,28 @@
return R.ok().add(dto);
}
+ /**
+ * 鍏ㄦ澘鍏ュ簱
+ */
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) {
+ return startupFullPutStore(devpNo, barcode, locTypeDto, mats, waitPakins, 1);
+ }
/**
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins, Integer version) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
+ StartupDto dto = null;
+ if (version == 2) {
+ dto = commonService.getShuttleLocNo( 1, devpNo, matnrList, locTypeDto);
+ }else {
+ dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto, 0);
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -147,7 +235,8 @@
Double ioPri = wrkMastService.getIoPri(1, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
- wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);;
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);
+ ;
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
@@ -167,16 +256,19 @@
}
waitPakins.forEach(waitPakin -> {
Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
- if(Cools.isEmpty(mat)){
+ if (Cools.isEmpty(mat)) {
throw new CoolException(waitPakin.getMatnr() + "璇ョ墿鏂欏彿鏃犳硶鏌ヨ锛岃鏌ョ湅鐗╂枡淇℃伅鏄惁瀛樺湪");
}
WrkDetl wrkDetl = new WrkDetl();
- BeanUtils.copyProperties(waitPakin,wrkDetl);
+ BeanUtils.copyProperties(waitPakin, wrkDetl);
wrkDetl.setZpallet(barcode);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
});
// for (Mat mat : mats) {
// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -205,29 +297,39 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@Transactional
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ return emptyPlateIn(devpNo, locTypeDto, barcode, 1);
+ }
+
+ @Transactional
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, Integer version) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = null;
+ if (version == 2) {
+ dto = commonService.getShuttleLocNo(10, devpNo, null, locTypeDto);
+ }else {
+ dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto, 0);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -237,7 +339,8 @@
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾�
- wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);;
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);
+ ;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -260,25 +363,30 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@Transactional
public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto) {
+ return pickWrkPlateIn(wrkNo, ioType, devpNo, locTypeDto, 1);
+ }
+
+ @Transactional
+ public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
if (Cools.isEmpty(wrkMast)) {
log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
@@ -289,8 +397,154 @@
throw new CoolException(CodeRes.NONE_DETL_900);
}
// 妫�绱㈠簱浣�
- List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
- return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+ if (ioType == 107) {//鐩樼偣鍥炲簱浠诲姟
+ if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) {
+ devpNo = 341;
+ }
+ }
+ StartupDto dto = null;
+ if (version == 2) {
+ dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ }else {
+ dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto, 0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return dto;
}
+ @Transactional
+ public StartupDto pickWrkIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
+ WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
+ if (Cools.isEmpty(wrkMast)) {
+ log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
+ throw new CoolException(CodeRes.NONE_MAST_800);
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ throw new CoolException(CodeRes.NONE_DETL_900);
+ }
+ // 妫�绱㈠簱浣�
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+ if (ioType == 103) {//鎷ｆ枡浠诲姟
+ if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) {
+ devpNo = 341;
+ }
+ }
+ StartupDto dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto);//鑾峰彇搴撲綅
+
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setLocSts("Q"); // Q.鎷ｆ枡鍐嶅叆搴�
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+ if (locDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ for (LocDetl locDetl : locDetls) {
+ locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅
+ locDetl.setAppeTime(now);
+ locDetl.setModiTime(now);
+ if (!locDetlService.insert(locDetl)) {
+ throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触");
+ }
+ }
+
+ //娓呯┖婧愬簱浣嶆暟鎹�
+ LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
+ if (locMast1.getLocSts().equals("P")) {
+ locMast1.setLocSts("O"); // 娓呯┖搴撲綅
+ locMast1.setModiTime(new Date());
+ if (!locMastService.updateById(locMast1)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ }else {
+ throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
+ }
+ return dto;
+ }
+
+ /*
+ 鍥涢」搴撳線AGV琛ヨ揣锛岀敓鎴怉GV鍏ュ簱閫氱煡妗�
+ */
+ @PostMapping("/replenishment")
+ @ResponseBody
+ public R replenishment(@RequestBody ReplenishmentParam param){
+ Date now = new Date();
+ Integer wrkNo = param.getWrkNo();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+ wrkDetls.forEach(wrkDetl -> {
+ if(!Cools.isEmpty(wrkDetl.getSuppCode()) && Cools.isEmpty(agvWaitPakinService.selectByContainerCode(wrkDetl.getSuppCode()))){
+ AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
+ BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
+ agvWaitPakin.setIoStatus("Y");
+ agvWaitPakin.setModiTime(now);
+ agvWaitPakin.setAppeTime(now);
+ agvWaitPakinService.insert(agvWaitPakin);
+ }
+ });
+
+ return R.ok();
+ }
+
+ /*
+ 鐢熸垚AGV宸ヤ綔妗�
+ */
+ @PostMapping("/start")
+ @ResponseBody
+ public R start(@RequestBody ReplenishmentParam param){
+
+ String containerCode = param.getContainerCode();
+ if(Cools.isEmpty(containerCode)){
+ throw new CoolException("鏂欑鐮佷负绌�");
+ }
+
+ if(!Character.isDigit(containerCode.charAt(0))){
+ containerCode = containerCode.substring(3,containerCode.length());
+ }
+
+ AgvBasDevp agvBasDevp = agvBasDevpService.getByDevNo(param.getDevNo());
+
+ if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
+ throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
+ }
+ if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ throw new CoolException("璇ユ枡绠变綅缁勬墭");
+ }
+
+ //鍘绘壘agv宸ヤ綔妗ｄ换鍔�
+ if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
+ throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
+ }
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+
+ //鐢熸垚宸ヤ綔妗�
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+ agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
+
+
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1