From ecd79ff570939b55f455767f2b310590faa5a191 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:13:01 +0800
Subject: [PATCH] 1.新增组托时批号必须唯一 2.新增当有出库任务时禁止AGV入库搬运 3.拣料下架从任务状态16改成34
---
src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java | 8 ++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++++++++++--
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/resources/application.yml | 4 ++--
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 314585e..b8c0e93 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -280,7 +280,7 @@
wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
}
if(wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
- wrkMast.setWrkSts(16L);//涓嬫灦瀹屾垚绛夊緟鍥炲簱
+ wrkMast.setWrkSts(34L);//涓嬫灦瀹屾垚绛夊緟鍥炲簱
}else {
wrkMast.setWrkSts(15L);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 48110f9..6cf5d08 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -102,15 +102,25 @@
Date now = new Date();
+ //杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
Set<String> batchs=new HashSet<>();
+ List<String> strings=new ArrayList<>();
+
for(CombParam.CombMat mat : param.getCombMats()){
if(Cools.isEmpty(mat.getBatch())){
- throw new CoolException("鐗╂枡鎵瑰彿涓嶈兘涓虹┖");
+ continue;
}
batchs.add(mat.getBatch());
+ strings.add(mat.getBatch());
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
+ WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
+ LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
+ if(!Cools.isEmpty(batch)||!Cools.isEmpty(batch1)||!Cools.isEmpty(waitPakin)){
+ throw new CoolException("璇ョ墿鏂欐壒鍙�"+mat.getBatch()+"宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
+ }
}
- if(batchs.size()<param.getCombMats().size()){
+ if(batchs.size()<strings.size()){
throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
}
int i =1;
diff --git a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
index fa42ace..6452017 100644
--- a/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
+++ b/src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java
@@ -127,11 +127,19 @@
}else {
staNo = "101";
}
+
break;
}
}
}
}
+
+ //褰撶珯鐐规湁鍑哄簱浠诲姟鏃惰烦杩囨淳鍙戜换鍔�
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).lt("wrk_sts",33));
+ if(!Cools.isEmpty(wrkMasts1)){
+ continue;
+ }
+
if (Cools.isEmpty(staNo)) {
return;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5baf1a6..684c1e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+ url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1