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/resources/mapper/OrderDetlMapper.xml | 2 +
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 14 +++++++
src/main/java/com/zy/asrs/entity/OrderDetl.java | 22 ++++++++++
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 10 +++-
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 18 ++++++++
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 3 +
src/main/resources/mapper/OrderDetlPakinMapper.xml | 2 +
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 6 +++
8 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 922bd30..886330b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -382,9 +382,23 @@
@TableField("sorting_anfme")
private Double sortingAnfme;
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty(value= "绋庣巼")
+ @TableField("taxrate")
+ private Double taxrate;
+
+ /**
+ * 鍚◣鍗曚环
+ */
+ @ApiModelProperty(value= "鍚◣鍗曚环")
+ @TableField("priceandtax")
+ private Double priceandtax;
+
public OrderDetl() {}
- public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo,Double width,Double height) {
+ public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo,Double width,Double height,Double taxrate,Double priceandtax) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -426,6 +440,8 @@
this.memo = memo;
this.width = width;
this.height = height;
+ this.taxrate = taxrate;
+ this.priceandtax = priceandtax;
}
public OrderDetl(OrderDetl orderDetl) {
@@ -475,6 +491,8 @@
this.standby3 = orderDetl.getStandby3();
this.width = orderDetl.getWidth();
this.height = orderDetl.getHeight();
+ this.taxrate = orderDetl.getTaxrate();
+ this.priceandtax = orderDetl.getPriceandtax();
}
public OrderDetl(OrderDetlPakin orderDetl) {
@@ -528,6 +546,8 @@
this.erpAnfme = orderDetl.getErpAnfme();
this.width = orderDetl.getWidth();
this.height = orderDetl.getHeight();
+ this.taxrate = orderDetl.getTaxrate();
+ this.priceandtax = orderDetl.getPriceandtax();
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 22e63d6..5686581 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -381,9 +381,23 @@
@TableField("erp_anfme")
private Double erpAnfme;
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty(value= "绋庣巼")
+ @TableField("taxrate")
+ private Double taxrate;
+
+ /**
+ * 鍚◣鍗曚环
+ */
+ @ApiModelProperty(value= "鍚◣鍗曚环")
+ @TableField("priceandtax")
+ private Double priceandtax;
+
public OrderDetlPakin() {}
- public OrderDetlPakin(Long id, Long orderId, String orderNo, Double anfme, Double workQty, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double width, Double height, Double erpAnfme) {
+ public OrderDetlPakin(Long id, Long orderId, String orderNo, Double anfme, Double workQty, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double width, Double height, Double erpAnfme,Double taxrate,Double priceandtax) {
this.id = id;
this.orderId = orderId;
this.orderNo = orderNo;
@@ -436,6 +450,8 @@
this.width = width;
this.height = height;
this.erpAnfme = erpAnfme;
+ this.taxrate = taxrate;
+ this.priceandtax = priceandtax;
}
public String getOrderId$(){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 1c59e32..19e0b73 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -381,6 +381,20 @@
@TableField("sorting_anfme")
private Double sortingAnfme;
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty(value= "绋庣巼")
+ @TableField("taxrate")
+ private Double taxrate;
+
+ /**
+ * 鍚◣鍗曚环
+ */
+ @ApiModelProperty(value= "鍚◣鍗曚环")
+ @TableField("priceandtax")
+ private Double priceandtax;
+
public OrderDetlPakout() {}
public OrderDetlPakout(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
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 c3fef6e..9cdf5dc 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
@@ -618,6 +618,8 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(new Date());
orderDetl.setStatus(1);
+ orderDetl.setTaxrate(taxrate);
+ orderDetl.setPriceandtax(priceandtax);
orderDetl.setQty(0.0D);
orderDetlService.insert(orderDetl);
}
@@ -1591,6 +1593,8 @@
String s1 = entry.getString("eap7_textfield7"); //瀹㈡埛PO
String detlId = entry.getString("id"); //鏄庣粏id
Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
+ Double taxrate = entry.getDouble("taxrate");
+ Double priceandtax = entry.getDouble("priceandtax");
String manubill = entry.getString("manufacturenun");
String manubillid = entry.getString("orderfid_id");
String manuentryid = null;
@@ -1660,6 +1664,8 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(new Date());
orderDetl.setStatus(1);
+ orderDetl.setTaxrate(taxrate);
+ orderDetl.setPriceandtax(priceandtax);
orderDetl.setQty(0.0D);
orderDetlService.insert(orderDetl);
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 d619f65..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
@@ -138,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);
@@ -219,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);
@@ -240,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; // 渚涘簲鍟�
@@ -298,7 +301,8 @@
.fluentPut("shipper_number", "BU-00001")
.fluentPut("entrysettleorg_number", "BU-00001")
.fluentPut("material_masterid_number", orderDetl.getMatnr())
-
+ .fluentPut("taxrate", orderDetl.getTaxrate()) // 绋庣巼
+ .fluentPut("priceandtax", orderDetl.getPriceandtax()) //鍚◣鍗曚环
.fluentPut("billentry_lk", billentryLkArray2);
billentryArray2.add(billentry);
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 237a398..0bcf1f3 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -57,6 +57,8 @@
<result column="height" property="height" />
<result column="erp_anfme" property="erpAnfme" />
<result column="sorting_anfme" property="sortingAnfme" />
+ <result column="taxrate" property="taxrate" />
+ <result column="priceandtax" property="priceandtax" />
</resultMap>
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 779774f..d691eaf 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -57,6 +57,8 @@
<result column="height" property="height" />
<result column="erp_anfme" property="erpAnfme" />
<result column="sorting_anfme" property="sortingAnfme" />
+ <result column="taxrate" property="taxrate" />
+ <result column="priceandtax" property="priceandtax" />
</resultMap>
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 95942aa..6b0f4d1 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -57,6 +57,9 @@
<result column="height" property="height" />
<result column="erp_anfme" property="erpAnfme" />
<result column="sorting_anfme" property="sortingAnfme" />
+ <result column="taxrate" property="taxrate" />
+ <result column="priceandtax" property="priceandtax" />
+
</resultMap>
<sql id="standbyAll">
--
Gitblit v1.9.1