From 7d4305717a994f790f9de12ea0b292f525567950 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 24 四月 2022 23:49:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/constant/MesConstant.java | 2 +
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 48 +++++++++++++++++++++++
src/main/java/com/zy/common/model/MesPakoutParam.java | 43 +++++++++++++++++++++
3 files changed, 92 insertions(+), 1 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 a94b4bd..0080271 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -16,6 +16,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
+import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -101,7 +102,52 @@
}
// 鍑哄簱瀹屾垚涓婃姤
if (docType.getPakout() == 1) {
- // todo
+ MesPakoutParam pakoutParam = new MesPakoutParam();
+ pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime())); // todo:luxiaotao
+ pakoutParam.setLgortFrom("5008"); // todo:luxiaotao
+ pakoutParam.setLgortTo("5006"); // todo:luxiaotao
+ for (OrderDetl orderDetl : orderDetls) {
+ String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+ pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ }
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(MesConstant.PAKOUT_URL) // todo:luxiaotao
+ .setJson(JSON.toJSONString(pakoutParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳嚭搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKOUT_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(pakoutParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
}
return SUCCESS;
}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index d69c1d2..ea948ae 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -12,4 +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";
+
}
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
new file mode 100644
index 0000000..c59b573
--- /dev/null
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -0,0 +1,43 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/21
+ */
+@Data
+public class MesPakoutParam {
+
+ // 鍏ュ簱鏃堕棿
+ private String pakoutTime;
+
+ // 鏉ユ簮鍦� - 鍐欐
+ private String lgortFrom;
+
+ // 鐩殑鍦� - 鍐欐
+ private String lgortTo;
+
+ private List<Detl> list = new ArrayList<>();
+
+ @Data
+ public static class Detl {
+
+ // 鐗╂枡鏉＄爜
+ private String barcode;
+
+ // 鏁伴噺
+ private Double anfme;
+
+ public Detl() {
+ }
+
+ public Detl(String barcode, Double anfme) {
+ this.barcode = barcode;
+ this.anfme = anfme;
+ }
+ }
+
+}
--
Gitblit v1.9.1