From 53d654e7261e53f3ac7d85c77602e8b34c394297 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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 1e47661..d66fbfc 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,20 +1,15 @@
package com.zy.asrs.task.handler;
import cn.hutool.core.util.NumberUtil;
-import com.alibaba.excel.util.NumberUtils;
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;
@@ -29,6 +24,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2020/7/7
@@ -46,8 +42,20 @@
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private AgvWrkDetlLogService agvWrkDetlLogService;
+
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+
+ @Autowired
+ private AgvLocMastService agvLocMastService;
+
@Value("${spring.profiles.active}")
private String active;
+
+ @Value("${u8.report}")
+ private Boolean report;
@Value("${u8.url}")
private String url;
@@ -83,9 +91,13 @@
}
@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())) {
@@ -97,7 +109,22 @@
}
}
if (Cools.isEmpty(order.getPltType())) {
- return;
+ List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).eq("io_type", 1));
+ if (!Cools.isEmpty(agvWrkDetlLogs)) {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectById(agvWrkDetlLogs.get(0).getWrkNo());
+ if (agvWrkMast != null) {
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+ if (agvLocMast != null) {
+ 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();
@@ -106,9 +133,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);
}
}
@@ -127,13 +158,14 @@
}
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) {
@@ -186,7 +218,7 @@
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