From 780461e27d87b769b6f9649a9a7fa532d880a2e9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 14:54:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 a55c243..f537323 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
@@ -166,10 +166,11 @@
path = imPurreceiveBillAddress;
break;
case "OUI_RECEIVEBIll"://濮斿鍏ュ簱鍗�
- jsonObject.put("billstatus", Arrays.asList("A"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("auditdate_start", latestUpdateTime);
jsonObject.put("auditdate_end", sdf1.format(now));
path = omOutsourcereceiptQuery;
+ break;
case "SAL_OUTSTOCK"://閿�鍞嚭搴撳崟鏌ヨ
path = imSaloutbill;
jsonObject.put("modify_starttime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
@@ -297,6 +298,7 @@
String matnr = jsonObjectNew.get("number").toString();
String name = jsonObjectNew.get("name").toString();
String createTime = jsonObjectNew.get("createtime").toString();
+ String memo = jsonObjectNew.get("eap7_textfield1").toString();
Double height = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield9");
Double width = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield8");
Double length = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield7");
@@ -334,6 +336,7 @@
if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
+ if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
@@ -723,6 +726,7 @@
for (int k = 0; k < billEntryArray.size(); k++) {
JSONObject entry = billEntryArray.getJSONObject(k);
String matnr = entry.getString("material_number"); //鐗╂枡缂栫爜锛屽唴閮⊿KU
+ Double qty = entry.getDouble("qty");
Double anfme = entry.getDouble("eap7_decimalfield");//绠辨暟
Double totalNumItems = entry.getDouble("eap7_decimalfield1");//鎬讳欢鏁�
Double totalVolume = entry.getDouble("eap7_decimalfield2");//鎬讳綋绉�
@@ -736,7 +740,7 @@
Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
// String suppCode = entry.getString("supplier_number");
String suppCode = null;
- if (anfme == null || anfme == 0) {
+ if (qty == null || qty == 0) {
callApiLogSaveOrder(order, kingDeeUtilType,
"鍗曟嵁鏁伴噺寮傚父锛�" + matnr, false);
continue;
@@ -753,7 +757,7 @@
"妗ｆ绠辨暟閲忓紓甯革細" + matnr, false);
continue;
}
- Double erpAnfme = anfme*mat.getSafeQty();
+ Double anfmeBox = qty/mat.getSafeQty();
// ========= 鏄庣粏鍘婚噸 =========
List<OrderDetl> orderDetls =
orderDetlService.selectByOrderId(order.getId());
@@ -772,8 +776,8 @@
orderDetl.sync(mat);
orderDetl.setThreeCode(detlId);
orderDetl.setLineNumber(seq);
- orderDetl.setAnfme(anfme);
- orderDetl.setErpAnfme(erpAnfme);
+ orderDetl.setAnfme(anfmeBox != anfme?anfme : anfmeBox);
+ orderDetl.setErpAnfme(qty);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSupp(supp);
@@ -1639,9 +1643,9 @@
orderDetl.setSupp(supp);
orderDetl.setSuppCode(suppCode);
orderDetl.setSku(matnr);
- orderDetl.setStandby1(s1);
- orderDetl.setStandby2(s2);
- orderDetl.setStandby3(s3);
+ orderDetl.setStandby1(s1 != null? s1:"1");
+ orderDetl.setStandby2(s2 != null? s2:"1");
+ orderDetl.setStandby3(s3 != null? s3:"1");
orderDetl.setBoxType1(owner);
orderDetl.setBoxType2(ownerUuid);
orderDetl.setBoxType3(pOrderNo);
@@ -1771,6 +1775,7 @@
String matnr = jsonObjectNew.get("number").toString();
String name = jsonObjectNew.get("name").toString();
String createTime = jsonObjectNew.get("createtime").toString();
+ String memo = jsonObjectNew.get("eap7_textfield1").toString();
Double height = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield9");
Double width = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield8");
Double length = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield7");
@@ -1793,6 +1798,7 @@
mat.setManLength(length1);
mat.setHeight(height1);
mat.setWidth(width1);
+ mat.setMemo(memo);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
@@ -1808,6 +1814,7 @@
if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
+ if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
--
Gitblit v1.9.1