From 5e567919108b4e1c914cdb1aae5d91ff2eb337d7 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 26 十一月 2025 08:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/entity/Order.java | 1 +
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 19 +++++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 284afce..08190ad 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -315,6 +315,7 @@
this.memo = memo;
}
+
public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer pakinPakoutStatus) {
this.uuid = uuid;
this.orderNo = orderNo;
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 3af4c8f..6a5e969 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
@@ -131,8 +131,8 @@
// 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", Arrays.asList("CGSL-251023-000027","CGSL-250811-000028"));
- jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ jsonObject.put("billno", Arrays.asList("CGSL-251125-000001"));
+ jsonObject.put("billstatus", Arrays.asList("A","B","C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
jsonObject.put("start_auditdate", null);//id
jsonObject.put("end_auditdate", null);
jsonObject.put("org_number", null);
@@ -202,6 +202,12 @@
Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("width").toString()).doubleValue() : 0.0;
Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("length").toString()).doubleValue() : 0.0;
Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("grossweight").toString()).doubleValue() : 0.0;
+ // ---- 鎺掑簭閫昏緫 ----
+ List<Double> dims = Arrays.asList(height, width, length);
+ dims.sort(Double::compareTo); // 鍗囧簭鎺掑垪锛氭渶灏忋�佷腑闂淬�佹渶澶�
+ Double min = dims.get(0);
+ Double mid = dims.get(1);
+ Double max = dims.get(2);
// 鐢熸垚鍟嗗搧妗ｆ
Mat mat = matService.selectByMatnr(matnr);
if (mat == null) {
@@ -211,9 +217,9 @@
mat.setTagId(tag.getId());
mat.setWeight(grossweight);//鍑�閲�
mat.setUnits(netweight);//姣涢噸
- mat.setManLength(length);
- mat.setHeight(height);
- mat.setWidth(width);
+ mat.setManLength(max);
+ mat.setHeight(min);
+ mat.setWidth(mid);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
@@ -416,7 +422,8 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null // 澶囨敞
+ null, // 澶囨敞
+ kingDeeUtilType.pakIn !=1?2:1
);
if( orderService.insert(order)){
callApiLogSaveOrder(order, kingDeeUtilType, "鍒涘缓鍏ュ簱鍗曟垚鍔燂紒鍗曞彿锛�" + billNo, true);
--
Gitblit v1.9.1