From 383c6139926563f02fba4432effbfc27f87d88c5 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期三, 30 七月 2025 14:36:57 +0800
Subject: [PATCH] ERP对接
---
src/main/java/com/zy/asrs/task/ERPReportScheduler.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
index 7005ede..9292c76 100644
--- a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
@@ -64,6 +64,9 @@
if(wrkDetls!=null&&wrkDetls.size()>0){
List<LinkedHashMap<String,Object>> datas=new ArrayList<>();
for(WrkDetl wrkDetl:wrkDetls){
+ if(Cools.isEmpty(wrkDetl.getOrderNo())){
+ continue;
+ }
OrderDetl orderDetl= orderDetlService.selectItem(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
if(orderDetl==null){
log.error("orderNo={}锛宮atnr={}锛宐atch={}锛屾病鏈夋煡璇㈠埌璁㈠崟鏄庣粏",wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
@@ -76,22 +79,35 @@
}
DocType docType = docTypeService.selectById(order.getDocType());//鍗曟嵁缂栧彿
LinkedHashMap<String,Object> map=new LinkedHashMap<>();
- map.put("orgNo",orderDetl.getManu());//缁勭粐缂栫爜
+ if(wrkMast.getIoType()<50){
+ map.put("orgNo",orderDetl.getManu());//缁勭粐缂栫爜
+ map.put("docType",docType.getMemo());
+ map.put("cellNo",orderDetl.getBrand());
+ }else{
+ map.put("orgNo","2");//缁勭粐缂栫爜
+ int i = orderDetl.getOrderNo().indexOf("5D");
+ if(i!=-1){
+ map.put("docType","B064");
+ }else{
+ map.put("docType","D001");
+ }
+ map.put("cellNo","L01A20");
+ }
+
map.put("docNo",orderDetl.getOrderNo());
- map.put("docType",docType.getMemo());
map.put("docSeqNo",orderDetl.getModel());
map.put("itemNo",orderDetl.getMatnr());
map.put("qty",wrkDetl.getAnfme());
map.put("unitNo",orderDetl.getUnit());
map.put("warehouseNo","02201");
- map.put("cellNo",orderDetl.getBrand());
+
map.put("combinationLotNo",String.valueOf(orderDetl.getBatch()));
map.put("barcode",wrkDetl.getMatnr());
datas.add(map);
}
String path= "";
String work= "";
- if(wrkMast.getIoType()<100){
+ if(wrkMast.getIoType()<50){
path=inReportAddress;
work="鍏ュ簱";
}else{
@@ -101,6 +117,7 @@
path=outReportAddress;
HashMap<String,Object> map=new HashMap<>();
map.put("data",datas);
+ System.out.println(map.toString());
//涓婃姤ERP
String response = "";
boolean success = false;
--
Gitblit v1.9.1