From aca94963ca944c256c4ef69d0316a2e8d6ccbc62 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 11 四月 2026 16:35:32 +0800
Subject: [PATCH] 单据上报U8批次
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 188 ++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 75 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 750920d..8f8f8b8 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,15 +2,18 @@
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.OrderReport;
import com.zy.asrs.entity.u8.ReportU8Vo;
import com.zy.asrs.entity.u8.U8ResultVo;
import com.zy.asrs.mapper.OrderMapper;
+import com.zy.asrs.mapper.OrderReportMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
@@ -30,6 +33,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -50,14 +54,25 @@
@Autowired
private DocTypeService docTypeService;
- private static final String baseUrl = "127.0.0.1:8081/jsjwms/open/asrs";
+ @Resource
+ private OrderReportMapper orderReportMapper;
+
+ private static final String baseUrl = "192.168.4.189:10006/api/U8Server";
+// private static final String baseUrl = "127.0.0.1:8080/jsjwms/open/asrs";
+
private static final Map<String, String> pathMap = new HashMap<String, String>() {{
- put("閲囪喘鍏ュ簱", "/purchasein_import");
- put("閿�鍞嚭搴�", "/saleout_import");
- put("浜ф垚鍝佸叆搴撳崟", "/productin_import");
- put("鏉愭枡鍑哄簱鍗�", "/materialout_import");
+ put("閲囪喘鍒拌揣鍗�", "/purchasein_import");
+ put("閿�鍞彂璐у崟", "/saleout_import");
+ put("鐢熶骇璁㈠崟", "/productin_import");
+ put("棰嗘枡鐢宠鍗�", "/materialout_import");
put("鍏朵粬鍏ュ簱鍗�", "/otherin_import");
put("鍏朵粬鍑哄簱鍗�", "/otherout_import");
+// put("閲囪喘鍒拌揣鍗�", "/purchasein_import");
+// put("閿�鍞彂璐у崟", "/purchasein_import");
+// put("鐢熶骇璁㈠崟", "/purchasein_import");
+// put("棰嗘枡鐢宠鍗�", "/purchasein_import");
+// put("鍏朵粬鍏ュ簱鍗�", "/purchasein_import");
+// put("鍏朵粬鍑哄簱鍗�", "/purchasein_import");
}};
@Resource
private OrderMapper orderMapper;
@@ -175,6 +190,7 @@
return SUCCESS;
}
+ @Transactional
public void startNew(Map.Entry<String, List<Order>> orderMap) {
String docName = orderMap.getKey();
List<Order> value = orderMap.getValue();
@@ -196,6 +212,7 @@
.setUri(baseUrl)
.setPath(path)
.setJson(requestJson)
+ .setTimeout(60, TimeUnit.SECONDS)
.build()
.doPost();
List<U8ResultVo> list = JSON.parseArray(response, U8ResultVo.class);
@@ -203,9 +220,13 @@
List<String> successReceiptNos = list.stream().filter(u8ResultVo -> "T".equals(u8ResultVo.getResult())).map(U8ResultVo::getReceiptNo).collect(Collectors.toList());
if (!successReceiptNos.isEmpty()) {
orderMapper.batchUpdateSettleByOrderNos(successReceiptNos);
+ // 涓婃姤琛ㄨ浆鍘嗗彶
+ orderReportMapper.moveToLog(successReceiptNos);
+ // 鍒犻櫎涓婃姤琛ㄦ暟鎹�
+ orderReportMapper.delete(new EntityWrapper<OrderReport>().in("order_no",successReceiptNos));
+ success = true;
}
log.info("鍗曟嵁涓婃姤鎴愬姛锛屽崟鎹紪鍙凤細{}", successReceiptNos);
- success = true;
} else {
errorMsg = response;
log.error(nameSpaces + "璋冪敤澶栭儴鎺ュ彛澶辫触锛寀rl锛歿}锛宺equest锛歿}锛宺esponse锛歿}", url, requestJson, response);
@@ -235,110 +256,121 @@
List<ReportU8Vo> list = new ArrayList<>();
String now = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
switch (docName) {
- case "閲囪喘鍏ュ簱":
+ case "閲囪喘鍒拌揣鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
+ reportU8Vo.setCgltype(docName);
reportU8Vo.setCwhcode("103");
reportU8Vo.setCrdcode("101");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
String docType$ = order.getDocType$();
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setAutoidPo(orderDetl.getSku());
- item.setPoautoidcol(docType$.equals("閲囪喘璁㈠崟") ? "ID" : docType$.equals("閲囪喘鍒拌揣鍗�") || docType$.equals("濮斿鍒拌揣鍗�") ? "Autoid" :
- docType$.equals("濮斿璁㈠崟") ? "MODetailsID" : "");
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setAutoidPo(orderDetl.getSku());
+ item.setPoautoidcol(docType$.equals("閲囪喘璁㈠崟") ? "ID" : docType$.equals("閲囪喘鍒拌揣鍗�") || docType$.equals("濮斿鍒拌揣鍗�") ? "Autoid" :
+ docType$.equals("濮斿璁㈠崟") ? "MODetailsID" : "");
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
}
break;
- case "閿�鍞嚭搴�":
+ case "閿�鍞彂璐у崟":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("101");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("203");
reportU8Vo.setCrdcode("201");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- String docType$ = order.getDocType$();
+// String docType$ = order.getDocType$();
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setAutoidSo(orderDetl.getSku());
- item.setSoautoidcol(docType$.equals("鍙戣揣鍗�") ? "IDLSID" : "");
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setAutoidSo(orderDetl.getSku());
+ item.setSoautoidcol("IDLSID");
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
}
break;
- case "浜ф垚鍝佸叆搴撳崟":
+ case "鐢熶骇璁㈠崟":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
+ reportU8Vo.setCgltype(docName);
reportU8Vo.setCwhcode("101");
- reportU8Vo.setCrdcode("201");
- reportU8Vo.setCmaker(order.getCreateBy$());
+ reportU8Vo.setCrdcode("102");
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setAutoidMo(orderDetl.getSku());
- item.setMoautoidcol("MODID");
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setAutoidMo(orderDetl.getSku());
+ item.setMoautoidcol("MODID");
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
}
break;
- case "鏉愭枡鍑哄簱鍗�":
+ case "棰嗘枡鐢宠鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("5");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("203");
reportU8Vo.setCrdcode("202");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- String docType$ = order.getDocType$();
+// String docType$ = order.getDocType$();
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setAutoidAll(orderDetl.getSku());
- item.setAllcautoidcol(docType$.equals("鐢熶骇璁㈠崟") ? "AllocateId" : docType$.equals("濮斿璁㈠崟") ? "MOMaterialsID" :
- docType$.equals("棰嗘枡鐢宠鍗�") ? "AutoID" : "");
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setAutoidAll(orderDetl.getSku());
+ item.setAllcautoidcol("AutoID");
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
@@ -347,22 +379,25 @@
case "鍏朵粬鍏ュ簱鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("109");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("201");
reportU8Vo.setCrdcode("199");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
@@ -371,22 +406,25 @@
case "鍏朵粬鍑哄簱鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("109");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("201");
reportU8Vo.setCrdcode("299");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetlList) {
- ReportU8Vo.Item item = new ReportU8Vo.Item();
- item.setCinvcode(orderDetl.getMatnr());
- item.setIquantity(orderDetl.getQty());
- item.setCbatch(orderDetl.getBatch());
- itemList.add(item);
+ List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());
+ for(OrderReport orderReport: orderReports) {
+ ReportU8Vo.Item item = new ReportU8Vo.Item();
+ item.setCinvcode(orderDetl.getMatnr());
+ item.setIquantity(orderReport.getAnfme());
+ item.setCbatch(orderReport.getBatch());
+ itemList.add(item);
+ }
}
reportU8Vo.setDetailList(itemList);
list.add(reportU8Vo);
--
Gitblit v1.9.1