From 91eca979b480dff62809368a5c6563c9e0fcc851 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 08 六月 2025 08:29:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
index 3295e25..ccd60a7 100644
--- a/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
@@ -32,35 +32,41 @@
     private String wcsmovePath;
     @Value("${wcs.outboundTaskRequest}")
     private String wcsoutboundTaskRequest;
+    @Value("${wcs.inboundTaskApplyPathWcs}")
+    private String inboundTaskApplyPathWcs;
     @Value("${wms.TaskExecCallback}")
     private String TaskExecCallback;
     @Value("${wms.taskStatusFeedbackPath}")
     private String taskStatusFeedbackPath;
 
     /**
-     * 鑷姩娲惧彂鍑哄簱浠诲姟缁橰CS
+     * 鑷姩娲惧彂浠诲姟缁橰CS
      *
      * @throws IOException
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
-        if(true){
+        if(false){
             List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>()
-                    .eq("wrk_sts",1).eq("io_type",3));
+                    .eq("wrk_sts",1));
             for(TaskWrk taskWrk:taskWrks){
                 HashMap<String, Object> headParam = new HashMap<>();
                 String response = "";
                 Boolean bool = false;
                 String dz="";
-                if(taskWrk.getIoType()==2){
+                if(taskWrk.getIoType()==1){//鍏ュ簱
+                    dz=inboundTaskApplyPathWcs;
+                    headParam.put("sourceStaNo", taskWrk.getStartPoint());//婧愮珯
+                    headParam.put("staNo", taskWrk.getTargetPoint());//鐩爣绔�
+                }else if(taskWrk.getIoType()==2){//鍑哄簱
                     dz=wcsoutboundTaskRequest;
-                }else{
+                }else if(taskWrk.getIoType()==3){//绉诲簱
                     dz=wcsmovePath;
+                    headParam.put("sourceLocNo",taskWrk.getStartPoint());//婧愬簱浣�
                 }
                 try {
                     headParam.put("taskNo", taskWrk.getTaskNo());
-                    headParam.put("sourceLocNo",taskWrk.getStartPoint());//婧愬簱浣�
-                    headParam.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+                    headParam.put("locNo",taskWrk.getOriginTargetPoint());//鐩爣搴撲綅
                     log.info("wcs娲惧彂浠诲姟缁橰CS鍑哄簱={}", taskWrk);
                     response = new HttpHandler.Builder()
                             // .setHeaders(headParam)
@@ -71,8 +77,14 @@
                             .doPost();
                     JSONObject jsonObject = JSON.parseObject(response);
                     if(jsonObject.get("code").equals(200)){
-                        //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍑哄簱浠诲姟
-                        taskWrk.setWrkSts(2);
+                        //娲惧彂浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍑哄簱浠诲姟
+                        if(taskWrk.getIoType()==1){
+                            taskWrk.setWrkSts(3);
+                        }else if(taskWrk.getIoType()==2){
+                            taskWrk.setWrkSts(12);
+                        }else if(taskWrk.getIoType()==3){
+                            taskWrk.setWrkSts(3);
+                        }
                         taskWrkService.updateById(taskWrk);
                         bool = true;
                     }

--
Gitblit v1.9.1