From b13b6baf03a0860d0aa7fe7536bf2313588bf8ae Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 02 三月 2025 16:54:53 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 256 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 203 insertions(+), 53 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 ea0f316..2d41bc7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,28 +1,30 @@
package com.zy.asrs.task.handler;
+import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.ReportErpParam;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.service.erp.ErpService;
-import com.zy.common.service.erp.entity.VoucherDetail;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2020/7/7
@@ -32,8 +34,6 @@
public class OrderSyncHandler extends AbstractHandler<String> {
@Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
@@ -41,60 +41,210 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+
@Autowired
- private ErpService erpService;
+ private AgvWrkDetlLogService agvWrkDetlLogService;
+
+ @Autowired
+ private AgvWrkMastLogService agvWrkMastLogService;
+
+ @Autowired
+ private AgvLocMastService agvLocMastService;
+
+ @Value("${spring.profiles.active}")
+ private String active;
+
+ @Value("${u8.report}")
+ private Boolean report;
+
+ @Value("${u8.url}")
+ private String url;
+
+ @Value("${u8.orderReportPath}")
+ private String orderReportPath;
+
@Transactional
public ReturnT<String> start(Order order) {
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�"));
+
DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
+ if (!docNames.contains(docType.getDocName())) {
+ order.setSettle(8L);
+ orderService.updateById(order);
+ return SUCCESS;
+ } else {
+ boolean flag = true;
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> report = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getReportQty() == null || orderDetl.getQty() > orderDetl.getReportQty() || orderDetl.getQty() < orderDetl.getAnfme()) {
+ flag = false;
+ }
+ }
+ if (flag) {
+ log.info("鍗曟嵁瀹岀粨,{}", order);
+ order.setSettle(6L);
+ orderService.updateById(order);
+ }
return SUCCESS;
}
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- // 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
- try {
- // erp 鍚屾
- int state = 2;
- if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
- } else {
- erpService.updateTimeForVoucherDetail(order.getOrderNo());
- }
+ }
- } catch (Exception e) {
- log.error("fail", e);
- return FAIL.setMsg(e.getMessage());
+ @Transactional
+ public synchronized void timelyStart(Order order) {
+ if (!report) {
+ return;
+ }
+ if (order == null) {
+ return;
+ }
+ //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�"));
+ //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+
+
+ //if (docNames.contains(docType.getDocName())) {
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> report = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getQty() > 0 && orderDetl.getQty() > (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty())) {
+ report.add(orderDetl);
}
}
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- try {
- // erp 鍚屾
- int state = 2;
- if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
- } else {
- Date now = new Date();
- for (OrderDetl orderDetl : orderDetls) {
- VoucherDetail voucherDetail = new VoucherDetail();
- voucherDetail.setVoucherID(order.getOrderNo());
- voucherDetail.setPickID("fepvnn0496");
- voucherDetail.setBarcode(orderDetl.getBatch());
- voucherDetail.setBarcode(DateUtils.convert(now));
- if (!erpService.insertVoucherDetail(voucherDetail)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟娣诲姞VoucherDetail"+ JSON.toJSONString(voucherDetail)+"澶辫触");
- }
+ if (Cools.isEmpty(order.getPltType())) {
+ List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).orderBy("appe_time", false));
+ if (!Cools.isEmpty(agvWrkDetlLogs)) {
+ AgvWrkDetlLog agvWrkDetlLog = agvWrkDetlLogs.get(0);
+ List<AgvWrkMastLog> agvWrkMastLogs = agvWrkMastLogService.selectList(new EntityWrapper<AgvWrkMastLog>().eq("wrk_no", agvWrkDetlLog.getWrkNo()).eq("io_type", 1).orderBy("appe_time", false));
+ if (!Cools.isEmpty(agvWrkMastLogs)) {
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMastLogs.get(0).getLocNo());
+ if (agvLocMast != null) {
+ log.info("琛ュ厖閫昏緫鐢熸晥锛歿}", order.getOrderNo());
+ order.setPltType(agvLocMast.getPltType());
}
}
-
- } catch (Exception e) {
- log.error("fail", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ }
+ if (Cools.isEmpty(order.getPltType())) {
+ return;
}
}
- return SUCCESS;
+ if (Cools.isEmpty(order.getInTime())) {
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ }
+ if (!Cools.isEmpty(report)) {
+ ReportErpParam param = new ReportErpParam();
+ mappingParam(order, param);
+ mappingParamChildren(report, param);
+ log.info(JSON.toJSONString(param));
+ int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
+ if (code == 0) {
+ Date date = new Date();
+ order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
+ orderService.updateById(order);
+ for (OrderDetl orderDetl : report) {
+ log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
+ orderDetl.setReportQty(orderDetl.getQty());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
+ }
+ }
+ // }
+
+ }
+ }
+
+ public void mappingParam(Order order, ReportErpParam param) {
+ if (active.equals("prod")) {
+ param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ } else if (active.equals("dev") || active.equals("loc")) {
+ param.set鎿嶄綔绯荤粺鍙�("998");
+ } else {
+ param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ }
+ param.set鎿嶄綔鍗曟嵁(order.getDocType$());
+ param.set鎿嶄綔绫诲瀷("add");
+ param.setDdate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
+ param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
+ param.setCDepCode("YZ");
+ param.setCOrderCode(order.getOrderNo());
+ param.setCMaker("");
+ param.setCHandler("");
+ param.setCDefine14(order.getOrderNo() + "_" + order.getInTime());
+ //param.setCDefine14(order.getOrderNo() + "_" + order.getInTime() + "_" + order.getPltType()));
+ }
+
+ public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
+ List<ReportErpParam.ChildInfo> paramChild = new ArrayList<>();
+ param.setChildren(paramChild);
+ for (OrderDetl orderDetl : orderDetlList) {
+ ReportErpParam.ChildInfo childInfo = new ReportErpParam.ChildInfo();
+ childInfo.setIrowno(orderDetl.getItemNum());
+ childInfo.setCInvCode(orderDetl.getMatnr());
+ childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
+ String batch = orderDetl.getBatch();
+ if (Cools.isEmpty(batch)) {
+ childInfo.setCBatch("");
+ childInfo.setBFree1("");
+ } else {
+ String[] s = batch.split("__");
+ if (s.length > 1) {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1(s[1]);
+ } else if (s.length == 1) {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ } else {
+ childInfo.setCBatch("");
+ childInfo.setBFree1("");
+ }
+ }
+ childInfo.setINum(orderDetl.getLength() + "");
+ childInfo.setIinvexchrate("");
+ childInfo.setIPOsID(orderDetl.getSku());
+ childInfo.setCOrderCode(orderDetl.getOrderNo());
+ childInfo.setIvouchrowno(orderDetl.getItemNum());
+ childInfo.setDefine22(orderDetl.getThreeCode());
+ if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
+ BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
+ childInfo.setINum(mul.toString());
+ } else {
+ childInfo.setINum("1");
+ }
+ childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
+ paramChild.add(childInfo);
+ }
+
+ }
+
+
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String
+ ip) {
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder().setUri(url).setTimeout(30, TimeUnit.SECONDS).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (Cools.isEmpty(jsonObject.get("succeed"))) {
+ throw new CoolException(jsonObject.get("dsc").toString());
+ }
+
+ String succeed = jsonObject.get("succeed").toString();
+
+ int code = Cools.eq("0", succeed) ? 0 : 1;
+ if (code != 0) {
+ throw new CoolException(jsonObject.get("dsc").toString());
+ }
+ success = true;
+ return code;
+ } catch (Exception e) {
+ log.error("鎶ラ敊淇℃伅:{},{}", e.getMessage(), JSON.toJSONString(requestParam));
+ throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ } finally {
+ apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
+ }
+
}
}
--
Gitblit v1.9.1