From 258f0142619bb02db69c0f7006ca5bcc75d7a2e4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 15:35:01 +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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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 49d56e5..6d5c0bf 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
@@ -325,7 +325,7 @@
//
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) {
+ 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, String sourceWarehouseId) {
this.orderId = asnId;
this.orderCode = asnCode;
this.poDetlId = poDetlId;
@@ -352,6 +352,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.sourceWarehouseId = sourceWarehouseId;
}
// AsnOrderItem asnOrderItem = new AsnOrderItem(
@@ -383,9 +384,9 @@
public BigDecimal getAbleQty() {
if (anfme == null) { anfme = 0.0;}
- if (qty == null) { qty = 0.0;}
+ if (workQty == null) { workQty = 0.0;}
BigDecimal anfmeDec = new BigDecimal(anfme.toString());
- BigDecimal qtyDec = new BigDecimal(qty.toString());
+ BigDecimal qtyDec = new BigDecimal(workQty.toString());
return anfmeDec.subtract(qtyDec);
}
--
Gitblit v1.9.1