From 2d959c4c7338e1ac3f40bc30e2b189fe95325b7d Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 15 三月 2022 14:15:36 +0800
Subject: [PATCH] .
---
src/main/webapp/static/js/receive/receive.js | 1 +
src/main/resources/mapper/ReceiveDetlMapper.xml | 4 +++-
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 30 ++++++++++++++++++++++++++++++
src/main/webapp/static/js/receiveDetl/receiveDetl.js | 5 +++--
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index d14fa77..3c6fcbe 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -69,6 +69,13 @@
private Long orderId;
/**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
@@ -199,6 +206,9 @@
@TableField("in_qty")
private int inQty;
+ @TableField("qua_status")
+ private int quaStatus;
+
// ReceiveDetl receiveDetl = new ReceiveDetl(
// null, //
// null, // 璁㈠崟鍐呯爜
@@ -263,10 +273,30 @@
return "宸插畬鎴�";
}
+ public String getQuaStatus$(){
+ if (this.quaStatus == 0){
+ return "寰呮";
+ } else if (this.quaStatus == 1){
+ return "鍚堟牸";
+ } else if (this.quaStatus == 2) {
+ return "涓嶅悎鏍�";
+ }
+ return "鏈煡";
+ }
+
+
public void setOrderId(Long orderId) {
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/ReceiveDetlMapper.xml b/src/main/resources/mapper/ReceiveDetlMapper.xml
index 1c5bd6a..23366a3 100644
--- a/src/main/resources/mapper/ReceiveDetlMapper.xml
+++ b/src/main/resources/mapper/ReceiveDetlMapper.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" />
@@ -27,7 +28,8 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
+ <result column="in_qty" property="inQty" />
+ <result column="qua_status" property="quaStatus" />
</resultMap>
<select id="selectByOrderNo" resultType="zy.cloud.wms.manager.entity.ReceiveDetl">
select
diff --git a/src/main/webapp/static/js/receive/receive.js b/src/main/webapp/static/js/receive/receive.js
index c71cb74..edfb95d 100644
--- a/src/main/webapp/static/js/receive/receive.js
+++ b/src/main/webapp/static/js/receive/receive.js
@@ -366,6 +366,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜'},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'anfme', title: '鏁伴噺', width: 70},
+ {field: 'quaStatus$', title: '璐ㄦ鐘舵��', width: 90},
{
field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
return util.toDateString(d.createTime);
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index e46be7d..c874679 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,9 +25,10 @@
{type: 'checkbox'}
,{field: 'id', align: 'center',title: 'ID', hide:true}
,{field: 'hostId', align: 'center',title: '', hide:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜', width: 100}
- ,{field: 'anfme', align: 'center',title: '闇�鍏ュ簱鏁伴噺', width: 100}
- ,{field: 'inQty', align: 'center',title: '宸插叆搴撴暟閲�', width: 100}
+ ,{field: 'anfme', align: 'center',title: '寰呬笂鏋舵暟閲�', width: 100}
+ ,{field: 'inQty', align: 'center',title: '宸蹭笂鏋舵暟閲�', width: 100}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О', hide:true}
--
Gitblit v1.9.1