From 5c50696e9514c45960e08e84ce8c7ccec52a60e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 31 五月 2023 09:28:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 4 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 25 +++++++++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 5 +-
src/main/java/com/zy/common/web/WcsController.java | 34 +++++++++++++---
src/main/java/com/zy/asrs/task/StandingScheduler.java | 4 +-
src/main/resources/application.yml | 8 ++--
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 10 +++--
9 files changed, 69 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8d87b23..7252acf 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -221,7 +221,7 @@
@RequestBody(required = false) CombParam param,
HttpServletRequest request) {
log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤"+appkey+param);
- auth(appkey, param, request);
+ auth("ea1f0459efc02a79f046f982767939ae", param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index b55974a..667a7a1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -525,8 +525,8 @@
// }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
}else if(sourceLoc.getPackStatus()!=3){
- if(sourceLoc.getLocType1()!=loc.getLocType1()){
- throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+ if(sourceLoc.getLocType1()==loc.getLocType1()){
+ throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬬浉鍚�");
}
}
Date now = new Date();
diff --git a/src/main/java/com/zy/asrs/task/StandingScheduler.java b/src/main/java/com/zy/asrs/task/StandingScheduler.java
index c2aac84..e038dda 100644
--- a/src/main/java/com/zy/asrs/task/StandingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/StandingScheduler.java
@@ -20,9 +20,9 @@
/**
*
*/
- @Scheduled(cron = "0/60 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
private void execute() {
- if (confirmDeep) return;
+ //if (confirmDeep) return;
ReturnT<String> result = standingHandler.start();
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index e92e50e..f22ae5b 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -72,7 +72,7 @@
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
.eq("barcode",locDetl.getMatnr())
- .eq("status",4)
+ .eq("status",4)//瀹屾垚娴嬭瘯
);
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
@@ -230,7 +230,7 @@
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(1);
wrkMast.setSourceStaNo(203); // 婧愮珯
- wrkMast.setStaNo(205); // 鐩爣绔� 2鍙峰爢鍨涙満鍏ュ簱绔�
+ wrkMast.setStaNo(206); // 鐩爣绔� 2鍙峰爢鍨涙満鍏ュ簱绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
index b0fc8b7..255b0c3 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -67,7 +67,7 @@
.eq("pack_status", 5)
.eq("freeze",0));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
- //闈欑疆瀹屾垚鍑哄簱绔�104
+ //闈欑疆瀹屾垚鍑哄簱绔�103
for(LocMast locMast : locMasts){
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
if (Cools.isEmpty(locDetl) || Cools.isEmpty(locDetl.getMatnr())){
@@ -97,7 +97,7 @@
}else {
wrkMast.setSourceStaNo(210); // 婧愮珯
}
- wrkMast.setStaNo(104); // 鐩爣绔�
+ wrkMast.setStaNo(103); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -126,7 +126,6 @@
locMast.setLocSts("R");
locMast.setModiTime(now);
locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
-
CombParam combParam = new CombParam();
combParam.setPackNo(mat.getMatnr());
combParam.setLocNo(locMast.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 508937f..30cbf19 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -161,14 +161,15 @@
locMast.setPackStatus(0);
}
}else {
+ WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
locMast.setPackStatus(5);
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",wrkDetl1.getMatnr())
.eq("status",4)
);
testMast.setStatus(5);
testMast.setModiTime(new Date());
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",locMast.getBarcode()).eq("status",4))){
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode",wrkDetl1.getMatnr()).eq("status",4))){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
@@ -176,6 +177,7 @@
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetls.get(0).getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setBarcode(wrkMast.getBarcode());
if (locMast.getCrnNo()==1){
combParam.setPackSts(0);
combParam.setStepSts(2);
@@ -474,6 +476,25 @@
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ }else{
+ //2.鍑哄簱瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetls101.get(0).getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setBarcode(wrkMast.getBarcode());
+ //鐩爣绔�206鍑哄簱
+ if(wrkMast.getStaNo()==206){
+ combParam.setPackSts(1);//OK
+ combParam.setStepSts(7);//娴嬭瘯搴撳嚭搴撳畬鎴�
+ }else if(wrkMast.getStaNo()==204){//NG 鍑哄簱
+ combParam.setPackSts(2);//NG
+ combParam.setStepSts(8);//NG鍑哄簱瀹屾垚
+ }else if(wrkMast.getStaNo()==103){//鐩爣绔�103鍑哄簱
+ combParam.setPackSts(1);//OK
+ combParam.setStepSts(6);//闈欑疆搴撳嚭搴撳畬鎴�
+ }
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
}
break;
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 7cc409d..65ff408 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -18,10 +18,10 @@
private ApiLogService apiLogService = new ApiLogServiceImpl();
public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
- if (true){
- System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
- return SUCCESS;
- }
+// if (true){
+// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+// return SUCCESS;
+// }
if(combParam != null){
String response = "";
boolean success = false;
@@ -35,7 +35,9 @@
.setJson(JSON.toJSONString(combParam))
.build()
.doPost();
+ System.out.println("response:"+response);
JSONObject jsonObject = JSON.parseObject(response);
+
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5f0a27d..41456b6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -68,14 +68,28 @@
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())) {
- return R.error("packNo涓嶈兘涓虹┖");
+ testMast11= testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("user_id",param.getBarcode())//鏌ユ墭鐩樼爜
+ .eq("status",4)); //瀹屾垚娴嬭瘯
+ logs=false;
}
Date now = new Date();
if (true){
try{
- Mat mat = matService.selectByMatnr(param.getPackNo());
+ 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());
}
@@ -203,13 +217,13 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("barcode", wrkMast.getBarcode()));
-
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
if (Cools.isEmpty(testMast)){
//鐢熸垚娴嬭瘯妗�
testMast=new TestMast();
testMast.setChannel(locMast.getChannel());
- testMast.setUserId(locMast.getLocNo());
+ testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
testMast.setStatus(1);
testMast.setBarcode(wrkDetl.getMatnr());
testMast.setLocNo(locMast.getLocNo());
@@ -219,7 +233,13 @@
throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
}
}else {
- throw new CoolException(wrkDetl.getMatnr()+"宸插瓨鍦ㄦ祴璇曟。");
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setChannel(locMast.getChannel());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setAppeTime(now);
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
+ throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
+ }
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4282afd..47841c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -55,13 +55,13 @@
# MES绯荤粺
mes:
# 鏄惁寮�鍚笂鎶�
- start: false
+ start: true
# MES绯荤粺ip
- url: 172.28.15.251:7899
+ url: 10.12.20.12:5001
# 鍏ュ簱涓婃姤
- inPath: mes-pm/in/stock/condition/warehousing
+ inPath: api/InterFace/get_InterFace_TestStorage
# 鍑哄簱涓婃姤
- outPath: mes-pm/in/stock/condition/exWarehouse
+ outPath: api/InterFace/get_InterFace_TestStorage
# 鍏呮斁鐢垫祴璇曢�氶亾
channel:
--
Gitblit v1.9.1