From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index eea2467..1eb192a 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -99,6 +99,9 @@
docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
}
String FDocumentStatus=null;
+ if (Arrays.asList("INR").contains(kingDeeUtilType.formId)) {
+ continue;
+ }
//鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
JSONObject jsonObject = new JSONObject();
String path = null;
@@ -131,7 +134,7 @@
// jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
jsonObject.put("start_biztime", "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
- jsonObject.put("billno", "CGSL-251125-000001");
+ jsonObject.put("billno", null);
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
jsonObject.put("end_auditdate", sdf1.format(now));
@@ -203,6 +206,9 @@
Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;
Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;
// 鐢熸垚鍟嗗搧妗ｆ
+ Double height1 = height*10;
+ Double width1 = width*10;
+ Double length1 = length*10;
Mat mat = matService.selectByMatnr(matnr);
if (mat == null) {
mat = new Mat();
@@ -211,9 +217,9 @@
mat.setTagId(tag.getId());
mat.setWeight(grossweight);//鍑�閲�
mat.setUnits(netweight);//姣涢噸
- mat.setManLength(length*10);
- mat.setHeight(height*10);
- mat.setWidth(width*10);
+ mat.setManLength(length1);
+ mat.setHeight(height1);
+ mat.setWidth(width1);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
@@ -347,6 +353,7 @@
String billNo = jsonObjectNew.get("billno").toString();//鍗曟嵁缂栧彿
String owner = jsonObjectNew.get("org_name").toString();//璐т富鍚嶇О
String ownerUuid = jsonObjectNew.get("org_number").toString();//erp璐т富缂栧彿
+ String orderId = jsonObjectNew.get("id").toString();
JSONObject detailParam = new JSONObject();
JSONObject dataObj = new JSONObject();
dataObj.put("billno", billNo);
@@ -388,7 +395,7 @@
createTime.toString(), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //椤圭洰鍚嶇О 瀹㈡埛PO鍙� 鏆傛椂涓嶇煡閬撳瓧娈垫槸鍝釜
+ orderId, //鏀舵枡鍗昳d
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -438,6 +445,9 @@
String s2 = entry.getString("eap7_textfield5"); //鏉＄爜UPC
String memo = entry.getString("eap7_textfield6"); //澶囨敞锛堣嫳鏂囨弿杩帮級
String s1 = entry.getString("eap7_textfield7"); //瀹㈡埛PO
+ String detlId = entry.getString("id"); //鏄庣粏id
+ Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
+// String
if(anfme == 0){
callApiLogSaveOrder(order,kingDeeUtilType, "鍗曟嵁鏁伴噺寮傚父"+matnr, false);
continue;
@@ -466,7 +476,10 @@
if(locSupp != null){supp = locSupp.getOwner();}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setThreeCode(detlId);//ERP鏄庣粏id
+ orderDetl.setLineNumber(seq);//鍒嗗綍琛屽彿
orderDetl.setAnfme(anfme);//鎬荤鏁�
+ orderDetl.setErpAnfme(anfme);//erp鏁版嵁
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());//琛ㄥご鍗曟嵁
orderDetl.setSupp(supp);//渚涘簲鍟嗗悕绉帮紙璐ф簮锛�
--
Gitblit v1.9.1