From 584d489c9816f07e0376b4e0498b84d79d39b7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 7 Nov 2024 09:17:11 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=AF=B9=E8=B1=A1=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E3=80=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E3=80=81=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=93=81=E8=B4=A8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94mapper=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9service=E6=A0=B9=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=8D=95=E5=8F=B7=E5=92=8C=E5=85=B3=E8=81=94=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E4=BF=A1=E6=81=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/AfterSalesShippingDevice.java | 45 +++++++++++++++++++ .../AfterSalesShippingDeviceServiceImpl.java | 3 ++ .../AfterSalesShippingDeviceMapper.xml | 22 ++++++++- 3 files changed, 69 insertions(+), 1 deletion(-) 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}