From a501d123b5e46b7c5c4bb8b4dfb7cec6cf6fdbea Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 15 五月 2025 14:06:26 +0800
Subject: [PATCH] 输送线界面写输送线任务号和目标站修复
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8983bdf..9b2c22e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -73,19 +73,22 @@
Date now = new Date();
taskWrk = new TaskWrk();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ if (locMast == null) {
+ map.put("Code", "0");
+ map.put("Msg", param.getStartPoint() + "搴撲綅鍙锋湁璇�");
+ return map;
+ }
+ int workNoType = WorkNoType.PAKOUT.type;
+ // 鍑哄簱鍒�2锛�3鍙峰爢鍨涙満锛岄渶瑕侀�氳繃浠诲姟鍙峰尯鍒嗗ぇ灏忔墭鐩橈紝浠诲姟鍙�3001-6000涓哄皬鎵樼洏锛屽嵆8~12鍒�
+ if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBay1() > 7){
+ workNoType = WorkNoType.PICK.type;
+ }
+ int workNo1 = commonService.getWorkNo(workNoType);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -99,11 +102,11 @@
} else if (param.getIoType() == 2) {
taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
+// if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(param.getTargetPoint());
- }
- taskWrk.setTargetPoint(param.getTargetPoint());
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint())-1));
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
} else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
@@ -270,7 +273,11 @@
if (Cools.isEmpty(basDevp)) {
return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
}
+ if (Cools.isEmpty(param.getHeight())) {
+ return R.error("楂樺害涓嶈兘涓虹┖" + param.getStartPoint());
+ }
if (param.getType() == 0 && basDevp.getAgvStartPick() == 1) {
+ basDevp.setInreq2(param.getHeight().toString());
return R.ok();
} else if (param.getType() == 1 && basDevp.getAgvStartPlace() == 1) {
return R.ok();
--
Gitblit v1.9.1