From a0d7fdd303b3f76131d77162a7dd2c7db60d80ae Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 19:12:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index d872d34..2d7f723 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.entity.param.BalconyWrkMastParam;
import com.zy.asrs.entity.param.TrussCombParam;
import com.zy.asrs.service.*;
@@ -21,7 +22,9 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.security.smartcardio.SunPCSC;
+import java.util.Date;
import java.util.List;
/**
@@ -46,7 +49,7 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private OrderService orderService;
+ private WrkMastStaService wrkMastStaService;
@Value("${srHangJia.url}")
private String srHangJiaUrl;
@@ -62,7 +65,8 @@
return FAIL;
}
BasDevp basDevp131 = basDevpService.selectById(131);
- if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y") || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000)){
+ if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y")
+ || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000) || basDevp131.getReportSign()!=0){
return FAIL;
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
@@ -71,7 +75,12 @@
return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (Cools.isEmpty(wrkDetls) || wrkDetls.size()!=1){
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
+ return FAIL;
+ }
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ if (Cools.isEmpty(wrkDetl) || Cools.isEmpty(wrkDetl.getOrigin()) || Cools.isEmpty(wrkDetl.getBatch())
+ || Cools.isEmpty(wrkDetl.getBrand())){
return FAIL;
}
BasDevp basDevp118 = basDevpService.selectById(118);
@@ -83,25 +92,41 @@
return FAIL;
}
- if (basDevp118.getLoading().equals("Y")){
+ if (basDevp118.getLoading().equals("Y") && basDevp118.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
-// TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
-// try{
-// ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
-// if (success.getCode()!=200){
-// throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
-// }
-// } catch (Exception e){
-// throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
-// }
- }else {
- //鐢熸垚鎷嗙洏浠诲姟
+ TrussCombParam trussCombParam = new TrussCombParam(wrkDetl);
+ try{
+ ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
+ if (success.getCode()!=200){
+ log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
+ return FAIL;
+ }else {
+ wrkMast.setSheetNo("3");
+ wrkMastService.updateById(wrkMast);
+ basDevp.setReportSign(3);
+ basDevpService.updateById(basDevp);
+ basDevp118.setReportSign(3);
+ basDevpService.updateById(basDevp118);
+ }
+ return SUCCESS;
+ } catch (Exception e){
+ log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
+ return FAIL;
+ }
+ }else if (!basDevp118.getLoading().equals("Y") ){
+ WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNo + 19999L));
+ if (Cools.isEmpty(wrkMastSta)){
+ //鐢熸垚鎷嗙洏浠诲姟
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNo);
+ wrkMastSta1.setType(2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setWrkType(2); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ wrkMastStaService.insert(wrkMastSta1);
+ }
+ return SUCCESS;
}
-
-//
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ log.error("閫�璐у叆搴撴満姊拌噦鍙栬揣寮傚父锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
@@ -119,7 +144,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getString("result").equals("Y")) {
+ if (jsonObject.getInteger("Code").equals(200)) {
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+srHangJiaUrl+erpPath, JSON.toJSONString(combParam), response);
--
Gitblit v1.9.1