From 4bf68a07c3483444a1b89d3e8dd4c59908596198 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 19 Jun 2024 14:19:42 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86:=20?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E3=80=81=E5=A7=94=E5=86=85?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=20=E5=A7=94?=
=?UTF-8?q?=E5=86=85=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E5=AE=9E?=
=?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=9C=AC=E5=8D=95=E5=8F=AF?=
=?UTF-8?q?=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0=E5=AD=97=E6=AE=B5=20?=
=?UTF-8?q?=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2table=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=9C=AC=E5=8D=95=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85mapper.xml=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=9C=AC=E5=8D=95=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=E5=A7=94=E5=86=85?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../erp/domain/ErpInboundOrderDetail.java | 18 +++++++++++++++++-
.../mapper/erp/ErpInboundOrderDetailMapper.xml | 7 ++++++-
.../erp/inboundOrder/processInboundDetail.html | 4 ++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java
index 14b328bc..c6bcb7f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrderDetail.java
@@ -34,6 +34,11 @@ public class ErpInboundOrderDetail extends BaseEntity
@Excel(name = "生产订单bomid")
private Long makeorderBomId;
+
+ /** 本单可用库存数 */
+ @Excel(name = "本单可用库存数")
+ private Integer availableStockNum;
+
/** 已完成数 */
@Excel(name = "已完成数")
private Long completedNum;
@@ -97,7 +102,17 @@ public class ErpInboundOrderDetail extends BaseEntity
{
return makeorderBomId;
}
- public void setCompletedNum(Long completedNum)
+
+
+ public Integer getAvailableStockNum() {
+ return availableStockNum;
+ }
+
+ public void setAvailableStockNum(Integer availableStockNum) {
+ this.availableStockNum = availableStockNum;
+ }
+
+ public void setCompletedNum(Long completedNum)
{
this.completedNum = completedNum;
}
@@ -162,6 +177,7 @@ public class ErpInboundOrderDetail extends BaseEntity
.append("inboundOrderNo", getInboundOrderNo())
.append("materialNo", getMaterialNo())
.append("makeorderBomId", getMakeorderBomId())
+ .append("availableStockNum",getAvailableStockNum())
.append("completedNum", getCompletedNum())
.append("currentNum", getCurrentNum())
.append("processFeeUnitPrice", getProcessFeeUnitPrice())
diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderDetailMapper.xml
index 619b363d..7d93fc9f 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderDetailMapper.xml
@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -76,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.inbound_order_no, a.material_no, a.makeorder_bom_id, a.completed_num, a.current_num, a.process_fee_unit_price from erp_inbound_order_detail a
+ select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.inbound_order_no, a.material_no, a.makeorder_bom_id, a.available_stock_num, a.completed_num, a.current_num, a.process_fee_unit_price from erp_inbound_order_detail a