From 8dfed30b2efa904e82f698fff5ef224a08d9c127 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 08 八月 2025 16:58:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 53 ++++--
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 394 +++++++++++++++++++++++-------------------------
src/main/java/com/zy/common/web/WcsController.java | 4
3 files changed, 223 insertions(+), 228 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 80dc131..cbad70a 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -9,6 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -38,72 +39,53 @@
@Autowired
private LocDetlService locDetlService;
-
- public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
- add(1042);add(1105);add(1106);add(1041);add(1038);add(1036);
+ //鍏ュ簱鍙�
+ public static final List<Integer> STA_WORK_IN = new ArrayList<Integer>() {{
+ add(1042);add(1105);add(1038);add(1036);add(2037);
}};
- public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);
+ //鍑哄簱鍙�
+ public static final List<Integer> STA_WORK_OUT = new ArrayList<Integer>() {{
+ add(1007);add(1010);add(1021);add(1024);add(1031);add(2003);add(2009);add(2015);add(2021);add(2027);
}};
- public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
- add(120);add(121);
- }};
- public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
- add(118);add(120);
- }};
- public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
- add(119);add(121);
- }};
+// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
+// add(120);add(121);
+// }};
+// public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
+// add(118);add(120);
+// }};
+// public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
+// add(119);add(121);
+// }};
- public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(119);add(120);add(121);add(122);add(123);
- }};
+// public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
+// add(118);add(119);add(120);add(121);add(122);add(123);
+// }};
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- for(Integer staNo : STA_WORK_CU){
+ for(Integer staNo : STA_WORK_IN){
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
continue;
}
- if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
- continue;
- }
- }
- if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
- continue;
- }
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
- continue;
- }
- boolean wrkTypeSign = fullKM(wrkMast);
+// boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
- if (wrkTypeSign) {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触1锛�");
- }
- } else {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触2锛�");
- }
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);//鍏ュ簱
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触1锛�");
}
}
}
}
- for(Integer staNo : STA_WORK_RU){
+ for(Integer staNo : STA_WORK_OUT){
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -111,14 +93,14 @@
continue;
}
- if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
- continue;
- }
+// if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
+// continue;
+// }
// boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
// if (wrkTypeSign){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
if (result.getCode()==200) {
continue;
} else {
@@ -130,163 +112,163 @@
}
// @Scheduled(cron = "0/3 * * * * ? ")
- private void execute2(){
- try{
- for(Integer staNo : STA_WORK_CU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
- continue;
- }
- if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
- continue;
- }
- if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
- continue;
- }
- int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNo()).or().eq("sta_end", wrkMast.getStaNo()));
- if (count!=0){
- continue;
- }
- int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
- if (countStart!=0){
- continue;
- }
- BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
- if (!basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
- continue;
- }
- if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
- if (rgvOneSign.getRgvOneSign()==1){
- continue;
- }
- }
- if (wrkMast.getIoType()!=101){
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
- String origin = wrkDetls.get(0).getOrigin();
- if (origin.equals("1")){
- if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
- continue;
- }
- }else {
- if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNo())){
- continue;
- }
- }
- }else {
- log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
- continue;
- }
- }
+// private void execute2(){
+// try{
+// for(Integer staNo : STA_WORK_CU){
+// BasDevp basDevp = basDevpService.selectById(staNo);
+// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+// if(Cools.isEmpty(wrkMast)){
+// continue;
+// }
+// if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
+// continue;
+// }
+// if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
+// continue;
+// }
+// if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
+// continue;
+// }
+// int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNo()).or().eq("sta_end", wrkMast.getStaNo()));
+// if (count!=0){
+// continue;
+// }
+// int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
+// if (countStart!=0){
+// continue;
+// }
+// BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
+// if (!basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
+// continue;
+// }
+// if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+// if (rgvOneSign.getRgvOneSign()==1){
+// continue;
+// }
+// }
+// if (wrkMast.getIoType()!=101){
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// if (wrkDetls.size()!=0){
+// String origin = wrkDetls.get(0).getOrigin();
+// if (origin.equals("1")){
+// if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
+// continue;
+// }
+// }else {
+// if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNo())){
+// continue;
+// }
+// }
+// }else {
+// log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
+// continue;
+// }
+// }
+////
+// boolean wrkTypeSign = fullKM(wrkMast);
+// if (!Cools.isEmpty(wrkMast)){
+// if (wrkTypeSign) {
+// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+// if (result.getCode()==200){
+// continue;
+// }else {
+// System.out.println(staNo+"澶辫触4锛�");
+// }
+// }
+// }
+// }
+// }
//
- boolean wrkTypeSign = fullKM(wrkMast);
- if (!Cools.isEmpty(wrkMast)){
- if (wrkTypeSign) {
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触4锛�");
- }
- }
- }
- }
- }
-
- for(Integer staNo : STA_WORK_CU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
- continue;
- }
- if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
- continue;
- }
- Integer wrkMastStaNo = wrkMast.getStaNo();
- if (wrkMastStaNo<118 || wrkMastStaNo>121){
- continue;
- }
- String origin = null;
- boolean sign = false;
- if (wrkMast.getIoType()!=101){
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
- origin = wrkDetls.get(0).getOrigin();
- if (origin.equals("1")){
- if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
- sign = true;
- }
- }else {
- if (!STA_WORK_CU_CAR_THREE.contains(wrkMastStaNo)){
- sign = true;
- }
- }
- }else {
- log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
- continue;
- }
- }
- int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
- if (count!=0){
- continue;
- }
- int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
- if (countStart!=0){
- continue;
- }
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
- if (rgvOneSign.getRgvOneSign()==1){
- STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
- }
-
- BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
- if (sign || !basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
- for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
- if (staNoOther.equals(wrkMastStaNo)) continue;
-
- if (sign){
- if (origin.equals("1")){
- if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
- continue;
- }
- }else {
- if (!STA_WORK_CU_CAR_THREE.contains(staNoOther)){
- continue;
- }
- }
- }
-
- int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
- if (countOther!=0){
- continue;
- }
- BasDevp basDevpOther = basDevpService.selectById(staNoOther);
- if (!basDevpOther.getLoading().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
- continue;
- }
- wrkMast.setStaNo(staNoOther);
- wrkMastService.updateById(wrkMast);
- log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
- return;
- }
- }
- }
- }
- }catch (Exception e){
- log.error("鐩爣涓烘媶鍨涗綅缃殑浠诲姟鐢熸垚灏忚溅宸ヤ綔妗ｆ澶辫触锛侊紒"+e);
- }
- }
+// for(Integer staNo : STA_WORK_CU){
+// BasDevp basDevp = basDevpService.selectById(staNo);
+// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+// List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+// if(Cools.isEmpty(wrkMast)){
+// continue;
+// }
+// if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
+// continue;
+// }
+// if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
+// continue;
+// }
+// Integer wrkMastStaNo = wrkMast.getStaNo();
+// if (wrkMastStaNo<118 || wrkMastStaNo>121){
+// continue;
+// }
+// String origin = null;
+// boolean sign = false;
+// if (wrkMast.getIoType()!=101){
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// if (wrkDetls.size()!=0){
+// origin = wrkDetls.get(0).getOrigin();
+// if (origin.equals("1")){
+// if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
+// sign = true;
+// }
+// }else {
+// if (!STA_WORK_CU_CAR_THREE.contains(wrkMastStaNo)){
+// sign = true;
+// }
+// }
+// }else {
+// log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
+// continue;
+// }
+// }
+// int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
+// if (count!=0){
+// continue;
+// }
+// int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
+// if (countStart!=0){
+// continue;
+// }
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+// if (rgvOneSign.getRgvOneSign()==1){
+// STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
+// }
+//
+// BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
+// if (sign || !basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
+// for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
+// if (staNoOther.equals(wrkMastStaNo)) continue;
+//
+// if (sign){
+// if (origin.equals("1")){
+// if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
+// continue;
+// }
+// }else {
+// if (!STA_WORK_CU_CAR_THREE.contains(staNoOther)){
+// continue;
+// }
+// }
+// }
+//
+// int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
+// if (countOther!=0){
+// continue;
+// }
+// BasDevp basDevpOther = basDevpService.selectById(staNoOther);
+// if (!basDevpOther.getLoading().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
+// continue;
+// }
+// wrkMast.setStaNo(staNoOther);
+// wrkMastService.updateById(wrkMast);
+// log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
+// return;
+// }
+// }
+// }
+// }
+// }catch (Exception e){
+// log.error("鐩爣涓烘媶鍨涗綅缃殑浠诲姟鐢熸垚灏忚溅宸ヤ綔妗ｆ澶辫触锛侊紒"+e);
+// }
+// }
public boolean fullKM(WrkMast wrkMast){
if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index 49f3217..8a43981 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -33,30 +33,43 @@
return SUCCESS;
}
switch (type){
- case 13://鍑� 3锛氬彇鏀�
+// case 13://鍑� 3锛氬彇鏀�
+// if (Cools.isEmpty(wrkMastSta)){
+// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
+// wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
+// wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+// wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+// wrkMastStaService.insert(wrkMastSta1);
+// }
+// break;
+ case 21://鍏ュ簱
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锛氭弧鏀�
+ wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
+ switch (wrkMast.getStaNo()){
+ case 1001:wrkMastSta1.setStaEnd(1004);break;
+ case 1011:wrkMastSta1.setStaEnd(1014);break;
+ case 1015:wrkMastSta1.setStaEnd(1018);break;
+ case 1025:wrkMastSta1.setStaEnd(1028);break;
+ case 1032:wrkMastSta1.setStaEnd(1035);break;
+ }
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 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 22://鍑哄簱
+ if (Cools.isEmpty(wrkMastSta)){
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
+ wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
+ if(wrkMast.getWrkNo() == 1108){
+ wrkMastSta1.setStaEnd(1106);
+ }
+ wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+ wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ wrkMastStaService.insert(wrkMastSta1);
+ };
+ break;
// case 23://3锛氭弧鍙�
// if (Cools.isEmpty(wrkMastSta)){
// WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index afc7ff9..4122819 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -109,12 +109,12 @@
@ResponseBody
public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(801, true);
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(1038, true);
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
- StartupDto dto = commonService.getLocNo( 10, 801, findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 10, 1038, findLocNoAttributeVo, locTypeDto);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1