[feat]

售后管理 出货设备
新增出货设备对象开始生产时间、生产结束时间、是否添加工序列表、品质状态字段；
修改对应mapper方法，新增字段；
修改service根据生产单号和关联销售单号查询出货设备履历信息方法，新增字段；

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java

@@ -160,6 +160,19 @@ public class AfterSalesShippingDevice extends BaseEntity
 
      /** 是否添加出货设备（0代表是 1代表否） */
     private String addShippingDeviceFlag;
+
+    //生产开始时间
+    private Date startMakeTime;
+
+    //生产结束时间
+    private Date endMakeTime;
+
+    /** 是否添加工序问题记录（0代表未添加 1代表是） */
+    private String addProcessIssueRecordFlag;
+
+    /** 品质状态（0未提交品质/品质不合格1待品质/品质通过） */
+    private String qualityStatus;
+
     public void setShippingDeviceCode(Long shippingDeviceCode) 
     {
         this.shippingDeviceCode = shippingDeviceCode;
@@ -473,6 +486,38 @@ public class AfterSalesShippingDevice extends BaseEntity
         this.addShippingDeviceFlag = addShippingDeviceFlag;
     }
 
+    public Date getStartMakeTime() {
+        return startMakeTime;
+    }
+
+    public void setStartMakeTime(Date startMakeTime) {
+        this.startMakeTime = startMakeTime;
+    }
+
+    public Date getEndMakeTime() {
+        return endMakeTime;
+    }
+
+    public void setEndMakeTime(Date endMakeTime) {
+        this.endMakeTime = endMakeTime;
+    }
+
+    public String getAddProcessIssueRecordFlag() {
+        return addProcessIssueRecordFlag;
+    }
+
+    public void setAddProcessIssueRecordFlag(String addProcessIssueRecordFlag) {
+        this.addProcessIssueRecordFlag = addProcessIssueRecordFlag;
+    }
+
+    public String getQualityStatus() {
+        return qualityStatus;
+    }
+
+    public void setQualityStatus(String qualityStatus) {
+        this.qualityStatus = qualityStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java

@@ -235,6 +235,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
                 sysEquipDetailDto.setEquipmentId(salesShippingDevice.getShippingDeviceId());
                 sysEquipDetailDto.setSerialNo(salesShippingDevice.getDeviceRunningNumber());
                 sysEquipDetailDto.setEquipmentModel(salesShippingDevice.getDeviceModelCode());
+                sysEquipDetailDto.setStartMakeTime(salesShippingDevice.getStartMakeTime());
+                sysEquipDetailDto.setEndMakeTime(salesShippingDevice.getEndMakeTime());
+                sysEquipDetailDto.setAddProcessIssueRecordFlag(salesShippingDevice.getAddProcessIssueRecordFlag());
                 sysEquipDetailDtos.add(sysEquipDetailDto);
             }
         }

ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml

@@ -44,11 +44,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="addShippingDeviceFlag"    column="add_shipping_device_flag"    />
+        <result property="startMakeTime"    column="start_make_time"    />
+        <result property="endMakeTime"    column="end_make_time"    />
+        <result property="addProcessIssueRecordFlag"    column="add_process_issue_record_flag"    />
+        <result property="qualityStatus"    column="quality_status"    />
 
     </resultMap>
 
     <sql id="selectAfterSalesShippingDeviceVo">
-        select shipping_device_code, shipping_device_id, make_no,sales_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe, device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag, component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time, add_shipping_device_flag from aftersales_shipping_device
+        select shipping_device_code, shipping_device_id, make_no,sales_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe,
+               device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag,
+               component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time,
+               add_shipping_device_flag, start_make_time, end_make_time, add_process_issue_record_flag,quality_status from aftersales_shipping_device
     </sql>
 
     <select id="selectAfterSalesShippingDeviceList" parameterType="AfterSalesShippingDevice" resultMap="AfterSalesShippingDeviceResult">
@@ -70,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="componentGuaranteeFlag != null  and componentGuaranteeFlag != ''"> and component_guarantee_flag = #{componentGuaranteeFlag}</if>
             <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and quality_status =#{qualityStatus}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
@@ -167,6 +175,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="addShippingDeviceFlag != null">add_shipping_device_flag,</if>
+            <if test="startMakeTime != null">start_make_time,</if>
+            <if test="endMakeTime != null">end_make_time,</if>
+            <if test="qualityStatus != null">quality_status,</if>
+            <if test="addProcessIssueRecordFlag != null">add_process_issue_record_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="shippingDeviceId != null and shippingDeviceId != ''">#{shippingDeviceId},</if>
@@ -206,6 +218,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="addShippingDeviceFlag != null">#{addShippingDeviceFlag}</if>
+            <if test="startMakeTime != null">#{startMakeTime}</if>
+            <if test="endMakeTime != null">#{endMakeTime}</if>
+            <if test="qualityStatus != null">#{qualityStatus}</if>
+            <if test="addProcessIssueRecordFlag != null">#{addProcessIssueRecordFlag}</if>
          </trim>
     </insert>
 
@@ -249,6 +265,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="addShippingDeviceFlag != null">add_shipping_device_flag = #{addShippingDeviceFlag},</if>
+            <if test="startMakeTime != null">start_make_time = #{startMakeTime},</if>
+            <if test="endMakeTime != null">end_make_time = #{endMakeTime},</if>
+            <if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
+            <if test="addProcessIssueRecordFlag != null">add_process_issue_record_flag = #{addProcessIssueRecordFlag},</if>
         </trim>
         where shipping_device_id= #{shippingDeviceId}
     </update>