From 2bf65500161ae37c120d0d9af8f6d8dd7afdec75 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 16 五月 2023 14:53:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 54 ++++++++++--------------------------------------------
1 files changed, 10 insertions(+), 44 deletions(-)
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..dee9a46 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;
@@ -62,7 +63,8 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 0)
.eq("loc_sts", "F")
- .eq("pack_status", 5));
+ .eq("loc_type1",(short)2)
+ .eq("pack_status", 6));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
@@ -85,8 +87,12 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo(107); // 婧愮珯
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ if (wrkMast.getCrnNo()==1){
+ wrkMast.setSourceStaNo(203); // 婧愮珯
+ }else {
+ wrkMast.setSourceStaNo(210); // 婧愮珯
+ }
wrkMast.setStaNo(104); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -122,7 +128,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 +145,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;
}
--
Gitblit v1.9.1