From b0a40b8b4f2921d449e2d750cfeb56979cd563e1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 13 九月 2025 16:57:10 +0800
Subject: [PATCH] #四向库入库规则
---
src/main/java/com/zy/common/web/WcsController.java | 137 +++++++++++++++++++++++++++------------------
1 files changed, 83 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 72cd9a1..7f50163 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,6 +6,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.StorageResult;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -47,64 +48,79 @@
@Autowired
private BasCrnpService basCrnpService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody(required = false) SearchLocParam param) {
- StorageResult storageResult=new StorageResult();
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getWcsIoType())) {
+ if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
- if (Cools.isEmpty(param.getWcsSourceStaNo())) {
+ if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
List<WaitPakin> waitPakins = null;
- if (param.getWcsIoType() == 1) {
- if (Cools.isEmpty(param.getBoxNo())) {
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBoxNo()));
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBoxNo());
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
if (wrkMast != null && wrkMast.getIoType() == 103) {
return R.parse(CodeRes.PICK_600);
}
return R.parse(CodeRes.NO_COMB_700);
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBoxNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBoxNo()));
+ 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(CodeRes.EXIST_500);
}
}
+ if (Cools.isEmpty(param.getLocType1())) {
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ }
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
- switch (param.getWcsIoType()) {
+ StartupDto dto = null;
+ switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- storageResult = startupFullPutStore(param.getWcsSourceStaNo(), param.getBoxNo(), waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
break;
- case 2://绌烘墭鐩樺叆搴�
- storageResult = emptyPlateIn(param.getWcsSourceStaNo(), param.getBoxNo());
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), param.getBarcode());
break;
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", storageResult, param.getBoxNo());
- return R.ok().add(storageResult);
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
}
+
/**
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StorageResult startupFullPutStore(Integer devpNo, String barcode, List<WaitPakin> waitPakins) {
- StorageResult storageResult=new StorageResult();
- Integer[] arr=arr();
- int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch();
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- LocMast locMast1 =commonService.getLocNo2(waitPakins.get(0),arr,0,type,1);
- int workNo = commonService.getWorkNo(0);
+// 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, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+ int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -112,19 +128,23 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setSourceStaNo(devpNo);
- wrkMast.setLocNo(locMast1.getLocNo());
+ wrkMast.setIoPri(30D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -142,40 +162,42 @@
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(locMast1.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
+ if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ 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(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- storageResult.setResults(results);
- return storageResult;
+ return dto;
}
@Transactional
- public StorageResult emptyPlateIn(Integer devpNo, String barcode) {
- StorageResult storageResult=new StorageResult();
+ public StartupDto emptyPlateIn(Integer devpNo, String barcode) {
// 妫�绱㈠簱浣�
Integer[] arr=arr();
+
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ LocTypeDto locTypeDto = new LocTypeDto();
+
// 妫�绱㈠簱浣�
- LocMast locMast1 =commonService.getLocNo2(null,arr,0,1,2);
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+
+ String locNo = dto.getLocNo();
+
int workNo = commonService.getWorkNo(0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -185,7 +207,7 @@
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setSourceStaNo(devpNo);
- wrkMast.setLocNo(locMast1.getLocNo());
+ wrkMast.setLocNo(locNo);
wrkMast.setFullPlt("N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -201,7 +223,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(locMast1.getLocNo());
+ LocMast locMast = locMastService.selectById(locNo);
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
@@ -209,13 +231,9 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(locNo + "鐩爣搴撲綅宸茶鍗犵敤");
}
- StorageResult.Results results=new StorageResult.Results();
- results.setTaskNo(workNo);
- results.setShelfUnitId(locMast1.getLocNo());
- storageResult.setResults(results);
- return storageResult;
+ return dto;
}
@Transactional
@@ -252,6 +270,7 @@
}else{
basCrnp.setTankQty(0);
basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",basCrnp.getCrnNo()));
+ int xx=0;
arr[i]=basCrnp.getLev1();
i++;
int o=basCrnp.getCrnNo();
@@ -260,18 +279,27 @@
o=1;
}
basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",o));
- if(q==1){
+ if(Cools.isEmpty(basCrnp)){
+ log.error(q+"鍙峰皬杞︽病鏈夋壘鍒�");
+ continue;
+ }
+ if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){
+ log.error(q+"鍙峰皬杞︽姤璀︽垨鑰呭湪鍏呯數璺宠繃姝よ溅");
+ continue;
+ }
+ if(xx==0){
basCrnp.setTankQty(1);
basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",o));
}
arr[i]=basCrnp.getLev1();
i++;
+ xx++;
}
}
for (int w=1;w<=7;w++){
boolean boo=true;
- for(int g=0;g<count;g++){
+ for(int g=0;g<i;g++){
if(arr[g]==w){
boo=false;
break;
@@ -281,6 +309,7 @@
arr[i]=w;
i++;
}
+ if(i==7) break;
}
return arr;
}
--
Gitblit v1.9.1