[feat]销售管理

销售出货通知新增物料型号字段
销售出货通知详情实体类新增：本次收货数、已收货数、出货设备id、SN码字段
销售出货通知详情mapper.xml所有方法新增：thisReceivingNum、hasReceivingNum、shippingDeviceId、snCode

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

@@ -38,7 +38,7 @@ public class SysSalesOrder extends BaseEntity {
     @Excel(name = "收款结案状态", dictType = "sys_close_status")
     private String closeStatus;
 
-    /**生产状态(0待评审、1待部门主管确认、2待工程审核、3待生产、4生产中、5部分完成、6全部完成)*/
+    /**生产状态(0待评审、1待部门主管确认、2待工程审核、3待生产、4生产中、5部分完成、6全部完成、7采购审核)*/
     @Excel(name = "生产状态", dictType = "sys_erp_makeStatus")
     private String makeStatus;
     /* 订单编号*/

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;
 
     /** 已出库数 */
@@ -96,6 +96,18 @@ public class SysSalesShippingInformDetail extends BaseEntity
     @Excel(name = "已完成数",isStatistics = true)
     private Integer hasCompleteNum;
 
+    /** 本次收货数 */
+    private Integer thisReceivingNum;
+
+    /** 已收货数 */
+    private Integer hasReceivingNum;
+
+    /** 出货设备ID */
+    private String shippingDeviceId;
+
+
+    /** SN码 */
+    private String snCode;
 
     public void setShippingInformDetailId(Long shippingInformDetailId) 
     {
@@ -286,6 +298,39 @@ public class SysSalesShippingInformDetail extends BaseEntity
         this.hasCompleteNum = hasCompleteNum;
     }
 
+
+    public Integer getThisReceivingNum() {
+        return thisReceivingNum;
+    }
+
+    public void setThisReceivingNum(Integer thisReceivingNum) {
+        this.thisReceivingNum = thisReceivingNum;
+    }
+
+    public Integer getHasReceivingNum() {
+        return hasReceivingNum;
+    }
+
+    public void setHasReceivingNum(Integer hasReceivingNum) {
+        this.hasReceivingNum = hasReceivingNum;
+    }
+
+    public String getShippingDeviceId() {
+        return shippingDeviceId;
+    }
+
+    public void setShippingDeviceId(String shippingDeviceId) {
+        this.shippingDeviceId = shippingDeviceId;
+    }
+
+    public String getSnCode() {
+        return snCode;
+    }
+
+    public void setSnCode(String snCode) {
+        this.snCode = snCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -310,6 +355,10 @@ public class SysSalesShippingInformDetail extends BaseEntity
             .append("hasCheckNum", getHasCheckNum())
             .append("hasShippingNum", getHasShippingNum())
             .append("hasCompleteNum", getHasCompleteNum())
+            .append("thisReceivingNum", getThisReceivingNum())
+            .append("hasReceivingNum", getHasReceivingNum())
+            .append("shippingDeviceId", getShippingDeviceId())
+            .append("snCode", getSnCode())
             .append("createTime", getCreateTime())
             .append("createBy", getCreateBy())
             .append("updateBy", getUpdateBy())

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

@@ -24,8 +24,12 @@ 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="thisReceivingNum"    column="this_receiving_num"    />
+        <result property="hasReceivingNum"    column="has_receiving_num"    />
         <result property="hasShippingNum"    column="has_shipping_num"    />
         <result property="hasCompleteNum"    column="has_complete_num"    />
+        <result property="snCode"    column="sn_code"    />
+        <result property="shippingDeviceId"    column="shipping_device_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
@@ -34,7 +38,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, has_shipping_num, has_complete_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, this_receiving_num, has_receiving_num,sn_code, shipping_device_id,create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail
     </sql>
 
     <select id="selectSysSalesShippingInformDetailList" parameterType="SysSalesShippingInformDetail" resultMap="SysSalesShippingInformDetailResult">
@@ -85,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="thisReceivingNum != null">this_receiving_num,</if>
+            <if test="hasReceivingNum != null">has_receiving_num,</if>
+            <if test="snCode != null">sn_code,</if>
+            <if test="shippingDeviceId != null">shipping_device_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
@@ -112,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCheckNum != null">#{hasCheckNum},</if>
             <if test="hasShippingNum != null">#{hasShippingNum},</if>
             <if test="hasCompleteNum != null">#{hasCompleteNum},</if>
+            <if test="thisReceivingNum != null">#{thisReceivingNum},</if>
+            <if test="hasReceivingNum != null">#{hasReceivingNum},</if>
+            <if test="snCode != null">#{snCode},</if>
+            <if test="shippingDeviceId != null">#{shippingDeviceId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -143,6 +155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
+            <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
+            <if test="snCode != null">sn_code = #{snCode},</if>
+            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</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>
@@ -177,6 +193,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
+            <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
+            <if test="snCode != null">sn_code = #{snCode},</if>
+            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</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>

ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html

@@ -28,15 +28,6 @@
                 <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text" disabled>
             </div>
         </div>
-
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">出库类型：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <select name="warehouseOutType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_type')}" disabled>-->
-<!--                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOutType}"></option>-->
-<!--                </select>-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">客户ID：</label>
             <div class="col-sm-8">
@@ -147,6 +138,7 @@
                 "materialType": item.materialType,
                 "describe": item.describe,
                 "unit": item.unit,
+                "materialModel": item.materialModel,
                 "brand": item.brand,
                 "processMethod": item.processMethod,
                 "materialNum": item.materialNum,
@@ -339,6 +331,10 @@
                     title: '单位',
                     field: 'unit',
                 },
+                {
+                    title: '型号',
+                    field: 'materialModel',
+                },
                 {
                     title: '品牌',
                     field: 'brand',