From 60224c0580a5b649d46629e6c047e2062ee6e87c Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 29 一月 2024 21:36:50 +0800
Subject: [PATCH] Changes
---
src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java | 3 ++-
src/main/webapp/views/nodeLoc/nodeLoc.html | 26 +++++++++++++-------------
src/main/webapp/static/image/favicon_old.ico | 0
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 7 +++++++
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 8 +++++---
src/main/resources/application.yml | 2 +-
6 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index e75e9b3..be0183d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -281,10 +281,12 @@
}catch (Exception e){
String devNo = map.get("devNo").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ if (agvWrkMast != null) {
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ agvWrkMastList.add(agvWrkMast);
}
- agvWrkMastList.add(agvWrkMast);
}
// List<String> devNos = (List<String>) map.get("devNo");
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 2fcb2b6..533d9cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -252,6 +252,13 @@
Date now = new Date();
taskDtos.forEach(taskDto -> {
+
+ //鍒ゆ柇鏄惁鏈夐噸澶嶆枡鎯崇殑宸ヤ綔褰�
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(taskDto.getLocDtos().get(0).getContainerCode());
+ if(!Cools.isEmpty(agvWrkMast)){
+ return;
+ }
+
//鐢熸垚宸ヤ綔妗�
AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,false);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
diff --git a/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java b/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java
index fe6f287..8567ad2 100644
--- a/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckLocDetlExistScheduler.java
@@ -27,7 +27,8 @@
@Autowired
private ConfigService configService;
- @Scheduled(cron = "* 0/1 * * * ? ")
+ //姣�30鍒嗛挓鎵弿涓�娆�
+ @Scheduled(cron = "0 30 * * * ? ")
private void execute(){
List<LocMast> locMasts = locMastService.selectLocDetlNotExist();
if (locMasts.isEmpty()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 74c7ea8..bde1d85 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
diff --git a/src/main/webapp/static/image/favicon_old.ico b/src/main/webapp/static/image/favicon_old.ico
new file mode 100644
index 0000000..86d5e0a
--- /dev/null
+++ b/src/main/webapp/static/image/favicon_old.ico
Binary files differ
diff --git a/src/main/webapp/views/nodeLoc/nodeLoc.html b/src/main/webapp/views/nodeLoc/nodeLoc.html
index 411d5ab..d49c584 100644
--- a/src/main/webapp/views/nodeLoc/nodeLoc.html
+++ b/src/main/webapp/views/nodeLoc/nodeLoc.html
@@ -122,19 +122,19 @@
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="printBatch">鎵归噺鎵撳嵃</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-<!-- <div class="dropdown-menu" style="float: right">-->
-<!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
-<!-- <ul class="dropdown-menu-nav dark">-->
-<!-- <div class="dropdown-anchor"></div>-->
-<!-- <li class="title">1st menu</li>-->
-<!-- <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>-->
-<!-- <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>-->
-<!-- <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
-<!-- <hr>-->
-<!-- <li class="title">2nd menu</li>-->
-<!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
-<!-- </ul>-->
-<!-- </div>-->
+ <!-- <div class="dropdown-menu" style="float: right">-->
+ <!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
+ <!-- <ul class="dropdown-menu-nav dark">-->
+ <!-- <div class="dropdown-anchor"></div>-->
+ <!-- <li class="title">1st menu</li>-->
+ <!-- <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>-->
+ <!-- <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>-->
+ <!-- <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
+ <!-- <hr>-->
+ <!-- <li class="title">2nd menu</li>-->
+ <!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
+ <!-- </ul>-->
+ <!-- </div>-->
<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>-->
</div>
</script>
--
Gitblit v1.9.1