From 1099b9b7414f0e28fe14dd9a43df6166fed5366b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 三月 2024 16:46:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 40 ++++++++++++++++++-
src/main/java/com/zy/asrs/service/WrkMastService.java | 1
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1
src/main/resources/mapper/WrkMastMapper.xml | 7 +++
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 12 ++++++
6 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index af2c105..e5009cc 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -17,6 +17,7 @@
List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryData2();
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index dcd14ad..5b2b80c 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -13,6 +13,7 @@
List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryData2();
WrkMast selectByBarcode(String barcode);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index dd3be64..69d05b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -36,6 +36,11 @@
}
@Override
+ public List<WrkMast> selectToBeHistoryData2() {
+ return this.baseMapper.selectToBeHistoryData2();
+ }
+
+ @Override
public WrkMast selectByBarcode(String barcode) {
List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode));
if (Cools.isEmpty(wrkMasts)) {
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 4dea664..690ae3c 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -44,6 +44,18 @@
}
@Scheduled(cron = "0/3 * * * * ? ")
+ private void execute3(){
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ wrkMast.setOveMk("Y");
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts", 3));
if (Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()==0) {
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 4b9c022..e73f080 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -45,6 +45,14 @@
@Autowired
private BasCrnpService basCrnpService;
+ public static final List<Integer> rows1 = new ArrayList<Integer>() {{
+ add(1);add(5);add(9);add(13);add(17);add(21);
+ }};
+
+ public static final List<Integer> rows2 = new ArrayList<Integer>() {{
+ add(4);add(8);add(12);add(16);add(20);add(24);
+ }};
+
public ReturnT<String> start(Integer staNo) {
try {
if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
@@ -72,11 +80,30 @@
sign = true;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",crnNo));
-
if (Cools.isEmpty(locMast)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
sign=false;
}
+ if (sign){
+ if (rows1.contains(locMast.getRow1())){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("row1", locMast.getRow1() + 1)
+ .eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()));
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ }
+ }else if (rows2.contains(locMast.getRow1())){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("row1", locMast.getRow1() - 1)
+ .eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()));
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ }
+ }
+ }
+ if (sign && Cools.isEmpty(locMast)) {
+// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
+ sign=false;
+ }
+
if (sign && !locMast.getLocSts().equals("D")){
// throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
sign=false;
@@ -88,11 +115,18 @@
.eq("stn_no", staNo)
.eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
- Integer sourceStaNo = staDesc.getCrnStn();
- if (Cools.isEmpty(sourceStaNo)) {
+ if (Cools.isEmpty(staDesc)) {
// throw new CoolException("妫�绱㈡簮绔欏け璐�");
sign = false;
}
+ Integer sourceStaNo = null;
+ if (sign){
+ sourceStaNo = staDesc.getCrnStn();
+ if (Cools.isEmpty(sourceStaNo)) {
+// throw new CoolException("妫�绱㈡簮绔欏け璐�");
+ sign = false;
+ }
+ }
if (sign){
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7834e3a..ac9d877 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -82,4 +82,11 @@
order by io_time,wrk_no asc
</select>
+ <select id="selectToBeHistoryData2" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where
+ wrk_sts=15 and ove_mk='N' and io_type = 110 and sta_no = 213 and wrk_no in (select wrk_no from asr_bas_devp where dev_no = 213)
+ order by io_time,wrk_no asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1