From 741d8fea137649dd5a45d94f2573ca1bb8297c1f Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 10:27:50 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index 3c977f9..c1e280b 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -7,8 +7,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.LedErrorAreaType;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -42,7 +44,7 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
- private StaDescService staDescService;
+ private RgvOneSignMapper rgvOneSignMapper;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -52,6 +54,7 @@
private String erpUrl = "10.10.11.100:8580";
// @Value("${srHangJia.reportOutPath}")
private String reportOutPath = "mes/wms-service/inStorageEndReport";
+ private String reportOutTrayCompound = "mes/wms-service/trayCompound";
public ReturnT<String> start(int staNo) {
try{
@@ -119,6 +122,97 @@
return FAIL;
}
+ public ReturnT<String> start2(int staNo) {
+ try{
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
+ if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
+ return FAIL;
+ }
+
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) {
+ return FAIL;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (!staProtocol.isLoading() && staProtocol.getWorkNo()!=0){
+ rgvOneSign.setRgvOneSign(0);
+ rgvOneSignMapper.updateById(rgvOneSign);
+ }
+ }catch (Exception e){
+ log.error("寮傚父3锛侊紒锛�"+e);
+ return FAIL;
+ }
+ return FAIL;
+ }
+
+ public ReturnT<String> start3(int staNo) {
+ try{
+ Date now = new Date();
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (Cools.isEmpty(basDevp) || basDevp.getReportSign()==1){
+ return FAIL;
+ }
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) {
+ return FAIL;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
+ if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
+ if (Cools.isEmpty(wrkMast)) return FAIL;
+ if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) return FAIL;
+ if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo().equals("2")) return FAIL;
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ WrkDetl wrkDetl = null;
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
+// return FAIL;
+ wrkDetl = new WrkDetl();
+ wrkDetl.setMatnr("1");
+ wrkDetl.setBatch("1");
+ wrkDetl.setModel("1");
+ wrkDetl.setSpecs("1");
+ wrkDetl.setWeight(1.0);
+ } else {
+ wrkDetl = wrkDetls.get(0);
+ }
+ log.error("1妤肩炕杞崐鎴愬搧鍊掓枡淇℃伅涓婁紶锛岀珯鐐圭姸鎬侊細"+JSON.toJSONString(staProtocol));
+ log.error("1妤肩炕杞崐鎴愬搧鍊掓枡淇℃伅涓婁紶锛屽伐浣滃彿锛�"+JSON.toJSONString(wrkMast));
+ StaEscalationParam staEscalationParam = new StaEscalationParam();
+ staEscalationParam.setDevNo(staNo);
+ staEscalationParam.setIoType(wrkMast.getIoTypeMes$());
+ staEscalationParam.setMatnr(wrkDetl.getMatnr());
+ staEscalationParam.setBatch(wrkDetl.getBatch());
+ staEscalationParam.setOrderNo(wrkDetl.getSpecs());
+ staEscalationParam.setTaskNo(wrkDetl.getModel());
+ staEscalationParam.setWeight(wrkDetl.getWeight());
+ staEscalationParam.setWrkno(Cools.isEmpty(wrkDetl.getWrkNo()) ? "0":wrkDetl.getWrkNo().toString());
+ ReturnT<String> result = postMesData(reportOutTrayCompound,staEscalationParam);
+ if (result.getCode()==200){
+ wrkMast.setSheetNo("2");
+ wrkMastService.updateById(wrkMast);
+ basDevp.setReportSign(1);
+ basDevpService.updateById(basDevp);
+ return SUCCESS;
+ } else {
+ LedErrorThreadUtil.ledErrorThread("1妤肩炕杞崐鎴愬搧鍊掓枡淇℃伅涓婁紶!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+ log.error("1妤肩炕杞崐鎴愬搧鍊掓枡淇℃伅涓婁紶锛佺珯鐐瑰彿锛�"+staNo);
+ }
+ }
+ }
+ }catch (Exception e){
+ LedErrorThreadUtil.ledErrorThread("缈昏浆涓婁紶寮傚父!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+ log.error("寮傚父4锛侊紒锛�"+e);
+ return FAIL;
+ }
+ return FAIL;
+ }
+
private ReturnT<String> postMesData(String erpPath,Object combParam){
if(combParam != null){
String response = "";
--
Gitblit v1.9.1