From c7bcef9d03f58c984d475932710c247ee778d95b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 09 四月 2024 23:31:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   90 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 19 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 d8a80b1..8c59836 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -7,17 +7,14 @@
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.ToWmsDTO;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.TaskOverParam;
 import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.StaDescService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
@@ -31,7 +28,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 
@@ -47,6 +43,12 @@
 
     @Autowired
     private StaDescService staDescService;
+    @Autowired
+    private CommonService commonService;
+    @Autowired
+    private LocMastService locMastService;
+    @Autowired
+    private BasDevpService basDevpService;
 
 
 
@@ -60,7 +62,7 @@
 
 
     @Override
-    public R taskCreate(taskCreateParam param) {
+    public R taskCreate(TaskCreateParam param) {
         TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
         if (taskWrk != null) {
             throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
@@ -71,13 +73,16 @@
 
         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);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
         taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+        taskWrk.setWrkNo(workNo1);
         taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
         taskWrk.setCreateTime(now);
         taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
         taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
         taskWrk.setBarcode(param.getBarcode());//鏉$爜
-        taskWrk.setCrnNo(param.getCrn());
+        taskWrk.setCrnNo(locMast.getCrnNo());
         if(param.getIoType() == 1){
             taskWrk.setWrkSts(1);
             if (!Cools.isEmpty(param.getTargetPoint())) {
@@ -88,10 +93,16 @@
         } else if (param.getIoType() == 2) {
             taskWrk.setWrkSts(11);
             if (!Cools.isEmpty(param.getStartPoint())) {
-                taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
-                taskWrk.setOriginStartPoint(param.getStartPoint());
+                taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+                taskWrk.setTargetPoint(param.getTargetPoint());
             }
             taskWrk.setTargetPoint(param.getTargetPoint());
+        }else if (param.getIoType() == 3){
+            taskWrk.setWrkSts(11);
+            if (!Cools.isEmpty(param.getStartPoint())) {
+                taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+                taskWrk.setTargetPoint(param.getTargetPoint());
+            }
         }
 
 
@@ -144,7 +155,7 @@
                 ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                 ,null
                 ,"127.0.0.1"
-                ,JSON.toJSONString(param)
+                ,JSON.toJSONString(toWmsDTO)
                 ,response
                 ,true
         );
@@ -156,7 +167,7 @@
             WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
             String msg = null;
             try {
-                taskCreate(new taskCreateParam(data));
+                taskCreate(new TaskCreateParam(data));
             }catch (Exception e){
                 msg = e.getMessage();
             }
@@ -169,15 +180,22 @@
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .lt("crn_stn",200));
+                        .lt("stn_no",200));
+            }else if (param.getWharfSource().contains("H")){
+                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                        .eq("crn_no",data.getTaskTunnel())
+                        .eq("type_no",1)
+                        .lt("stn_no",400)
+                        .gt("stn_no",200));
             }else {
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .ge("crn_stn",200));
+                        .lt("stn_no",500)
+                        .ge("stn_no",400));
             }
-            //map1.put("taskTunnel", staDesc.getStnDesc());
-            map1.put("taskTunnel", "J-1104");
+            map1.put("taskTunnel", staDesc.getStnDesc());
+            //map1.put("taskTunnel", "J-1104");
             return R.ok(map1);
         }
         return R.error((String) jsonObject.get("msg"));
@@ -236,6 +254,40 @@
 
     }
 
+    @Override
+    public R getAgvPickAndPlaceV1(TaskOverParam param) {
+        BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+        if (Cools.isEmpty(basDevp)){
+            return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
+        }
+        if (param.getType()==0 && basDevp.getAgvStartPick()==1){
+            return R.ok();
+        }else if (param.getType()==1 && basDevp.getAgvStartPlace()==1){
+            return R.ok();
+        }else {
+            return R.error("涓嶅厑璁�");
+        }
+    }
+
+    @Override
+    public R getAgvPickAndPlaceV2(TaskOverParam param) {
+        BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+        if (Cools.isEmpty(basDevp)){
+            return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
+        }
+        if (param.getType()==0){
+            basDevp.setAgvTargetPick(1);
+            basDevpService.updateById(basDevp);
+            return R.ok();
+        }else if (param.getType()==1){
+            basDevp.setAgvTargetPlace(1);
+            basDevpService.updateById(basDevp);
+            return R.ok();
+        }else {
+            return R.error("璇锋眰绫诲瀷寮傚父"+param.getType());
+        }
+    }
+
     public List<Integer> getInEnableRoadway(){
         int[] roadway = null;
         List<Integer> list = new ArrayList<>();

--
Gitblit v1.9.1