From bc48a855d98e360042a7e2fff5594a91a82578c6 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期四, 24 七月 2025 16:16:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a374e5f..618adbf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -93,7 +93,7 @@
//婕旂ず妯″紡-AGV鍑哄簱
private synchronized void demoAgvOut() {
- LocMast locMast = locMastService.selectByLocNo("1100601");
+ LocMast locMast = locMastService.selectByLocNo("0900601");
if(locMast == null) {
return;
}
@@ -105,7 +105,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("mk", "agv")
.eq("loc_sts", "F")
- .notIn("loc_no", "0900601")
+ .notIn("loc_no", "1100601")
);
if (locMasts.isEmpty()) {
@@ -123,7 +123,7 @@
//婕旂ず妯″紡-AGV鍏ュ簱
private synchronized void demoAgvIn() {
- LocMast locMast = locMastService.selectByLocNo("0900601");
+ LocMast locMast = locMastService.selectByLocNo("1100601");
if(locMast == null) {
return;
}
@@ -135,7 +135,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("mk", "agv")
.eq("loc_sts", "O")
- .notIn("loc_no", "1100601")
+ .notIn("loc_no", "0900601")
);
if (locMasts.isEmpty()) {
@@ -153,7 +153,7 @@
//婕旂ず妯″紡-鍥涘悜搴撳嚭搴�
private synchronized void demoShuttleOut() {
- LocMast locMast = locMastService.selectByLocNo("0900601");
+ LocMast locMast = locMastService.selectByLocNo("1100601");
if(locMast == null) {
return;
}
@@ -163,6 +163,7 @@
}
ArrayList<Integer> disableLevList = new ArrayList<>();
+ disableLevList.add(1);
//query in task
List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
@@ -191,11 +192,13 @@
taskWrk.setTaskNo(String.valueOf(workNo1));//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setWrkSts(11);
taskWrk.setCreateTime(now);
- taskWrk.setIoType(1);//鍏ュ簱
+ taskWrk.setIoType(2);//鍑哄簱
taskWrk.setIoPri(100);//浼樺厛绾�
- taskWrk.setOriginTargetPoint(locMast1.getLocNo());
- taskWrk.setTargetPoint("1");//缁堢偣
+ taskWrk.setStartPoint(locMast1.getLocNo());
+ taskWrk.setTargetPoint("101");//缁堢偣
+ taskWrk.setBarcode(locMast1.getBarcode());
boolean result = taskWrkService.insert(taskWrk);
locMast1.setLocSts("R");
@@ -209,7 +212,7 @@
//婕旂ず妯″紡-鍥涘悜搴撳叆搴�
private synchronized void demoShuttleIn() {
- LocMast locMast = locMastService.selectByLocNo("1100601");
+ LocMast locMast = locMastService.selectByLocNo("0900601");
if(locMast == null) {
return;
}
@@ -219,6 +222,7 @@
}
ArrayList<Integer> disableLevList = new ArrayList<>();
+ disableLevList.add(1);
//query out task
List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
@@ -243,15 +247,18 @@
Date now = new Date();
TaskWrk taskWrk = new TaskWrk();
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(String.valueOf(workNo1));//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setWrkSts(1);
taskWrk.setCreateTime(now);
taskWrk.setIoType(1);//鍏ュ簱
taskWrk.setIoPri(100);//浼樺厛绾�
- taskWrk.setOriginTargetPoint("101");
+ taskWrk.setOriginStartPoint("1");
+ taskWrk.setOriginTargetPoint(String.valueOf(Utils.getLev(locMast1.getLocNo())));
taskWrk.setTargetPoint(locMast1.getLocNo());//缁堢偣
+ taskWrk.setBarcode(locMast.getBarcode());
boolean result = taskWrkService.insert(taskWrk);
locMast1.setLocSts("S");
--
Gitblit v1.9.1