From 177188e74cbb15581132578b7b2857957b667a94 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 16:24:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 243 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 212 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d822f05..ea40f9e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -16,12 +17,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2020/10/30
@@ -44,11 +45,15 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -73,13 +78,13 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ 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())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -87,6 +92,15 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("11")) {
+ locTypeDto.setLocType2((short) 1);
+ } else if (param.getBarcode().startsWith("13")) {
+ locTypeDto.setLocType2((short) 2);
+ } else if (param.getBarcode().startsWith("16")) {
+ locTypeDto.setLocType2((short) 3);
+ } else {
+ return R.error("鏈煡鎵樼洏鐮佽鍒�");
+ }
StartupDto dto = null;
switch (param.getIoType()) {
@@ -104,14 +118,38 @@
return R.ok().add(dto);
}
+ @PostMapping("/pakin/pick/loc/v1")
+ @ResponseBody
+ public synchronized R getPickLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鎷ｆ枡鐩樼偣鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+
+ if (Cools.isEmpty(param.getLocType1())) {
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ }
+
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉瀛樺湪");
+ }
+
+ StartupDto dto = startupPickPutStore(param);
+ log.info("WCS鎷ｆ枡鐩樼偣鍏ュ簱鎺ュ彛,鎵樼洏鐮�:{}", param.getBarcode());
+ return R.ok().add(dto);
+ }
+
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
- public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 15, null, locTypeDto,0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+
+ StartupDto dto = commonService.getLocNo(10, 12, findLocNoAttributeVo, locTypeDto, null);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -134,22 +172,149 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut() {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
return R.error("搴撳瓨娌℃湁绌烘澘");
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(11);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
+ emptyPlateOutParam.setOutSite(12);
+ emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
+ add(locMast.getLocNo() + "");
+ }});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ }
+
+ @Transactional
+ public StartupDto startupPickPutStore(SearchLocParam param) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
+ sourceStaNo.setLocType1(param.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("11")) {
+ locTypeDto.setLocType2((short) 1);
+ } else if (param.getBarcode().startsWith("13")) {
+ locTypeDto.setLocType2((short) 2);
+ } else if (param.getBarcode().startsWith("16")) {
+ locTypeDto.setLocType2((short) 3);
+ } else {
+ throw new CoolException("鏈煡鎵樼洏鐮佽鍒�");
+ }
+
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast == null) {
+ throw new CoolException(param.getBarcode() + "鎵樼洏锛屼换鍔′笉瀛樺湪");
+ }
+
+ if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
+ StartupDto dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ return dto;
+ }
+
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
+ throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟涓嶅睘浜庢嫞閫夌洏鐐�");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (wrkDetls.isEmpty()) {
+ throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝宸ヤ綔鏄庣粏涓嶅瓨鍦�");
+ }
+
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
+
+ int ioType = wrkMast.getIoType() - 50; // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+
+ StartupDto dto = commonService.getLocNo(ioType, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+ }
+
+ Date now = new Date();
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setModiTime(now);
+ wrkMast.setUpdMk("");//鍏佽鍐嶆绉诲簱
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ if (!locMast.getLocSts().equals("O")) {
+ throw new CoolException(locMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬绌哄簱浣�");
+ }
+
+ locMast.setLocSts("Q");
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ if (!sourceLocMast.getLocSts().equals("P")) {
+ throw new CoolException(sourceLocMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬P.鎷ｆ枡鐩樼偣鍑哄簱");
+ }
+
+ //鑾峰彇婧愬簱瀛樹俊鎭苟杩佺Щ鑷虫柊搴撲綅
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", sourceLocMast.getLocNo()));
+ if (locDetls.isEmpty()) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
+ for (LocDetl locDetl : locDetls) {
+ locDetl.setLocNo(wrkMast.getLocNo());
+ locDetl.setModiTime(new Date());
+ if (!locDetlService.insert(locDetl)) {
+ throw new CoolException("杩佺Щ宸ヤ綔鏄庣粏妗ｅけ璐�");
+ }
+ }
+
+ //娓呯┖婧愬簱浣嶄俊鎭�
+ // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocMast.getLocNo()))) {
+ throw new CoolException("娓呯┖婧愬簱瀛樹俊鎭け璐�");
+ }
+
+ // 淇敼婧愬簱浣嶇姸鎬� P ===>> O
+ if (sourceLocMast.getLocSts().equals("P")) {
+ sourceLocMast.setLocSts("O");
+ sourceLocMast.setBarcode("");
+ sourceLocMast.setModiTime(now);
+ sourceLocMast.setIoTime(now);
+ if (!locMastService.updateById(sourceLocMast)) {
+ throw new CoolException("淇敼婧愬簱浣嶇姸鎬佸け璐�");
+ }
+ }
+
+ return dto;
}
/**
@@ -160,8 +325,26 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,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());
+// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
+
+ //TODO 娴嬭瘯
+// StartupDto dto = new StartupDto();
+// dto.setCrnNo(1);
+// dto.setSourceStaNo(devpNo);
+// dto.setStaNo(103);
+// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
+// dto.setLocNo(locMastxx.getLocNo());
+// dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
+
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -170,7 +353,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(30D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -185,6 +368,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("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -202,31 +387,25 @@
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(dto.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)){
+ 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;
}
@@ -236,7 +415,9 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+
+ StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -266,19 +447,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
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;
}
--
Gitblit v1.9.1