From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 157 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 123 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3a6f58f..8e622ae 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -49,11 +49,13 @@
private LocDetlService locDetlService;
@Autowired
private TestMastService testMastService;
+ @Autowired
+ private MatService matService;
- @Value("mes.url")
+ @Value("${mes.url}")
private String mesUrl;
- @Value("mes.inPath")
+ @Value("${mes.inPath}")
private String inpath;
@PostMapping("/pakin/loc/v1")
@@ -66,16 +68,73 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ boolean logs=true;
+ TestMast testMast11=new TestMast();
+ //濡傛灉pack鐮佷负绌猴紝鏌ユ祴璇曡〃
+ if (Cools.isEmpty(param.getPackNo())) {
+ testMast11= testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("user_id",param.getBarcode())//鏌ユ墭鐩樼爜
+ .eq("status",4)); //瀹屾垚娴嬭瘯
+ logs=false;
+ }else{
+ LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("matnr",param.getPackNo())
+ .or()
+ .eq("zpallet",param.getBarcode()));
+ if(!Cools.isEmpty(locDetl)){
+ return R.error("PACK鐮佸湪搴擄紒锛侊紒锛�");
+ }
+
+ }
+ Date now = new Date();
+ if (true){
+ try{
+ Mat mat=new Mat();
+ if(logs){
+ mat = matService.selectByMatnr(param.getPackNo());
+ }else {
+ mat = matService.selectByMatnr(testMast11.getBarcode());
+ }
+
+ 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);
}
@@ -116,7 +175,7 @@
}
/**
- * 鍏ㄦ澘鍏ュ簱
+ * 鍏ㄦ澘鍏ュ簱
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
@@ -152,8 +211,11 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ // 鐩爣搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
- waitPakins.forEach(waitPakin -> {
+ for (WaitPakin waitPakin: waitPakins) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -164,7 +226,49 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- });
+
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
+ if (Cools.isEmpty(testMast)){
+ //鐢熸垚娴嬭瘯妗�
+ testMast=new TestMast();
+ //鍏ュ緟娴嬪簱浣嶉�氶亾璁句负0
+ if(locMast.getChannel()==null) {
+ testMast.setChannel(0);//閫氶亾璁句负0
+ }else{
+ testMast.setChannel(locMast.getChannel());
+ }
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ 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 if(wrkMast.getStaNo()==209){
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ testMast.setAppeTime(now);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
+ throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
+ }
+ }else {
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setChannel(locMast.getChannel());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setStatus(1);
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
+ testMast.setAppeTime(now);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
+ throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
+ }
+ }
+
+
+ }
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
@@ -182,41 +286,26 @@
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{
- //1.鎵爜涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ if (locMast.getRow1()<2){
+ //1.鎵爜涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(waitPakins.get(0).getMatnr());
+ combParam.setBarcode(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()+"鐩爣搴撲綅宸茶鍗犵敤");
- }
- 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(wrkMast.getBarcode());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setModiTime(now);
- testMast.setAppeTime(now);
- if (!testMastService.insert(testMast)){
- throw new CoolException(wrkMast.getBarcode()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
- }
- }else {
- throw new CoolException(wrkMast.getBarcode()+"宸插瓨鍦ㄦ祴璇曟。");
}
return dto;
--
Gitblit v1.9.1