From c8f89c1e9353d6e530b8b7fe93c15686251b7d65 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 三月 2021 08:26:15 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 18 +++++++++++++++++-
src/main/resources/mapper/CustOrderMapper.xml | 1 +
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 1 +
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 1 +
src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java | 3 +++
5 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index dbc9dab..f49210e 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -313,6 +313,7 @@
detl0.getQty(), // 鍟嗗搧鏁伴噺
detl0.getQty(), // 鎬绘暟閲�
detl0.getPrice(), // 鍟嗗搧鍗曚环
+ detl0.getRowNo(), // 鍟嗗搧鏄庣粏琛屽彿
detl0.getComment(), // 鍟嗗搧澶囨敞[闈炵┖]
0, // 鐘舵��
now, // 娣诲姞鏃堕棿
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java
index f44273d..697442e 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java
@@ -20,4 +20,7 @@
// 鍗曡鍟嗗搧澶囨敞
private String comment;
+ // 鍟嗗搧鏄庣粏琛屽彿
+ private Double RowNo;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
index eeb2b63..18c3f19 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -67,6 +67,13 @@
private Double price;
/**
+ * 鍟嗗搧鍗曚环
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍗曚环")
+ @TableField("row_no")
+ private Double rowNo;
+
+ /**
* 鍟嗗搧澶囨敞
*/
@ApiModelProperty(value= "鍟嗗搧澶囨敞")
@@ -100,7 +107,7 @@
public CustOrder() {}
- public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double total,Double price,String comment,Integer status,Date createTime,Date updateTime,String memo) {
+ public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double total,Double price, Double rowNo, String comment,Integer status,Date createTime,Date updateTime,String memo) {
this.number = number;
this.billDate = billDate;
this.bTypeId = bTypeId;
@@ -109,6 +116,7 @@
this.qty = qty;
this.total = total;
this.price = price;
+ this.rowNo = rowNo;
this.comment = comment;
this.status = status;
this.createTime = createTime;
@@ -195,6 +203,14 @@
this.price = price;
}
+ public Double getRowNo() {
+ return rowNo;
+ }
+
+ public void setRowNo(Double rowNo) {
+ this.rowNo = rowNo;
+ }
+
public String getComment() {
return comment;
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index ded3345..98d9b7a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -369,6 +369,7 @@
dto.getCount(), // 鍟嗗搧鏁伴噺
dto.getCount(), // 鎬绘暟閲�
Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()), // 鍟嗗搧鍗曚环
+ null, // 鍟嗗搧鏄庣粏琛屽彿
null, // 鍟嗗搧澶囨敞[绌篯
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml
index fecc359..76922f1 100644
--- a/src/main/resources/mapper/CustOrderMapper.xml
+++ b/src/main/resources/mapper/CustOrderMapper.xml
@@ -12,6 +12,7 @@
<result column="qty" property="qty" />
<result column="total" property="total" />
<result column="price" property="price" />
+ <result column="row_no" property="rowNo" />
<result column="comment" property="comment" />
<result column="status" property="status" />
<result column="create_time" property="createTime" />
--
Gitblit v1.9.1