From 184980deb3f854a98eb112e7998875113ebbba9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 17:10:39 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 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 150385a..d78e95c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -73,8 +73,12 @@
 
         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);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+        int workNo1 = 0;//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+        if (param.getIoType() .equals(1)){
+            workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);
+        } else {
+            workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);
+        }
         taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
         taskWrk.setWrkNo(workNo1);
         taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
@@ -82,23 +86,28 @@
         taskWrk.setModiTime(now);
         taskWrk.setAssignTime(new Date());
         taskWrk.setModiUser(6666L);
-        try{
-            if (param.getIoType()>1){
-                if (Utils.locNoRowBoolean(locMast.getRow1())){
-                    param.setTaskPriority(11);
-                }
-            }
-        }catch (Exception e){
-        }
+//        try{
+//            if (param.getIoType()>1){
+//                LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint()));
+//                if (Utils.locNoRowBoolean(locMast.getRow1())){
+//                      param.setTaskPriority(11);
+//                }
+//            }
+//        }catch (Exception e){
+//        }
+        taskWrk.setIoPri(param.getTaskPriority());
+
         taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
         taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
         taskWrk.setBarcode(param.getBarcode());//鏉$爜
-        taskWrk.setCrnNo(locMast.getCrnNo());
+        taskWrk.setCrnNo(param.getCrn());
         if(param.getIoType() == 1){
             taskWrk.setWrkSts(1);
             if (!Cools.isEmpty(param.getTargetPoint())) {
-                taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
-                taskWrk.setOriginTargetPoint(param.getTargetPoint());
+//                taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣  杞崲涓�
+                taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+                taskWrk.setStartPoint(param.getStartPoint());
+                taskWrk.setOriginStartPoint(param.getStartPoint());
             }
 
         } else if (param.getIoType() == 2) {

--
Gitblit v1.9.1