From 3c340fd00f4979a2041bdebef741163eabd2b9cf Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 17 五月 2025 20:04:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +
src/main/java/com/zy/asrs/task/ErrorStockScheduler.java | 64 +++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 1
src/main/java/com/zy/asrs/entity/param/ShuttleTask.java | 3 +
src/main/java/com/zy/common/web/WcsController.java | 4 +-
src/main/java/com/zy/common/service/CommonService.java | 2 -
6 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ShuttleTask.java b/src/main/java/com/zy/asrs/entity/param/ShuttleTask.java
index 8a46a3c..875d638 100644
--- a/src/main/java/com/zy/asrs/entity/param/ShuttleTask.java
+++ b/src/main/java/com/zy/asrs/entity/param/ShuttleTask.java
@@ -7,6 +7,9 @@
//wms浠诲姟鍙�
private String taskNo;
+ //wms浠诲姟鍙� 锛屼笂涓伐浣滃彿鐢ㄤ簬2.5F
+ private String taskNo2;
+
//婧愮珯
private Integer sourceStaNo;
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 f085db0..68a9c07 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1917,6 +1917,7 @@
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setBarcode(wrkMastold.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
+ wrkMast.setPltType(wrkMastold.getWrkNo());
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
boolean res = wrkMastService.insert(wrkMast);
@@ -1979,6 +1980,7 @@
wrkMast.setEmptyMk(wrkDetls != null ? "N" : "Y"); // 绌烘澘
wrkMast.setBarcode(wrkMastold.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
+ wrkMast.setPltType(wrkMastold.getWrkNo());
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
boolean res = wrkMastService.insert(wrkMast);
diff --git a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
index 917cfc4..ded2fb3 100644
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
@@ -1,12 +1,25 @@
package com.zy.asrs.task;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.ShuttleTask;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.ErrorStockHandler;
+import com.zy.common.utils.HttpHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
/**
* Created by vincent on 2020/7/7
@@ -18,13 +31,62 @@
@Autowired
private ErrorStockHandler errorStockHandler;
+ @Autowired
+ private LocMastService locMastService;
+
+ @Value("${shuttleWcs.url}")
+ private String shuttleWcsUrl;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
ReturnT<String> returnT = errorStockHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
}
}
+ @Scheduled(cron = "0/15 * * * * ? ")
+ private void execute2() {
+ String response = null;
+ try {
+ ShuttleTask param = new ShuttleTask();
+ response = new HttpHandler.Builder()
+ .setUri(shuttleWcsUrl)
+ .setJson(JSON.toJSONString(param))
+ .setPath("/openapi/getAllLocInformation")
+ .build()
+ .doPost();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ String data = jsonObject.getString("data");
+ List<LocMast> locMasts = JSONArray.parseArray(data, LocMast.class);
+ for (LocMast locMast : locMasts) {
+ if (locMast.getLocNo().startsWith("02003") || locMast.getLocNo().startsWith("12003")) {
+ continue;
+ }
+ String locNo = locMast.getLocNo();
+ int row = Integer.parseInt(locNo.substring(0, 2)) + 4;
+ if (row >= 10) {
+ locNo = row + locMast.getLocNo().substring(2);
+ } else {
+ locNo = "0" + row + locMast.getLocNo().substring(2);
+ }
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (locMast1 == null) {
+ log.info("搴撲綅涓嶅尮閰�");
+ } else {
+ if (locMast1.getLocSts().equalsIgnoreCase("X") && (locMast.getLocSts().equalsIgnoreCase("W") || locMast.getLocSts().equalsIgnoreCase("E"))) {
+
+ } else if (!locMast1.getLocSts().equalsIgnoreCase(locMast.getLocSts())) {
+ log.info("搴撲綅鐘舵�佷笉鍖归厤{}锛學MS:{}锛孯CS:{}", locMast1.getLocNo(), locMast1.getLocSts(), locMast.getLocSts());
+ }
+ }
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index cb810d7..7f58192 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -103,6 +103,7 @@
ShuttleTask param = new ShuttleTask();
param.setTaskNo(wrkMast.getWrkNo().toString());
param.setLocNo(loc);
+ param.setTaskNo2(Cools.isEmpty(wrkMast.getPltType()) ? null : wrkMast.getPltType().toString());
param.setSourceStaNo(wrkMast.getSourceStaNo());
param.setStaNo(wrkMast.getStaNo());
param.setBarcode(wrkMast.getBarcode());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 935c3b0..5d55b8f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -887,14 +887,12 @@
.ge("bay1", 3).le("bay1", 6)
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", true));
} else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", locMastWrk.getBay1())
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts)) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9f2eacc..3de822b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -297,7 +297,7 @@
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", 31002) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", param.getSourceStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
@@ -321,7 +321,7 @@
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(param.getSourceStaNo()); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
--
Gitblit v1.9.1