From 5acac40bea6d214d256332f26119179956514699 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:14:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 14 +++++--
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 42 +--------------------
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 -
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 43 +--------------------
src/main/java/com/zy/asrs/task/MoveLocScheduler.java | 2
6 files changed, 17 insertions(+), 89 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6b9793f..4ea809c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -264,7 +264,7 @@
if (testMast.getStatus() == 3) {
return R.ok();
} else if (testMast.getStatus() == 2) {
- return R.error("绛夊緟鍛樺伐鎿嶄綔");
+ return R.error("绛夊緟鍛樺伐鎿嶄綔...");
}
return R.error();
}
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 fd11836..4c4ff23 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -676,8 +676,7 @@
.eq("loc_no", testMast.getLocNo())
.eq("barcode", testMast.getBarcode())
.eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4))){
+ .eq("channel",locMast.getChannel().toString()))){
throw new CoolException("鏇存柊testMast澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/task/MoveLocScheduler.java b/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
index 0ad6b77..4b3fea3 100644
--- a/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MoveLocScheduler.java
@@ -27,7 +27,7 @@
ReturnT<String> result = moveLocHandler.start();
if (!result.isSuccess()) {
-// log.error("娴嬭瘯瀹屾垚绉诲簱澶辫触");
+ log.error("娴嬭瘯瀹屾垚绉诲簱澶辫触");
}
}
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 30670f1..f7a0697 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -35,13 +36,18 @@
@Autowired
private WorkService workService;
+ @Value("${channel.equipmentRow}")
+ private Integer equipmentRow; //娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
+ @Value("${channel.quietRow}")
+ private Integer quietRow; //闈欑疆搴撲綅鎵�鍦ㄦ帓鍙�
+
@Transactional
public ReturnT<String> start() {
try {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
.eq("pack_status", 3)
- .eq("row1", 2)
+ .eq("row1", equipmentRow)
.eq("loc_type1", (short) 1)
.eq("fire_status",0)
);
@@ -55,14 +61,14 @@
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
- LocMast targetLocNo = locMastService.queryFreeLocMast(1,(short)2);
+ LocMast targetLocNo = locMastService.queryFreeLocMast(quietRow,(short)2);
if (Cools.isEmpty(targetLocNo)){
- targetLocNo=locMastService.queryFreeLocMast(2,(short)2);
+ targetLocNo=locMastService.queryFreeLocMast(equipmentRow,(short)2);
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
}else {
- log.error("娌℃湁绌哄簱浣�");
+ log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
}
}else if (testMast.getStatus()!=4) {
log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
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 7b3c8eb..0cfdb7f 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
@@ -122,7 +123,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(6);
combParam.setRequestTime(DateUtils.convert(new Date()));
- postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
@@ -139,46 +140,6 @@
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
- private ReturnT<String> postMesData(String mesPath,Object combParam){
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(mesUrl)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- // MesConstant.URL + MesConstant.PAKIN_URL,
- apiLogService.save(
- "涓婃姤mes绯荤粺",
- mesUrl + mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
}
return SUCCESS;
}
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 03033b9..c16f230 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -333,7 +334,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(5);
combParam.setRequestTime(DateUtils.convert(new Date()));
- postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -452,45 +453,6 @@
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
- private ReturnT<String> postMesData(String mesPath,Object combParam){
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(mesUrl)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "涓婃姤mes绯荤粺",
- mesUrl + mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
}
return SUCCESS;
}
--
Gitblit v1.9.1