diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
index 8a61af4c..9487be72 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
+++ b/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)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
index cdf63a43..55110c79 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
+++ b/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);
}
}
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 4fc93874..cee723ea 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -44,11 +44,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
- 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
@@ -167,6 +175,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_time,
add_shipping_device_flag,
+ start_make_time,
+ end_make_time,
+ quality_status,
+ add_process_issue_record_flag,
#{shippingDeviceId},
@@ -206,6 +218,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
#{updateTime},
#{addShippingDeviceFlag}
+ #{startMakeTime}
+ #{endMakeTime}
+ #{qualityStatus}
+ #{addProcessIssueRecordFlag}
@@ -249,6 +265,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by = #{updateBy},
update_time = #{updateTime},
add_shipping_device_flag = #{addShippingDeviceFlag},
+ start_make_time = #{startMakeTime},
+ end_make_time = #{endMakeTime},
+ quality_status = #{qualityStatus},
+ add_process_issue_record_flag = #{addProcessIssueRecordFlag},
where shipping_device_id= #{shippingDeviceId}