From 47bf4931fc565cf1104abd5513b7bebfebbcec09 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 20 一月 2026 14:02:33 +0800
Subject: [PATCH] #杰克新增税率字段
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 2e2b852..d7678b2 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -94,7 +94,7 @@
}
private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
- List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id",order.getId()));
if (kingDeeUtilType == null || kingDeeUtilType.formId == null) {
log.warn("kingDeeUtilType 涓虹┖锛屽凡璺宠繃鏈鍚屾锛�");
return null;
@@ -102,7 +102,6 @@
switch (kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗�
path = imPurinbillAdd;
- JSONArray billentryLkArray = new JSONArray();
JSONArray billentryArray = new JSONArray(); // 鐢ㄤ簬瀛樺偍 billentry 瀵硅薄
String suppCode = null; // 渚涘簲鍟�
String boxType2 = null; // 璐т富/璐ф簮
@@ -115,6 +114,8 @@
}
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Double qty = orderDetl.getQty()*mat.getSafeQty();
+ JSONArray billentryLkArray = new JSONArray();
+
// Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
// JSONArray idArr = new JSONArray();
// idArr.add(0L);
@@ -125,7 +126,7 @@
.fluentPut("billentry_lk_stableid", 677270092232273922L)
.fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName())) // 涓诲崟ID
.fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode())) // 鏄庣粏ID
- .fluentPut("billentry_lk_baseqty_old", orderDetl.getAnfme()) // ERP鏁伴噺
+ .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme()) // ERP鏁伴噺
.fluentPut("billentry_lk_baseqty", qty); // 浣滀笟鏁伴噺
billentryLkArray.add(billentryLk);
// 鍒涘缓 billentry 瀵硅薄锛屽～鍏呯己澶辩殑瀛楁
@@ -137,6 +138,8 @@
.fluentPut("outinvstatus_number", "110")
.fluentPut("linetype_number", "010") // 琛屽彿绫诲瀷
.fluentPut("qty", qty) // 鏁伴噺
+ .fluentPut("taxrate", orderDetl.getTaxrate()) // 绋庣巼
+ .fluentPut("priceandtax", orderDetl.getPriceandtax()) //鍚◣鍗曚环
.fluentPut("material_number", orderDetl.getMatnr()) // 鐗╂枡缂栧彿
.fluentPut("billentry_lk", billentryLkArray);
@@ -218,7 +221,8 @@
.fluentPut("material_number", orderDetl.getMatnr())
.fluentPut("invtype_number", "110")
.fluentPut("qualitystatus", "A")
-
+ .fluentPut("taxrate", orderDetl.getTaxrate()) // 绋庣巼
+ .fluentPut("priceandtax", orderDetl.getPriceandtax()) //鍚◣鍗曚环
.fluentPut("billentry_lk", billentryLkArray1);
billentryArray1.add(billentry);
@@ -239,7 +243,7 @@
.fluentPut("billentry", billentryArray1) // 灏� billentry 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
)));
- case "OUI_RECEIVEBIll":
+ case "OUI_RECEIVEBIll"://濮斿鍏ュ簱鍗�
JSONArray billentryLkArray2 = new JSONArray();
JSONArray billentryArray2 = new JSONArray(); // 鐢ㄤ簬瀛樺偍 billentry 瀵硅薄
String suppCode2 = null; // 渚涘簲鍟�
@@ -261,7 +265,7 @@
JSONObject billentryLk = new JSONObject()
.fluentPut("id", 0L)
.fluentPut("seq", orderDetl.getLineNumber())
- .fluentPut("billentry_lk_stableid", 1014628189722381313L)
+ .fluentPut("billentry_lk_stableid", 1828884569948973056L)
.fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName())) // 涓诲崟ID
.fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode())); // 鏄庣粏ID
// .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme()) // ERP鏁伴噺
@@ -281,7 +285,7 @@
.fluentPut("owner_number", "BU-00001")
.fluentPut("manuentry", orderDetl.getSpecs())
.fluentPut("manubill", orderDetl.getColor())
- .fluentPut("manubillid", orderDetl.getModel())
+ .fluentPut("manubillid", Long.parseLong(orderDetl.getModel()))
.fluentPut("manuentryid", orderDetl.getBrand())
.fluentPut("producttype", "C")
.fluentPut("eap7_textfield", orderDetl.getBoxType3())
@@ -296,8 +300,9 @@
.fluentPut("outkeeper_number", "BU-00001")
.fluentPut("shipper_number", "BU-00001")
.fluentPut("entrysettleorg_number", "BU-00001")
- .fluentPut("material_number", orderDetl.getMatnr())
-
+ .fluentPut("material_masterid_number", orderDetl.getMatnr())
+ .fluentPut("taxrate", orderDetl.getTaxrate()) // 绋庣巼
+ .fluentPut("priceandtax", orderDetl.getPriceandtax()) //鍚◣鍗曚环
.fluentPut("billentry_lk", billentryLkArray2);
billentryArray2.add(billentry);
@@ -306,7 +311,7 @@
.fluentPut("data", new JSONArray(Arrays.asList(
new JSONObject()
.fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
- .fluentPut("billstatus", "C")
+ .fluentPut("billstatus", "A")
.fluentPut("id", 0L)
.fluentPut("biztime", sdf1.format(now2))
.fluentPut("org_number", "BU-00001")
@@ -318,6 +323,8 @@
.fluentPut("invscheme_number", "601")
.fluentPut("purorg_number", "BU-00001")
.fluentPut("productionorg_number", "BU-00001")
+ .fluentPut("supplier_number", "272")
+
.fluentPut("billentry", billentryArray2) // 灏� billentry 鏁扮粍娣诲姞鍒拌姹傚弬鏁�
)));
case "STK_imSaloutbill":
--
Gitblit v1.9.1