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 | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 39 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 c6b0474..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;
@@ -51,7 +54,12 @@
@Autowired
private DocTypeService docTypeService;
+ @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");
@@ -59,6 +67,12 @@
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;
@@ -176,6 +190,7 @@
return SUCCESS;
}
+ @Transactional
public void startNew(Map.Entry<String, List<Order>> orderMap) {
String docName = orderMap.getKey();
List<Order> value = orderMap.getValue();
@@ -205,6 +220,10 @@
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);
@@ -252,14 +271,17 @@
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);
@@ -280,13 +302,16 @@
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.setAutoidSo(orderDetl.getSku());
- item.setSoautoidcol("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);
@@ -306,13 +331,16 @@
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);
@@ -333,13 +361,16 @@
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.setAutoidAll(orderDetl.getSku());
- item.setAllcautoidcol("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);
@@ -359,11 +390,14 @@
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);
@@ -383,11 +417,14 @@
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