From c33901750d296f75180f6051fbb743738ffcae7e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 08:46:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 4 ++--
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++++++++-----------------
src/main/java/com/zy/asrs/task/OverYearLogScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 9 ++++++---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++---
src/main/resources/application.yml | 2 +-
6 files changed, 31 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 77a711b..47b41f3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -232,23 +232,23 @@
return R.ok();
}
- @PostMapping("/rpc/pakOut/auth/v1")
- @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
- public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request) {
-
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- //鍑哄簱寮�濮�
- openService.combPackOut(param);
-
- Map<String, Boolean> map = new HashMap<>();
- map.put("isComplete", true);
- return R.ok(map);
- }
+// @PostMapping("/rpc/pakOut/auth/v1")
+// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+// public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) CombParam param,
+// HttpServletRequest request) {
+//
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// //鍑哄簱寮�濮�
+// openService.combPackOut(param);
+//
+// Map<String, Boolean> map = new HashMap<>();
+// map.put("isComplete", true);
+// return R.ok(map);
+// }
// @PostMapping("/rpv/infoReview/auth/v1")
// @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
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 6182266..5334814 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,8 +573,8 @@
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.getSettingTimes())){
+// throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
}else if (Cools.isEmpty(param.getRequestTime())){
throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
}
@@ -612,6 +612,7 @@
if (!matService.insert(matNew)){
throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ鑷姩鐢熸垚澶辫触");
}
+ mat=matNew;
// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
@@ -627,7 +628,7 @@
waitPakin.setAppeTime(new Date());
waitPakin.setModiUser(null);
waitPakin.setModiTime(new Date());
- waitPakin.setDeadWarn(param.getSettingTimes());
+ waitPakin.setDeadWarn(mat.getDeadWarn());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index 95a8a29..c41beca 100644
--- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
@@ -19,7 +19,7 @@
@Autowired
private OverYearLogHandler overYearLogHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
ReturnT<String> returnT = overYearLogHandler.start();
if (!returnT.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 7ba0c1e..b4c5dd4 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -237,12 +237,12 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
- locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
+// locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(6);
+ combParam.setPackSts(locMast.getPackStatus());
combParam.setRequestTime(DateUtils.convert(new Date()));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
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 dee9a46..7ec9b28 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -44,7 +44,7 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
- private ApiLogService apiLogService;
+ private MatService matService;
@Autowired
private CommonService commonService;
@Autowired
@@ -64,11 +64,12 @@
.eq("fire_status", 0)
.eq("loc_sts", "F")
.eq("loc_type1",(short)2)
- .eq("pack_status", 6));
+ .eq("pack_status", 5));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (Cools.isEmpty(locDetl)){
log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁鏄庣粏");
} else if (Cools.isEmpty(locDetl.getDeadWarn())){
@@ -77,7 +78,9 @@
log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
} else if (Cools.isEmpty(locMast.getBarcode())){
log.error("搴撲綅:"+locMast.getLocNo()+"Pack鐮佷负绌�");
- } else if (now.getTime()-locMast.getModiTime().getTime() >= locDetl.getDeadWarn()*60*1000){
+ } else if (Cools.isEmpty(mat)){
+ log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
+ } else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f51b119..ac9a8e8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.13:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://192.168.6.2:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1