From 5d2a9f7225b046f0646f97d4ca3bd191650e6bbd Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 08:42:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 2 +-
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 14 +++++++++++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 +++++++++++++-
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 1 +
6 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e27cf61..463417b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -302,7 +302,7 @@
* 娴嬭瘯3
*/
@PostMapping("/cs3/auth/v1")
- @AppAuth(memo = "")
+// @AppAuth(memo = "")
public synchronized R cs3(@RequestHeader(required = false) String appkey,
@RequestBody PalletizingCompleteParam param,
HttpServletRequest request) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index ee67335..e726029 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -108,7 +108,7 @@
/**
* 宸ヤ綔绫诲瀷
*/
- @ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�")
+ @ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�")
@TableField("wrk_type")
private Integer wrkType;
@@ -135,6 +135,18 @@
this.bignTime = now;
}
+ public WrkMastSta(Date now, Integer staStart) {
+ this.wrkNo = staStart.longValue()+9999;
+ this.wrkStart = staStart;
+ this.wrkEnd = staStart;
+ this.staStart = staStart;
+ this.staEnd = staStart;
+ this.createTime = now;
+ this.updateTime = now;
+ this.wrkSts = 0;
+ this.bignTime = now;
+ }
+
public WrkMastSta(Long wrkNo, Integer wrkStart, Integer wrkEnd, Integer staStart, Integer staEnd, Date createTime, Date updateTime, Integer type, Integer wrkSts, Integer lineNumber, Integer wrkType, Date bignTime) {
this.wrkNo = wrkNo;
this.wrkStart = wrkStart;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d4a7590..7b502ba 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -65,6 +65,10 @@
private LocDetlRullUpDetailService locDetlRullUpDetailService;
@Autowired
private WrkDetlSingleService wrkDetlSingleService;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private WrkMastStaLogService wrkMastStaLogService;
@Override
@Transactional
@@ -970,7 +974,15 @@
@Override
@Transactional
public void cs3() {
-
+ //鎷嗙洏
+ WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
+ wrkMastSta1.setType(2);
+ wrkMastSta1.setWrkType(2);
+ wrkMastStaService.insert(wrkMastSta1);
+ WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),122);
+ wrkMastSta2.setType(2);
+ wrkMastSta2.setWrkType(2);
+ wrkMastStaService.insert(wrkMastSta2);
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index c66a103..ef75d37 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -90,7 +90,7 @@
if (!Cools.isEmpty(wrkMast)){
if (wrkTypeSign){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
if (result.getCode()==200) {
continue;
} else {
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index ee8ddc9..e9209ba 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -69,6 +69,7 @@
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
wrkDetlSingle.sync(wrkDetl);
+ wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
wrkDetlSingleService.insert(wrkDetlSingle);
}
wrkMast.setSheetNo("1");
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 b883a9f..4b8a4be 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -40,7 +40,7 @@
case 13://鍑� 3锛氬彇鏀�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2); //绫诲瀷 1:闈炵┖ 2:绌烘澘
+ wrkMastSta1.setType(1); //绫诲瀷 1:闈炵┖ 2:绌烘澘
wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
wrkMastStaService.insert(wrkMastSta1);
}
--
Gitblit v1.9.1