From dc434264996b83c7900be642dd6af604bd98b13d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 22baa15..e72977c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -40,8 +41,7 @@
* ASN涓诲崟鏍囪瘑
*/
@ApiModelProperty(value= "ASN涓诲崟鏍囪瘑")
- private Long asnId;
-
+ private Long orderId;
/**
* 骞冲彴鏍囪瘑锛堣鍙凤級
@@ -79,7 +79,7 @@
* ASN鍗曞彿
*/
@ApiModelProperty(value= "ASN鍗曞彿")
- private String asnCode;
+ private String orderCode;
/**
* PO鍗曟槑缁嗘爣璇�
@@ -283,8 +283,8 @@
public WkOrderItem() {}
public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long 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.orderId = asnId;
+ this.orderCode = asnCode;
this.poDetlId = poDetlId;
this.matnrCode = matnrCode;
this.poCode = poCode;
@@ -338,6 +338,13 @@
// null // 澶囨敞
// );
+ public BigDecimal getAbleQty() {
+ BigDecimal anfmeDec = new BigDecimal(anfme.toString());
+ BigDecimal qtyDec = new BigDecimal(qty.toString());
+
+ return anfmeDec.subtract(qtyDec);
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1