From c445cc6b68ee932bbcb3b3389b4298aaf8b291e0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 16 三月 2022 15:16:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/OrderDetlMapper.xml | 1
src/main/resources/mapper/OrderMapper.xml | 2
src/main/java/zy/cloud/wms/manager/entity/Order.java | 93 +++++++++++++---------
src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java | 97 +++++++++++------------
4 files changed, 104 insertions(+), 89 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Order.java b/src/main/java/zy/cloud/wms/manager/entity/Order.java
index 394e253..3bc30bd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Order.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Order.java
@@ -7,6 +7,9 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.manager.service.DocTypeService;
import zy.cloud.wms.manager.service.ItemService;
@@ -20,6 +23,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("man_order")
public class Order implements Serializable {
@@ -268,45 +274,56 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Order() {}
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "娉㈡缂栧彿")
+ @TableField("wave_no")
+ private String waveNo;
- public Order(Long hostId, 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) {
- this.hostId = hostId;
- this.uuid = uuid;
- this.orderNo = orderNo;
- this.orderTime = orderTime;
- this.docType = docType;
- this.itemId = itemId;
- this.itemName = itemName;
- this.allotItemId = allotItemId;
- this.defNumber = defNumber;
- this.number = number;
- this.cstmr = cstmr;
- this.cstmrName = cstmrName;
- this.tel = tel;
- this.operMemb = operMemb;
- this.totalFee = totalFee;
- this.discount = discount;
- this.discountFee = discountFee;
- this.otherFee = otherFee;
- this.actFee = actFee;
- this.payType = payType;
- this.salesman = salesman;
- this.accountDay = accountDay;
- this.postFeeType = postFeeType;
- this.postFee = postFee;
- this.payTime = payTime;
- this.sendTime = sendTime;
- this.shipName = shipName;
- this.shipCode = shipCode;
- this.settle = settle;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
+// public Order() {}
+
+// public Order(Long hostId, 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, String waveNo) {
+// this.hostId = hostId;
+// this.uuid = uuid;
+// this.orderNo = orderNo;
+// this.orderTime = orderTime;
+// this.docType = docType;
+// this.itemId = itemId;
+// this.itemName = itemName;
+// this.allotItemId = allotItemId;
+// this.defNumber = defNumber;
+// this.number = number;
+// this.cstmr = cstmr;
+// this.cstmrName = cstmrName;
+// this.tel = tel;
+// this.operMemb = operMemb;
+// this.totalFee = totalFee;
+// this.discount = discount;
+// this.discountFee = discountFee;
+// this.otherFee = otherFee;
+// this.actFee = actFee;
+// this.payType = payType;
+// this.salesman = salesman;
+// this.accountDay = accountDay;
+// this.postFeeType = postFeeType;
+// this.postFee = postFee;
+// this.payTime = payTime;
+// this.sendTime = sendTime;
+// this.shipName = shipName;
+// this.shipCode = shipCode;
+// this.settle = settle;
+// this.status = status;
+// this.createBy = createBy;
+// this.createTime = createTime;
+// this.updateBy = updateBy;
+// this.updateTime = updateTime;
+// this.memo = memo;
+// }
// Order order = new Order(
// null, // 缂栧彿[闈炵┖]
diff --git a/src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java b/src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java
index 6a5a561..123e37d 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java
@@ -7,6 +7,9 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.system.entity.Host;
import zy.cloud.wms.system.entity.User;
@@ -17,6 +20,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("man_order_detl")
public class OrderDetl implements Serializable {
@@ -42,6 +48,13 @@
@ApiModelProperty(value= "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
/**
* 鏁伴噺
@@ -169,56 +182,32 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public OrderDetl() {}
-
- public OrderDetl(Long hostId, Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.hostId = hostId;
- this.orderId = orderId;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.supplier = supplier;
- this.unitPrice = unitPrice;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// OrderDetl orderDetl = new OrderDetl(
-// null, // 璁㈠崟鍐呯爜
-// null, // 鏁伴噺
-// null, // 鍟嗗搧缂栫爜
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵瑰彿
-// null, // 鍗曚綅
-// null, // 鍟嗗搧鏉＄爜
-// null, // 渚涘簲鍟�
-// null, // 鍗曚环
-// null, // 鍝侀」鏁�
-// null, // 鏁伴噺
-// null, // 閲嶉噺
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
+// public OrderDetl() {}
+//
+// public OrderDetl(Long hostId, Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+// this.hostId = hostId;
+// this.orderId = orderId;
+// this.anfme = anfme;
+// this.matnr = matnr;
+// this.maktx = maktx;
+// this.name = name;
+// this.specs = specs;
+// this.model = model;
+// this.batch = batch;
+// this.unit = unit;
+// this.barcode = barcode;
+// this.supplier = supplier;
+// this.unitPrice = unitPrice;
+// this.itemNum = itemNum;
+// this.count = count;
+// this.weight = weight;
+// this.status = status;
+// this.createBy = createBy;
+// this.createTime = createTime;
+// this.updateBy = updateBy;
+// this.updateTime = updateTime;
+// this.memo = memo;
+// }
public Long getId() {
return id;
@@ -262,6 +251,14 @@
this.orderId = orderId;
}
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
public Double getAnfme() {
return anfme;
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f85e6e4..bc27af6 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="host_id" property="hostId" />
<result column="order_id" property="orderId" />
+ <result column="order_no" property="orderNo" />
<result column="anfme" property="anfme" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index f0b054d..4e365e3 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -40,7 +40,7 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
+ <result column="wave_no" property="waveNo" />
</resultMap>
<update id="updateSettle">
--
Gitblit v1.9.1