From 688e299d29bd76cbd30bf3d7267bdc9afad954b0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 13 五月 2025 17:24:04 +0800
Subject: [PATCH] excel导入堆垛机异常码

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 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..6ed1e22 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -78,14 +78,7 @@
         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 +92,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 +263,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