From 540a4f2b0b03b60fd94bdb9067ef8b26d23967c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 08 九月 2023 08:42:23 +0800
Subject: [PATCH] #
---
/dev/null | 34 -----------------
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++----
src/main/java/com/zy/common/web/WcsController.java | 4 +-
src/main/java/com/zy/asrs/task/StandingScheduler.java | 2
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 2
6 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index af59cb4..3ea8ace 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -678,14 +678,14 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
log.error("鐢宠娴嬭瘯澶辫触");
}
- //3.寮�濮嬫祴璇曚笂鎶�
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(3);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// //3.寮�濮嬫祴璇曚笂鎶�
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(testMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(0);
+// combParam.setStepSts(3);
+// combParam.setRequestTime(DateUtils.convert(now));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/StandingScheduler.java b/src/main/java/com/zy/asrs/task/StandingScheduler.java
index e038dda..d456e13 100644
--- a/src/main/java/com/zy/asrs/task/StandingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/StandingScheduler.java
@@ -20,7 +20,7 @@
/**
*
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
private void execute() {
//if (confirmDeep) return;
diff --git a/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java b/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java
deleted file mode 100644
index 57ed288..0000000
--- a/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.StarUpTestPACKHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class StartUpTestPACKScheduler {
-
- @Value("${wcs-slave.doubleDeep}")
- private boolean confirmDeep;
- @Autowired
- private StarUpTestPACKHandler starUpTestPACKHandler;
-
- /**
- *
- */
- //@Scheduled(cron = "0/3 * * * * ? ")
- private void execute() {
- if (confirmDeep) return;
-
- ReturnT<String> result = starUpTestPACKHandler.start();
- if (!result.isSuccess()) {
- log.error("鐢宠娴嬭瘯澶辫触");
- }
- }
-
-}
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 f2f97af..d5a1f4c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -160,6 +160,10 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ //鍏ユ祴璇曞簱浣嶆椂缁欏簱浣嶆祴璇曠姸鎬佷负1寰呮祴
+ if(!Cools.isEmpty(locMast.getChannel())){
+ locMast.setPackStatus(1);//寰呮祴
+ }
if (locMast.getCrnNo()==1){
if (locMast.getLocType1()==1){
locMast.setPackStatus(1);
@@ -383,7 +387,6 @@
}else {
throw new CoolException("寰呮祴搴撲綅鏃犵墿");
}
-
}else {
//娴嬭瘯搴撲綅杞潤缃簱浣嶅拰NG搴撲綅
if (locMast.getLocType1().equals((short)4)){
@@ -423,18 +426,30 @@
}
if (locMast.getCrnNo()==1 && sign){
- //5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
+ //7.娴嬭瘯搴撲綅杞潤缃簱浣嶅嚭搴撳畬鎴愪笂鎶�
CombParam combParam = new CombParam();
combParam.setPackNo(locDetl.getMatnr());
- combParam.setLocNo(wrkMast.getLocNo());
+ combParam.setLocNo(wrkMast.getSourceLocNo());
+ combParam.setStepSts(7);
if (locMast.getPackStatus()==4){
combParam.setPackSts(2);
}else if (locMast.getPackStatus()==5){
combParam.setPackSts(1);
+ }
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ //5.娴嬭瘯搴撲綅杞潤缃簱浣嶅叆搴撳畬鎴愪笂鎶�
+ combParam.setPackNo(locDetl.getMatnr());
+ combParam.setLocNo(wrkMast.getLocNo());
+ if (locMast.getPackStatus()==4){
+ combParam.setPackSts(2);
+ combParam.setStepSts(5);
+ }else if (locMast.getPackStatus()==5){
+ combParam.setPackSts(1);
+ combParam.setStepSts(8);
}else {
combParam.setPackSts(0);
}
- combParam.setStepSts(5);
combParam.setRequestTime(DateUtils.convert(now));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index c1ee96d..dad036d 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -44,7 +44,7 @@
throw new CoolException("涓婃姤"+name);
}
} catch (Exception e) {
- log.error("涓婃姤澶辫触");
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7f27983..8e622ae 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -52,10 +52,10 @@
@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")
--
Gitblit v1.9.1