From f25d75ffb9b015e88e5eb816d397e0fbae10bff8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 13:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index f801136..b9a8b68 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -56,6 +56,9 @@
@ApiModelProperty("瀛楁绱㈠紩")
private String fieldsIndex;
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
/**
* ASN鍗曞彿
*/
@@ -117,6 +120,11 @@
private Double purQty;
/**
+ * 搴撳瓨鎵规
+ */
+ @ApiModelProperty("搴撳瓨鎵规")
+ private String batch;
+ /**
* 閲囪喘鍗曚綅
*/
@ApiModelProperty(value= "閲囪喘鍗曚綅")
@@ -127,6 +135,12 @@
*/
@ApiModelProperty(value= "宸叉敹鏁伴噺")
private Double qty;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ private String prodTime;
/**
* 渚涘簲鍟嗙紪鐮�
@@ -163,6 +177,9 @@
*/
@ApiModelProperty(value= "鍖呰鍚嶇О")
private String packName;
+
+ @ApiModelProperty("涓婃姤鐘舵�� 0: 鏈笂鎶�, 1: 宸蹭笂鎶�")
+ private Integer ntyStatus;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -217,7 +234,7 @@
public AsnOrderItem() {}
- public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.asnId = asnId;
this.asnCode = asnCode;
this.poDetlId = poDetlId;
@@ -230,6 +247,7 @@
this.purQty = purQty;
this.purUnit = purUnit;
this.qty = qty;
+ this.ntyStatus = ntyStatus;
this.splrCode = splrCode;
this.splrName = splrName;
this.qrcode = qrcode;
--
Gitblit v1.9.1