From 322e78c971769c8417810ac0dc4cdad065d40d3f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 16:21:30 +0800
Subject: [PATCH] 入出库结果上报
---
src/main/java/com/zy/common/web/WcsController.java | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0fb2cc6..fccbe80 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -17,6 +17,8 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.common.web.param.ChangeLocParam;
+import com.zy.common.web.param.ReportParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -207,7 +209,7 @@
if (Cools.isEmpty(staDesc)){
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
}
- if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
+ if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104)){
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -258,8 +260,8 @@
@ResponseBody
@Transactional
public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ if ((param.isEmptyMk() && param.isFullPlt()) || (!param.isFullPlt() && !param.isEmptyMk())) {
+ return R.error("绌烘墭/婊℃墭淇″彿涓嶈兘鍚屾椂涓簍rue/false");
}
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
@@ -327,7 +329,10 @@
}
Date now = new Date();
- if (param.getIoType() == 107) {//鐩樼偣鍐嶅叆搴�
+ /**
+ * 姝ゅ瀛樺湪闂 濡傜‘瀹為渶瑕佺敤姝ゆ帴鍙� 璇锋牴鎹疄闄呮儏鍐典慨鏀�
+ */
+ if (param.isFullPlt()) {//鐩樼偣鍐嶅叆搴�
try{
// 妫�绱㈠簱浣�
List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
@@ -406,22 +411,22 @@
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ if ((param.isEmptyMk() && param.isFullPlt()) || (!param.isFullPlt() && !param.isEmptyMk())) {
+ return R.error("绌烘墭/婊℃墭淇″彿涓嶈兘鍚屾椂涓簍rue/false");
}
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .in("io_type", 103,53,107,57)
+ .in("io_type", 103,53,107,57,104,54)
.eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
return R.ok(locNo3);
}else {
List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
+ if (param.isFullPlt()) {
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
@@ -452,22 +457,66 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
- switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
- assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
- break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
- break;
- default:
- break;
+ if (param.isFullPlt()) {
+ assert waitPakins != null;
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ }
+ if (param.isEmptyMk()){
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
}
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
+ }
+
+ /**
+ * WCS涓婃姤鎺ュ彛
+ * @param param
+ * @return
+ */
+ @PostMapping("/openapi/report")
+ public synchronized R report(@RequestBody ReportParam param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ if (Cools.isEmpty(param.getSuperTaskNo())){
+ return R.error("WMS宸ヤ綔鍙蜂负绌�");
+ }
+ workService.reportHandler(param);
+ return R.ok();
+ }
+
+ @RequestMapping("/openapi/change/loc")
+ public synchronized R changeLoc(@RequestBody ChangeLocParam param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ if (Cools.isEmpty(param.getLocNo())){
+ return R.error("绉诲簱鐨勫簱浣嶅彿涓虹┖");
+ }
+ StartupDto dto = commonService.changeLocNo(param);
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(dto.getWorkNo());
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L);
+ wrkMast.setIoPri(15D);
+ wrkMast.setIoType(11);
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceLocNo(param.getLocNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歂
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ return wrkMastService.insert(wrkMast) ? R.ok(dto) : R.error("绉诲簱澶辫触");
}
@PostMapping("/auto/emptyIn/v1")
@@ -528,7 +577,21 @@
// 妫�绱㈠簱浣�
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, matnrs.size() > 1);
+ boolean mixtrue =false;
+
+ if (matnrs.size() == 1 && batchs.size() == 1) {
+
+ }else if(matnrs.size() > 1 && batchs.size() == 1) {
+ mixtrue = true;
+ }else if(matnrs.size() == 1 && batchs.size() > 1) {
+ mixtrue = true;
+ }else if(matnrs.size() > 1 && batchs.size() > 1) {
+ mixtrue = true;
+ }
+ StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto, mixtrue);
+ if (Cools.isEmpty(dto)){
+ throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
--
Gitblit v1.9.1