From edbf54064b70a6311a98eeefc7516a35287e6b44 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 08 五月 2022 15:28:00 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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..680cbb7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -102,13 +102,11 @@
         }
         // 鍑哄簱瀹屾垚涓婃姤
         if (docType.getPakout() == 1) {
-            if (true) {
-                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 +117,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();

--
Gitblit v1.9.1