From 4ce0a1b6c7712691a74f76890310f97c48215945 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 25 五月 2023 09:05:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 92 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8fb2c05..5f0a27d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -14,6 +17,7 @@
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +47,16 @@
private WaitPakinService waitPakinService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private TestMastService testMastService;
+ @Autowired
+ private MatService matService;
+
+ @Value("mes.url")
+ private String mesUrl;
+
+ @Value("mes.inPath")
+ private String inpath;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -54,16 +68,50 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+
+ if (Cools.isEmpty(param.getPackNo())) {
+ return R.error("packNo涓嶈兘涓虹┖");
+ }
+ Date now = new Date();
+ if (true){
+ try{
+ Mat mat = matService.selectByMatnr(param.getPackNo());
+ if (Cools.isEmpty(mat)){
+ return R.error("鍟嗗搧淇℃伅妗ｆ鏈煡璇㈠埌pack淇℃伅"+param.getPackNo());
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ int i = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if(i==0){
+ waitPakin.setMatnr(mat.getMatnr());// Pack鐮�
+ waitPakin.setMaktx(mat.getMaktx());
+ waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(1.0); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setManuDate(mat.getManuDate());
+ waitPakin.setAppeUser(null);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(null);
+ waitPakin.setModiTime(now);
+ waitPakin.setDeadWarn(mat.getDeadWarn());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ }catch (Exception e){
+
+ }
+ }
List<WaitPakin> waitPakins = null;
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)) {
+ if (Cools.isEmpty(waitPakins) || waitPakins.size() !=1) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- return R.parse(CodeRes.PICK_600);
+ if (wrkMast != null || waitPakins.size() !=1) {
+ return R.parse("600-閲嶅缁勬墭");
}
return R.parse(CodeRes.NO_COMB_700);
}
@@ -78,11 +126,11 @@
}
}
if (Cools.isEmpty(param.getLocType1())){
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ param.setLocType1((short)1);
}
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
// sourceStaNo.setLocType1(param.getLocType1());
sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
@@ -140,6 +188,9 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ // 鐩爣搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
@@ -151,6 +202,24 @@
wrkDetl.setDeadWarn(waitPakin.getDeadWarn());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("barcode", wrkMast.getBarcode()));
+
+ if (Cools.isEmpty(testMast)){
+ //鐢熸垚娴嬭瘯妗�
+ testMast=new TestMast();
+ testMast.setChannel(locMast.getChannel());
+ testMast.setUserId(locMast.getLocNo());
+ testMast.setStatus(1);
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setModiTime(now);
+ testMast.setAppeTime(now);
+ if (!testMastService.insert(testMast)){
+ throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
+ }
+ }else {
+ throw new CoolException(wrkDetl.getMatnr()+"宸插瓨鍦ㄦ祴璇曟。");
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
@@ -170,16 +239,27 @@
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }else{
+ if (locMast.getRow1()<3){
+ //1.鎵爜涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setPackSts(0);
+ combParam.setStepSts(1);
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ }
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+
return dto;
}
--
Gitblit v1.9.1