From 4530cb8f0e65de9079e64409f92741c03232c38c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 四月 2022 14:05:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/constant/MesConstant.java        |    2 +-
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |    9 +++++----
 src/main/java/com/zy/common/model/MesPakoutParam.java        |   22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 64a30fd..c576799 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -106,9 +106,10 @@
                 return SUCCESS;
             }
             MesPakoutParam pakoutParam = new MesPakoutParam();
-            pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));    // todo:luxiaotao
-            pakoutParam.setLgortFrom("5008");   // todo:luxiaotao
-            pakoutParam.setLgortTo("5006");   // todo:luxiaotao
+            pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
+            pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
+            pakoutParam.setLgortFrom("5006");
+            pakoutParam.setLgortTo("1111");
             pakoutParam.setOrderNo(order.getOrderNo());
             for (OrderDetl orderDetl : orderDetls) {
                 String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
@@ -119,7 +120,7 @@
             try {
                 response = new HttpHandler.Builder()
                         .setUri(MesConstant.URL)
-                        .setPath(MesConstant.PAKOUT_URL)    // todo:luxiaotao
+                        .setPath(MesConstant.PAKOUT_URL)
                         .setJson(JSON.toJSONString(pakoutParam))
                         .build()
                         .doPost();
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index ea948ae..25592ab 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -12,6 +12,6 @@
 
     public static final String PAKIN_URL = "mes/api/zy/v1/warehouse/sendList";
 
-    public static final String PAKOUT_URL = "mes/api/zy/v1/warehous1e/sendList";
+    public static final String PAKOUT_URL = "wmsFinprd/api/zy/v1/packOut/sendList";
 
 }
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
index e9a9449..4a55967 100644
--- a/src/main/java/com/zy/common/model/MesPakoutParam.java
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -1,8 +1,11 @@
 package com.zy.common.model;
 
+import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -10,6 +13,9 @@
  */
 @Data
 public class MesPakoutParam {
+
+    // true: 璁㈠崟鍑�; false: 鎵嬪姩鍑�
+    private boolean tag;
 
     // 鍗曟嵁缂栧彿
     private String orderNo;
@@ -43,4 +49,20 @@
         }
     }
 
+    public static void main(String[] args) {
+        MesPakoutParam param = new MesPakoutParam();
+        param.setTag(true);
+        param.setOrderNo("8136024");
+        param.setPakoutTime(DateUtils.convert(new Date()));
+        param.setLgortFrom("5006");
+        param.setLgortTo("1111");
+
+
+        Detl detl = new Detl();  param.getList().add(detl);
+        detl.setBarcode("15099-10000-23132132");
+        detl.setAnfme(1.0D);
+
+        System.out.println(JSON.toJSONString(param));
+    }
+
 }

--
Gitblit v1.9.1