From 6cfcb307f01b9550b6cd67321f2c1db345b4da19 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 13 一月 2025 16:07:21 +0800
Subject: [PATCH] 优化自动移库逻辑及调拨信息上报
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 134 +++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 46 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 fb9bfd8..44d8f61 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,18 +1,15 @@
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.entity.*;
import com.zy.asrs.entity.param.ReportErpParam;
-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.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
@@ -22,10 +19,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+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
@@ -43,6 +42,21 @@
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ 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;
@@ -51,48 +65,39 @@
@Transactional
public ReturnT<String> start(Order order) {
- //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (!docNames.contains(docType.getDocName())) {
order.setSettle(8L);
orderService.updateById(order);
return SUCCESS;
- }
-// if("鎵嬪姩鍑哄簱鍗�".equals(docType.getDocName())
-// || "鎵嬪姩鍏ュ簱鍗�".equals(docType.getDocName())
-// || "鑷姩琛ヨ揣鍗�".equals(docType.getDocName())
-// || "浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
-// order.setSettle(8L);
-// orderService.updateById(order);
-// return SUCCESS;
-// }
-
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
-
- ReportErpParam param = new ReportErpParam();
- mappingParam(order, param);
- mappingParamChildren(orderDetlList, param);
- if (Cools.isEmpty(order.getPltType())) {
+ } 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;
}
-
- int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
- if (code == 0) {
- log.info("鍗曟嵁瀹℃牳,{}", order);
- order.setSettle(6L);
- orderService.updateById(order);
- }
-
- return SUCCESS;
}
-
@Transactional
- public void timelyStart(Order order) {
+ public synchronized void timelyStart(Order order) {
+ if (!report) {
+ return;
+ }
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�"));
+ //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (docNames.contains(docType.getDocName())) {
@@ -104,7 +109,24 @@
}
}
if (Cools.isEmpty(order.getPltType())) {
- return;
+ 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());
+ }
+ }
+ }
+ if (Cools.isEmpty(order.getPltType())) {
+ return;
+ }
+ }
+ if (Cools.isEmpty(order.getInTime())) {
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
}
if (!Cools.isEmpty(report)) {
ReportErpParam param = new ReportErpParam();
@@ -113,9 +135,13 @@
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);
}
}
@@ -125,17 +151,23 @@
}
public void mappingParam(Order order, ReportErpParam param) {
- //param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
- param.set鎿嶄綔绯荤粺鍙�("998");
+ 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(order.getInTime());
+ 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() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
+ param.setCDefine14(order.getOrderNo() + "_" + order.getInTime());
+ //param.setCDefine14(order.getOrderNo() + "_" + order.getInTime() + "_" + order.getPltType()));
}
public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
@@ -155,8 +187,11 @@
if (s.length > 1) {
childInfo.setCBatch(s[0]);
childInfo.setBFree1(s[1]);
- } else {
+ } else if (s.length == 1) {
childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ } else {
+ childInfo.setCBatch("");
childInfo.setBFree1("");
}
}
@@ -166,19 +201,26 @@
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) {
+ 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).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
+ 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"))) {
--
Gitblit v1.9.1