[feat]销售管理

出货通知详情实体类新增，申请出货数、已申请出货数、已完成数字段
出货通知详情mapper.xml层所有方法新增，hasShippingNum、hasShippingNum

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java

@@ -72,8 +72,8 @@ public class SysSalesShippingInformDetail extends BaseEntity
     @Excel(name = "订单数",isStatistics = true)
     private Integer makeNum;
 
-    /** 本次出货数 */
+    /** 申请出货数 */
-    @Excel(name = "本次出货数",isStatistics = true)
+    @Excel(name = "申请出货数",isStatistics = true)
     private Integer thisShippingNum;
 
     /** 已出库数 */
@@ -88,6 +88,15 @@ public class SysSalesShippingInformDetail extends BaseEntity
     @Excel(name = "已验收数",isStatistics = true)
     private Integer hasCheckNum;
 
+    /** 已申请出货数 */
+    @Excel(name = "已申请出货数",isStatistics = true)
+    private Integer hasShippingNum;
+
+    /** 已完成数 */
+    @Excel(name = "已完成数",isStatistics = true)
+    private Integer hasCompleteNum;
+
+
     public void setShippingInformDetailId(Long shippingInformDetailId) 
     {
         this.shippingInformDetailId = shippingInformDetailId;
@@ -260,6 +269,23 @@ public class SysSalesShippingInformDetail extends BaseEntity
         return hasCheckNum;
     }
 
+
+    public Integer getHasShippingNum() {
+        return hasShippingNum;
+    }
+
+    public void setHasShippingNum(Integer hasShippingNum) {
+        this.hasShippingNum = hasShippingNum;
+    }
+
+    public Integer getHasCompleteNum() {
+        return hasCompleteNum;
+    }
+
+    public void setHasCompleteNum(Integer hasCompleteNum) {
+        this.hasCompleteNum = hasCompleteNum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -282,6 +308,8 @@ public class SysSalesShippingInformDetail extends BaseEntity
             .append("hasOutOrderNum", getHasOutOrderNum())
             .append("thisCheckNum", getThisCheckNum())
             .append("hasCheckNum", getHasCheckNum())
+            .append("hasShippingNum", getHasShippingNum())
+            .append("hasCompleteNum", getHasCompleteNum())
             .append("createTime", getCreateTime())
             .append("createBy", getCreateBy())
             .append("updateBy", getUpdateBy())

ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hasOutOrderNum"    column="has_out_order_num"    />
         <result property="thisCheckNum"    column="this_check_num"    />
         <result property="hasCheckNum"    column="has_check_num"    />
+        <result property="hasShippingNum"    column="has_shipping_num"    />
+        <result property="hasCompleteNum"    column="has_complete_num"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
@@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysSalesShippingInformDetailVo">
-        select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail
+        select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, has_shipping_num, has_complete_num ,create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail
     </sql>
 
     <select id="selectSysSalesShippingInformDetailList" parameterType="SysSalesShippingInformDetail" resultMap="SysSalesShippingInformDetailResult">
@@ -81,6 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasOutOrderNum != null">has_out_order_num,</if>
             <if test="thisCheckNum != null">this_check_num,</if>
             <if test="hasCheckNum != null">has_check_num,</if>
+            <if test="hasShippingNum != null">has_shipping_num,</if>
+            <if test="hasCompleteNum != null">has_complete_num,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
@@ -106,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasOutOrderNum != null">#{hasOutOrderNum},</if>
             <if test="thisCheckNum != null">#{thisCheckNum},</if>
             <if test="hasCheckNum != null">#{hasCheckNum},</if>
+            <if test="hasShippingNum != null">#{hasShippingNum},</if>
+            <if test="hasCompleteNum != null">#{hasCompleteNum},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -135,6 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasOutOrderNum != null">has_out_order_num = #{hasOutOrderNum},</if>
             <if test="thisCheckNum != null">this_check_num = #{thisCheckNum},</if>
             <if test="hasCheckNum != null">has_check_num = #{hasCheckNum},</if>
+            <if test="hasShippingNum != null">has_shipping_num = #{hasShippingNum},</if>
+            <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -167,6 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasOutOrderNum != null">has_out_order_num = #{hasOutOrderNum},</if>
             <if test="thisCheckNum != null">this_check_num = #{thisCheckNum},</if>
             <if test="hasCheckNum != null">has_check_num = #{hasCheckNum},</if>
+            <if test="hasShippingNum != null">has_shipping_num = #{hasShippingNum},</if>
+            <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>