From 2553ff09b3dc2523d6d8e19762a0aea1eafd73af Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 07 三月 2025 17:01:46 +0800
Subject: [PATCH] 初始化立福德wcs

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 58df8a5..e6eb109 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -233,6 +233,7 @@
                                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                             HashMap<String, Object> hashMap = new HashMap<>();
                                             hashMap.put("TaskNo", taskWrk.getTaskNo());
+                                            Boolean bool = false;
                                             try {
                                                 //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
                                                 response = new HttpHandler.Builder()
@@ -242,10 +243,14 @@
                                                         .build()
                                                         .doPost();
                                                 JSONObject jsonObject1 = JSON.parseObject(response);
-                                                Boolean bool = false;
+
                                                 if (jsonObject1.get("ReturnStatus").equals(0)) {
                                                     bool = true;
                                                 }
+
+                                            } catch (Exception e) {
+
+                                            }finally {
                                                 apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
                                                         , wmsUrl + TaskExecCallback
                                                         , null
@@ -254,8 +259,6 @@
                                                         , response
                                                         , bool
                                                 );
-                                            } catch (Exception e) {
-
                                             }
                                         }
                                     } else {
@@ -355,7 +358,7 @@
                             if (offer) {
                                 log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
                                 taskWrk.setStatus(5);
-                                taskWrk.setWrkSts(14);
+                                taskWrk.setWrkSts(16);
                                 taskWrkService.updateById(taskWrk);
 
                             } else {
@@ -441,7 +444,7 @@
 
                     if(jsonObject.get("code").equals(200)){
                         bool = true;
-                        taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+//                        taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
                         taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
                         taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鎴愬姛涓嬪彂鍏ュ簱浠诲姟缁橰CS
                         taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
@@ -518,6 +521,46 @@
                             break;
                         }
 
+                        String mbz=taskWrk.getTargetPoint().substring(5);
+
+                        HashMap<String, Object> hashMap = new HashMap<>();
+                        hashMap.put("taskNo",taskWrk.getTaskNo());//wms浠诲姟鍙�
+                        hashMap.put("sourceStaNo",staDetl.getDevNo());//婧愮珯鐐�
+                        hashMap.put("staNo",Integer.parseInt(mbz)+"");//鐩爣绔�
+                        hashMap.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+                        String response = "";
+                        Boolean bool = false;
+                        try {
+                            //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+                            response = new HttpHandler.Builder()
+                                    .setUri(wcsUrl)
+                                    .setPath(wcsInboundTaskApplyPath)
+                                    .setJson(JSON.toJSONString(hashMap))
+                                    .build()
+                                    .doPost();
+                            JSONObject jsonObject = JSON.parseObject(response);
+
+                            if(jsonObject.get("code").equals(200)){
+                                bool = true;
+//                        taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+                                taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+                                taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鎴愬姛涓嬪彂鍏ュ簱浠诲姟缁橰CS
+                                taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+                                taskWrk.setModiTime(new Date());
+                                taskWrk.setModiUser(9988L);
+                            }
+                        } catch (Exception e) {
+                        }finally {
+                            apiLogService.save("wcs娲惧彂鍑哄簱浠诲姟缁橰CS"
+                                    , wcsUrl + wcsInboundTaskApplyPath
+                                    , null
+                                    , "127.0.0.1"
+                                    , JSON.toJSONString(hashMap)
+                                    , response
+                                    , bool
+                            );
+                        }
+
                         try {
                             // 淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
                             Date now = new Date();

--
Gitblit v1.9.1