From 0691d54265bdec95baa48d83a46d7f2937472613 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 09:36:22 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 --
src/main/resources/mapper/LocMastMapper.xml | 8 ++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 ++
src/main/java/com/zy/asrs/task/ClearLiftLocNoScheduler.java | 40 ++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 2 +-
5 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index be0183d..f07fba4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -107,7 +107,7 @@
AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
//鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
- if(!agvBasDevp.getLocSts().equals("F")){
+ if(!agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getLocSts().equals("R")){
return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
}
agvBasDevp.setLocSts("O");
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 3b8193d..ae94e3a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -49,4 +49,6 @@
List<LocMast> selectLocDetlNotExist();
+ int clearLiftLocNo();
+
}
diff --git a/src/main/java/com/zy/asrs/task/ClearLiftLocNoScheduler.java b/src/main/java/com/zy/asrs/task/ClearLiftLocNoScheduler.java
new file mode 100644
index 0000000..b23fc7a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/ClearLiftLocNoScheduler.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.service.LocMastService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class ClearLiftLocNoScheduler {
+
+ @Autowired
+ private LocMastMapper locMastMapper;
+ @Autowired
+ private ConfigService configService;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","tmpSwitch"));
+ if (config == null) {
+ return;
+ }
+
+ if (!config.getValue().equals("true")) {
+ return;
+ }
+
+ int clearLiftLocNo = locMastMapper.clearLiftLocNo();
+ if (clearLiftLocNo > 0) {
+ log.info("娓呯悊鎻愬崌鏈洪檮杩戝簱浣�:" + clearLiftLocNo + "涓�");
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c54194f..9ed7473 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -238,8 +238,6 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast1.getLocNo()));
- } else {
- throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
break;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 81f5acf..9182d35 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -162,4 +162,12 @@
on lm.loc_no = ld.loc_no
where ld.matnr is null and lm.loc_sts = 'F'
</select>
+
+ <delete id="clearLiftLocNo">
+ update asr_loc_mast set loc_sts = 'S'
+ where row1 >=1 and row1 <= 16
+ and bay1 in(21,22,23,37,38,39,56,57,58)
+ and lev1 >= 3 and lev1 <= 10
+ and loc_sts = 'O'
+ </delete>
</mapper>
--
Gitblit v1.9.1