From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 142 +++++++++++++++++++++++------------------------
1 files changed, 69 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c334d7a..1f5b686 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -25,9 +25,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -70,6 +67,8 @@
@Value("${mes.inPath}")
private String inpath;
+ @Value("${mes.url}")
+ private String mesUrl;
@Override
@Transactional
@@ -574,57 +573,65 @@
throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
}else if (Cools.isEmpty(param.getPackName())){
throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
- }else if (Cools.isEmpty(param.getSettingTimes())){
- throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
}else if (Cools.isEmpty(param.getRequestTime())){
- throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");//姝ゅ弬鏁板～鍏ョ敓浜ф棩鏈熶竴鏍� 涓嶇敤鍙叧闂�
}
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
-
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
- }
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- java.util.Date date1=null;
- try {
- date1= sdf.parse(param.getRequestTime());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- java.sql.Date requestTime = new java.sql.Date(date1.getTime());
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
-// Mat mat = matService.selectByMatnr(param.getPackName());
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
// }
- WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
- waitPakin.setMatnr(param.getPackName());
- waitPakin.setMaktx(param.getPackName());
- waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(1.0); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setManuDate(requestTime.toString());
- waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(new Date());
- waitPakin.setModiUser(null);
- waitPakin.setModiTime(new Date());
- waitPakin.setDeadWarn(param.getSettingTimes());
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+
+// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
+// int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
+// if (countLoc > 0 || countWrk > 0) {
+// throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+// }else if (countPakin>0){
+// throw new CoolException("閲嶅鐢宠" + param.getPackNo());
+// }
+
+// 鐢熸垚鍏ュ簱閫氱煡妗�
+ Mat mat = matService.selectByMatnr(param.getPackNo());
+ Date now = new Date();
+ if (Cools.isEmpty(mat)) {
+ Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
+ Mat matNew = new Mat();
+ matNew.setTagId(tag.getId());
+ matNew.setMatnr(param.getPackNo());
+ matNew.setMaktx(param.getPackName());
+ matNew.setManuDate(param.getRequestTime());
+ matNew.setDeadWarn(360);//6灏忔椂 360鍒嗛挓
+ matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ matNew.setCreateTime(now);
+ matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ matNew.setUpdateTime(now);
+ if (!matService.insert(matNew)){
+ throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ鑷姩鐢熸垚澶辫触");
+ }
+// mat=matNew;
+// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+// WaitPakin waitPakin = new WaitPakin();
+//// waitPakin.sync(mat);
+// waitPakin.setMatnr(param.getPackName());
+// waitPakin.setMaktx(param.getPackName());
+// waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(1.0); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setManuDate(param.getRequestTime());
+// waitPakin.setAppeUser(null);
+// waitPakin.setAppeTime(new Date());
+// waitPakin.setModiUser(null);
+// waitPakin.setModiTime(new Date());
+// waitPakin.setDeadWarn(mat.getDeadWarn());
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
}
@Override
@Transactional
@@ -651,12 +658,6 @@
throw new CoolException("PACK鐮佷负锛�"+param.getPackNo()+"鐨勮揣鐗╁簱浣嶇姸鎬佷笉鏄�淔鈥�");
}else if (locMast.getFireStatus()!=0){
throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
}else {
Date now = new Date();
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
@@ -715,7 +716,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(7);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
@@ -761,14 +762,9 @@
throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
}
locMast.setPackStatus(2);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(2);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
-
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+
+
throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
}
} else if (Cools.isEmpty(testMast.getStatus())){
@@ -803,12 +799,12 @@
Date date = new Date();
locMast.setPackStatus(3);
locMast.setModiTime(date);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(3);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(3);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
@@ -844,12 +840,12 @@
Date date = new Date();
locMast.setPackStatus(4);
locMast.setModiTime(date);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(4);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(4);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
--
Gitblit v1.9.1