From 21e9b4b7d15e10cec7c8ad0b14006f225e16de1c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 09:24:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastSplitTwinInItHandler.java | 107 ++++++++++++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastSplitTwinInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastSplitTwinInItHandler.java
index 8f879a8..722738b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastSplitTwinInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastSplitTwinInItHandler.java
@@ -1,13 +1,12 @@
package com.zy.asrs.task.handler;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastSta;
-import com.zy.asrs.service.WrkMastStaService;
+import com.zy.asrs.entity.WrkMastSplitTwin;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.WrkMastSplitTwinService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.LocAndStaCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,61 +23,67 @@
@Transactional
public class WrkMastSplitTwinInItHandler extends AbstractHandler<String> {
@Autowired
- private WrkMastStaService wrkMastStaService;
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+ @Autowired
+ private WrkMastService wrkMastService;
- public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
+ public ReturnT<String> start(WrkMastSplitTwin wrkMastSplitTwin) { //鍙栬揣浠诲姟瀹屾垚 鏀捐揣
try {
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
- if (!Cools.isEmpty(wrkMastSta)){
- return SUCCESS;
- }
- switch (type){
- case 13://鍑� 3锛氬彇鏀�
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
- wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaService.insert(wrkMastSta1);
- }
- break;
- case 21://1:鍙栵紙鍙犵洏锛�
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(1);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaService.insert(wrkMastSta1);
- };
- break;
- case 22://2锛氭斁(鎷嗙洏)
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaService.insert(wrkMastSta1);
- };
- break;
- case 23://3锛氭弧鍙�
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(5);
- wrkMastStaService.insert(wrkMastSta1);
- }
- default:
- return SUCCESS;
- }
+ Date now = new Date();
+ WrkMastSplitTwin wrkMastSplitTwinNew = new WrkMastSplitTwin(wrkMastSplitTwin);
+ wrkMastSplitTwin.setWrkSts(4);//宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ wrkMastSplitTwin.setUpdateTime(now);
+ wrkMastSplitTwinService.updateById(wrkMastSplitTwin);
+
+ wrkMastSplitTwinNew.setCreateTime(now);
+ wrkMastSplitTwinNew.setUpdateTime(now);
+ wrkMastSplitTwinNew.setWrkSts(0);//宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ wrkMastSplitTwinNew.setWrkType(2);//宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚
+ wrkMastSplitTwinService.insert(wrkMastSplitTwinNew);
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ log.error("鍓嶅悗鍙屽伐浣嶆媶鍒嗗爢鍨涙満鎵ц浣滀笟鐢熸垚寮傚父锛侊紒锛�"+e.getMessage());
return FAIL;
}
return SUCCESS;
}
- public boolean fullKM(WrkMast wrkMast){
- if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
- return true;
+ public ReturnT<String> start(WrkMastSplitTwin wrkMastSplitTwin,WrkMast wrkMast,Integer crnStation) { //鍙栬揣浠诲姟瀹屾垚 鏀捐揣
+ try {
+ Date now = new Date();
+ WrkMastSplitTwin wrkMastSplitTwinNew = new WrkMastSplitTwin(wrkMast,crnStation,now);
+ switch (wrkMastSplitTwin.getIoType()){
+ case 1:
+ wrkMastSplitTwinNew.setWrkStart(wrkMast.getStaNo().toString());
+ wrkMastSplitTwinNew.setWrkEnd(wrkMast.getLocNo());
+ break;
+ case 2:
+ wrkMastSplitTwinNew.setWrkStart(wrkMast.getSourceLocNo());
+ wrkMastSplitTwinNew.setWrkEnd(wrkMast.getIoType()==11? wrkMast.getLocNo():wrkMast.getSourceStaNo().toString());
+ break;
+ default:
+ log.error("鍓嶅悗鍙屽伐浣嶆媶鍒嗗爢鍨涙満鎵ц浣滀笟鐢熸垚寮傚父锛侊紒锛�====>宸ヤ綔鍙�={},浠诲姟绫诲瀷={},浠诲姟绫诲瀷寮傚父锛�",wrkMastSplitTwin.getWrkNo(),wrkMastSplitTwin.getIoType$());
+ return FAIL;
+ }
+ wrkMastSplitTwinNew.setStartRow(LocAndStaCodeUtil.getRow(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setStartBay(LocAndStaCodeUtil.getBay(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setStartLev(LocAndStaCodeUtil.getLev(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setEndRow(LocAndStaCodeUtil.getRow(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setEndBay(LocAndStaCodeUtil.getBay(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setEndLev(LocAndStaCodeUtil.getLev(wrkMastSplitTwin.getWrkStart()));
+ wrkMastSplitTwinNew.setWrkType(1);//宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚
+ wrkMastSplitTwinNew.setIoType(wrkMastSplitTwin.getIoType());//浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱
+ wrkMastSplitTwinNew.setWrkSts(0);//宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ wrkMastSplitTwinService.insert(wrkMastSplitTwinNew);
+
+ wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
+ wrkMast.setAppeTime(now);
+ wrkMastService.updateById(wrkMast);
+ }catch (Exception e){
+ log.error("鍓嶅悗鍙屽伐浣嶆媶鍒嗗爢鍨涙満鎵ц浣滀笟鐢熸垚寮傚父锛侊紒锛�"+e.getMessage());
+ return FAIL;
}
- return false;
+ return SUCCESS;
}
+
}
--
Gitblit v1.9.1