From 6d3a76f894052209cad136ec9bff6ddcd43fc4e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 四月 2026 17:55:48 +0800
Subject: [PATCH] feat: 扫码时做限制，若采购台账已全部质检入库，APP扫码 入库时提示已入库。并且联动质检
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 6bb145e..446b5a8 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -78,6 +78,11 @@
*/
private BigDecimal stockedQuantity;
+ /**
+ * 宸插嚭搴撴暟閲�
+ */
+ private BigDecimal shippedQuantity;
+
@Excel(name = "鏈�浣庡簱瀛樻暟閲�")
private BigDecimal minStock;
@@ -87,6 +92,22 @@
@Excel(name = "鍓╀綑鏁伴噺")
@ApiModelProperty("鍓╀綑寰呭叆搴撴暟閲�(璁㈠崟鏁伴噺-鍚堟牸宸插叆搴�)")
private BigDecimal remainingQuantity;
+
+ /**
+ * 鍓╀綑鍑哄簱鏁伴噺
+ */
+ private BigDecimal remainingShippedQuantity;
+
+ /**
+ * 涓嶅悎鏍煎叆搴撴暟閲�
+ */
+ private BigDecimal unqualifiedStockedQuantity;
+
+
+ /**
+ * 涓嶅悎鏍煎嚭搴撴暟閲�
+ */
+ private BigDecimal unqualifiedShippedQuantity;
/**
* 绋庣巼
@@ -319,6 +340,10 @@
@TableField(exist = false)
private Integer hasSufficientStock;
+ @TableField(exist = false)
+ @ApiModelProperty("閲囪喘璁㈠崟鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�")
+ private Integer purchaseStockStatus;
+
// 閫�璐ф暟閲�
@TableField(exist = false)
private BigDecimal returnQuality;
@@ -330,8 +355,14 @@
public void fillRemainingQuantity() {
BigDecimal q = this.quantity == null ? BigDecimal.ZERO : this.quantity;
+
BigDecimal stocked = this.stockedQuantity == null ? BigDecimal.ZERO : this.stockedQuantity;
- BigDecimal rem = q.subtract(stocked);
- this.remainingQuantity = rem.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : rem;
+ BigDecimal remIn = q.subtract(stocked);
+ this.remainingQuantity = remIn.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remIn;
+
+ BigDecimal shipped = this.shippedQuantity == null ? BigDecimal.ZERO : this.shippedQuantity;
+ // 鍓╀綑鍑哄簱鏁伴噺锛氫互鈥滃凡鍏ュ簱鏁伴噺鈥濅负鍩哄噯锛堝嚭搴撳彧鑳戒粠宸插叆搴撲腑鎵ｅ噺锛�
+ BigDecimal remOut = stocked.subtract(shipped);
+ this.remainingShippedQuantity = remOut.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remOut;
}
}
--
Gitblit v1.9.3