From 44b1707488d1965a83424cf192db6ba799086b94 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 四月 2022 10:38:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/CoolExceptionHandler.java | 4 +
src/main/java/com/zy/common/model/MesCombParam.java | 43 ++++++++++++++
src/main/java/com/zy/common/constant/MesConstant.java | 13 ++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 36 +++++++++++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 25 ++++++-
5 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e3610f2..f346e05 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,5 +1,7 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -11,8 +13,11 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.*;
+import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.MesCombParam;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -277,7 +282,36 @@
});
if (packDown) {
- // 鏁版嵁涓婃姤 todo
+ MesCombParam mesCombParam = new MesCombParam();
+ mesCombParam.setZpallet(param.getBarcode());
+ mesCombParam.setCombTime(DateUtils.convert(now));
+ mesCombParam.setLgort("5008");
+ for (DetlDto detlDto : detlDtos) {
+ mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getMatnr(), detlDto.getAnfme()));
+ }
+ System.out.println(JSON.toJSONString(mesCombParam));
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(MesConstant.PACK_DOWN_URL)
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛�");
+// log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+
}
// 鐢熸垚鍏ュ簱鍗曟嵁
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index cf74bfc..05d7cba 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,14 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* Created by vincent on 2020/7/7
@@ -28,12 +32,23 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void completeAndReport(){
-// for (WrkMast wrkMast : wrkMasts) {
-// ReturnT<String> result = workLogHandler.start(wrkMast);
-// if (!result.isSuccess()) {
-// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ // 鎵�鏈夎鍗�
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ for (Order order : orders) {
+// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+// results.add(result);
+// result.setOrderNo(order.getOrderNo());
+// result.setOrderTime(order.getOrderTime());
+// result.setOrderType(order.getDocType$());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// for (OrderDetl orderDetl : orderDetls) {
+// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
// }
-// }
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ }
}
}
diff --git a/src/main/java/com/zy/common/config/CoolExceptionHandler.java b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
index 9a6fe2d..851ab72 100644
--- a/src/main/java/com/zy/common/config/CoolExceptionHandler.java
+++ b/src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -26,6 +26,10 @@
@ExceptionHandler(CoolException.class)
public R handleRRException(CoolException e) {
+ String[] split = e.getMessage().split("-");
+ if (split.length > 2) {
+ return R.error(e.getMessage());
+ }
return R.parse(e.getMessage());
}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
new file mode 100644
index 0000000..db2a78c
--- /dev/null
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -0,0 +1,13 @@
+package com.zy.common.constant;
+
+/**
+ * Created by vincent on 2022/4/21
+ */
+public class MesConstant {
+
+
+ public static final String URL = "http://192.168.1.72:8301";
+
+ public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";
+
+}
diff --git a/src/main/java/com/zy/common/model/MesCombParam.java b/src/main/java/com/zy/common/model/MesCombParam.java
new file mode 100644
index 0000000..728f04a
--- /dev/null
+++ b/src/main/java/com/zy/common/model/MesCombParam.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 MesCombParam {
+
+ // 鎵樼洏鏉＄爜
+ private String zpallet;
+
+ // 甯墭鏃堕棿
+ private String combTime;
+
+ // 浠撳簱缂栧彿 - 鍐欐
+ private String lgort;
+
+ 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