From 8b8854ce1a52bb74604271b29fa9e1ea7cbcde10 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 14 一月 2024 16:22:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java | 17 ++++++++++++-----
src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 2 +-
src/main/java/com/zy/asrs/entity/BasDevp.java | 3 +--
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 ++++++++--
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 17 ++++++++++++-----
src/main/resources/mapper/BasDevpMapper.xml | 1 +
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/asrs/task/BarcodeUploadScheduler.java | 4 ++--
9 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index a20b890..bcae39b 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -214,10 +214,9 @@
@TableField("cart_pos")
private Integer cartPos;
- @ApiModelProperty(value = "")
+ @ApiModelProperty(value = "1妤兼媶鍨涗笂浼犲彔鐩樺洖搴撴爣璁�")
@TableField("report_sign")
private Integer reportSign;
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a826773..aa5c1a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -780,8 +780,10 @@
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
wrkMast.setWrkSts(4L);
// 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()!=202) {
wrkMast.setWrkSts(14L);
+ }else if (wrkMast.getIoType()==202){
+ wrkMast.setWrkSts(57L);
}
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
@@ -945,7 +947,7 @@
locMastService.updateById(locMast);
}
// 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14 && wrkMast.getIoType()!=202) {
locNo = wrkMast.getSourceLocNo();
// 鍑哄簱 ===>> F.鍦ㄥ簱
if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
@@ -966,6 +968,7 @@
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
+ } else if (wrkMast.getIoType()==202){
} else {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
@@ -1053,6 +1056,9 @@
// 鍒犻櫎宸ヤ綔妗ｆ槑缁�
boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
}
+ if (wrkMast.getIoType()==202){
+ return;
+ }
// 淇敼搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(locNo);
diff --git a/src/main/java/com/zy/asrs/task/BarcodeUploadScheduler.java b/src/main/java/com/zy/asrs/task/BarcodeUploadScheduler.java
index 617ff6e..6142fd3 100644
--- a/src/main/java/com/zy/asrs/task/BarcodeUploadScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BarcodeUploadScheduler.java
@@ -8,7 +8,7 @@
/**
* Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鏉＄爜涓婁紶涓帶
*/
@Component
public class BarcodeUploadScheduler {
@@ -18,7 +18,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//鏉＄爜涓婁紶涓帶
- int[] staNos =new int[]{216,220};
+ int[] staNos =new int[]{215,219};
for (int staNo : staNos){
ReturnT<String> result = barcodeUploadHandler.start(staNo);
if (result.getCode()==200){
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index ffee5f8..debf294 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -51,7 +51,7 @@
}
for (BasCrnp basCrnp:basCrnps){
if (basCrnp.getCrnSts()!=3) continue;
- if (basCrnp.getCrnNo()==5) continue;
+ if (!basCrnp.getInEnable().equals("N") || !basCrnp.getOutEnable().equals("Y")) continue;
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",basCrnp.getCrnNo()));
if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",basCrnp.getCrnNo()).orderBy("appe_time",true));//绌烘澘鎵�鍦�
diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
index 96667dd..ac41c11 100644
--- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
@@ -22,7 +22,7 @@
for (int staNo : staNos){
ReturnT<String> result = reportToDismantleTheStackHandler.start(staNo);
if (result.getCode()==200){
- continue;
+ break;
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
index 14fe7d7..1ce74c4 100644
--- a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
@@ -53,13 +53,20 @@
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
- if (Cools.isEmpty(waitPakin)){
+ if (Cools.isEmpty(basDevp) || Cools.isEmpty(basDevp.getBarcode()) || basDevp.getReportSign()!=1
+ || basDevp.getBarcode().equals("")){
+ return FAIL;
+ }
+ if (basDevp.getWrkNo()>9899 && basDevp.getWrkNo()<10000 && basDevp.getAutoing().equals("Y")
+ && basDevp.getLoading().equals("Y") && basDevp.getInEnable().equals("Y")){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
+ int zpalletCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
+ if (zpalletCount==0){
ReturnT<String> result = null;
result = postMesData(barcodeUploadpath,basDevp);
System.out.println(result);
if (result.getCode()==200){
+ basDevp.setReportSign(2);
+ basDevpService.updateById(basDevp);
return SUCCESS;
}else {
log.error("鏉＄爜涓婁紶涓帶澶辫触");
@@ -89,7 +96,7 @@
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤erp绯荤粺澶辫触");
+ throw new CoolException("鏉＄爜涓婁紶涓帶澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
@@ -99,7 +106,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤erp绯荤粺",
+ "鏉＄爜涓婁紶涓帶",
erpUrl + erpPath,
null,
erpUrl,
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 42dbd76..5380cd7 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -52,22 +52,29 @@
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
- if (staOther==0) return SUCCESS;
+ if (staOther==0) return FAIL;
BasDevp basDevpOther = basDevpService.selectById(staOther);
if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
- return SUCCESS;
+ return FAIL;
+ }
+ BasDevp basDevpEnd = basDevpService.selectById(staEnd);
+ if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
+ return FAIL;
+ }
+ if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0) || basDevpEnd.getWrkNo()>10000){
+ return FAIL;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1)) return SUCCESS;
+ if (!Cools.isEmpty(wrkMast1)) return FAIL;
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast) || !wrkMast.getSheetNo().equals("0")){
- return SUCCESS;
+ return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
- return SUCCESS;
+ return FAIL;
}
SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
singleMountUnstackingCompleteParam.setStaStart(staNo);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d458be2..1d0d5f8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -74,4 +74,4 @@
# 鐮佸灈淇℃伅涓婁紶
reportInPath: api/PalletizingInfo/Post
loc-move:
- move-all: false
\ No newline at end of file
+ move-all: true
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 4f6e131..9d97489 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -41,6 +41,7 @@
<result column="max_wt" property="maxWt" />
<result column="gross_wt" property="grossWt" />
<result column="cart_pos" property="cartPos" />
+ <result column="report_sign" property="reportSign" />
</resultMap>
--
Gitblit v1.9.1