Merge remote-tracking branch 'origin/dev' into dev

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,6 +102,16 @@ public class ErpInboundOrderDetail extends BaseEntity
     {
         return makeorderBomId;
     }
+
+
+    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())

ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderDetailMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inboundOrderNo"    column="inbound_order_no"    />
         <result property="materialNo"    column="material_no"    />
         <result property="makeorderBomId"    column="makeorder_bom_id"    />
+        <result property="availableStockNum"    column="available_stock_num"    />
         <result property="completedNum"    column="completed_num"    />
         <result property="currentNum"    column="current_num"    />
         <result property="processFeeUnitPrice"    column="process_fee_unit_price"    />
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inboundOrderNo"    column="inbound_order_no"    />
         <result property="materialNo"    column="material_no"    />
         <result property="makeorderBomId"    column="makeorder_bom_id"    />
+        <result property="availableStockNum"    column="available_stock_num"    />
         <result property="completedNum"    column="completed_num"    />
         <result property="currentNum"    column="current_num"    />
         <result property="processFeeUnitPrice"    column="process_fee_unit_price"    />
@@ -76,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectErpInboundOrderDetailVo">
-        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
     </sql>
 
     <select id="selectErpInboundOrderDetailList" parameterType="ErpInboundOrderDetail" resultMap="ErpInboundOrderDetailResult">
@@ -136,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inboundOrderNo != null">inbound_order_no,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="makeorderBomId != null">makeorder_bom_id,</if>
+            <if test="availableStockNum != null">available_stock_num,</if>
             <if test="completedNum != null">completed_num,</if>
             <if test="currentNum != null">current_num,</if>
             <if test="processFeeUnitPrice != null">process_fee_unit_price,</if>
@@ -150,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inboundOrderNo != null">#{inboundOrderNo},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="makeorderBomId != null">#{makeorderBomId},</if>
+            <if test="availableStockNum != null">#{availableStockNum},</if>
             <if test="completedNum != null">#{completedNum},</if>
             <if test="currentNum != null">#{currentNum},</if>
             <if test="processFeeUnitPrice != null">#{processFeeUnitPrice},</if>
@@ -168,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inboundOrderNo != null">inbound_order_no = #{inboundOrderNo},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="makeorderBomId != null">makeorder_bom_id = #{makeorderBomId},</if>
+            <if test="availableStockNum != null">availableStockNum = #{availableStockNum},</if>
             <if test="completedNum != null">completed_num = #{completedNum},</if>
             <if test="currentNum != null">current_num = #{currentNum},</if>
             <if test="processFeeUnitPrice != null">process_fee_unit_price = #{processFeeUnitPrice},</if>

ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html

@@ -294,6 +294,10 @@
                         return parentRow.materialNum * row.useNum;
                     }
                 },
+                {
+                    field: 'availableStockNum',
+                    title: '本单可用库存数'
+                },
                 {
                     field: 'completedNum',
                     title: '已完成数'