From 4315c959d95e106ff9e18c28398087aeee7d077d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 09 三月 2026 15:12:08 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 98 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 87 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 4ae57c5..5f594ac 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -317,34 +317,37 @@
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "1";
+ @ApiModelProperty(value= "琛屽唴鐮� 鍞竴鏍囪瘑")
+ @TableField("standby1")
+ private String standby1;
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "1";
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ @TableField("standby2")
+ private String standby2;
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "1";
+ @ApiModelProperty(value= "璁″垝璺熻釜鍙�")
+ @TableField("standby3")
+ private String standby3;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value= "寤鸿鍏ュ簱浠撳簱")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1;
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value= "寤鸿鍑哄簱浠撳簱")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2;
/**
* 澶囩敤3
@@ -382,9 +385,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 +443,8 @@
this.memo = memo;
this.width = width;
this.height = height;
+ this.taxrate = taxrate;
+ this.priceandtax = priceandtax;
}
public OrderDetl(OrderDetl orderDetl) {
@@ -475,6 +494,63 @@
this.standby3 = orderDetl.getStandby3();
this.width = orderDetl.getWidth();
this.height = orderDetl.getHeight();
+ this.taxrate = orderDetl.getTaxrate();
+ this.priceandtax = orderDetl.getPriceandtax();
+ }
+
+ public OrderDetl(OrderDetlPakin orderDetl) {
+ this.orderId = orderDetl.getOrderId();
+ this.orderNo = orderDetl.getOrderNo();
+ this.anfme = orderDetl.getAnfme();
+ this.qty = orderDetl.getQty();
+ this.matnr = orderDetl.getMatnr();
+ this.maktx = orderDetl.getMaktx();
+ this.batch = orderDetl.getBatch();
+ this.specs = orderDetl.getSpecs();
+ this.model = orderDetl.getModel();
+ this.color = orderDetl.getColor();
+ this.brand = orderDetl.getBrand();
+ this.unit = orderDetl.getUnit();
+ this.price = orderDetl.getPrice();
+ this.sku = orderDetl.getSku();
+ this.units = orderDetl.getUnits();
+ this.barcode = orderDetl.getBarcode();
+ this.origin = orderDetl.getOrigin();
+ this.manu = orderDetl.getManu();
+ this.manuDate = orderDetl.getManuDate();
+ this.itemNum = orderDetl.getItemNum();
+ this.safeQty = orderDetl.getSafeQty();
+ this.weight = orderDetl.getWeight();
+ this.manLength = orderDetl.getManLength();
+ this.volume = orderDetl.getVolume();
+ this.threeCode = orderDetl.getThreeCode();
+ this.supp = orderDetl.getSupp();
+ this.suppCode = orderDetl.getSuppCode();
+ this.beBatch = orderDetl.getBeBatch();
+ this.deadTime = orderDetl.getDeadTime();
+ this.deadWarn = orderDetl.getDeadWarn();
+ this.source = orderDetl.getSource();
+ this.inspect = orderDetl.getInspect();
+ this.danger = orderDetl.getDanger();
+ this.status = orderDetl.getStatus();
+ this.createBy = orderDetl.getCreateBy();
+ this.createTime = orderDetl.getCreateTime();
+ this.updateBy = orderDetl.getUpdateBy();
+ this.updateTime = orderDetl.getUpdateTime();
+ this.memo = orderDetl.getMemo();
+ this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
+ this.lineNumber = orderDetl.getLineNumber();
+ this.standby1 = orderDetl.getStandby1();
+ this.standby2 = orderDetl.getStandby2();
+ this.standby3 = orderDetl.getStandby3();
+ this.boxType1 = orderDetl.getBoxType1();
+ this.boxType2 = orderDetl.getBoxType2();
+ this.boxType3 = orderDetl.getBoxType3();
+ this.erpAnfme = orderDetl.getErpAnfme();
+ this.width = orderDetl.getWidth();
+ this.height = orderDetl.getHeight();
+ this.taxrate = orderDetl.getTaxrate();
+ this.priceandtax = orderDetl.getPriceandtax();
}
--
Gitblit v1.9.1