From d66303b2fbba53531e514ce36cf4a6a9ac4cd837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 15:59:02 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/DeviceInspectTakeController.java | 5 +- .../impl/DeviceRepairOrderServiceImpl.java | 84 ++++++++++++++++--- 2 files changed, 76 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index 84dc9d69f..d334d3e59 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; @@ -52,9 +53,9 @@ public class DeviceInspectTakeController { @PostMapping("/udiwms/inv/device/inspect/take/uploadDeviceInspecTake") public BaseResponse uploadDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) { deviceInspectTaskEntity.setUpdateTime(new Date()); - if(deviceInspectTaskEntity.getStatus() == 1){ + if(deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_DURINGINSPECTTION){ deviceInspectTaskEntity.setStrartTime(new Date()); - }else{ + }else if (deviceInspectTaskEntity.getStatus() == DeviceStatus.DEVICE_STATUS_TEMP_INSPECTED){ deviceInspectTaskEntity.setEndTime(new Date()); } boolean falg=deviceInspectTaskService.updateById(deviceInspectTaskEntity); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index 84c4b3b51..c21866001 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -2,18 +2,23 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.dao.inv.DeviceInspectPlanDao; +import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.inv.DeviceRepairOrderDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; import com.glxp.api.res.inv.DeviceRepairOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.DeviceInspectOrderService; +import com.glxp.api.service.inv.DeviceInspectTaskDetailService; +import com.glxp.api.service.inv.DeviceInspectTaskService; import com.glxp.api.service.inv.DeviceRepairOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; @@ -22,6 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -39,6 +45,15 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { private GennerOrderUtils gennerOrderUtils; @Resource private DeviceInspectOrderService deviceInspectOrderService; + @Resource + private DeviceInspectTaskService deviceInspectTaskService; + @Resource + private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper; + @Resource + private DeviceInspectTaskDetailService deviceInspectTaskDetailService; + @Resource + private DeviceInspectPlanDao deviceInspectPlanDao; + @Override public List filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest) { @@ -92,27 +107,25 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { } @Override - public BaseResponse updateStatus(String orderId, Integer status,String repariName) { + public BaseResponse updateStatus(String orderId, Integer status, String repariName) { if (StrUtil.isBlank(orderId) || null == status) { return ResultVOUtils.paramVerifyFail(); } - AuthAdmin authAdmin=customerService.getUserBean(); + AuthAdmin authAdmin = customerService.getUserBean(); DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); deviceRepairOrderEntity.setStatus(status); Date date = new Date(); -// if (status == 2) { -// //审核通过，生成维保单 -// deviceInspectOrderService.addByRepairOrderId(orderId); -// deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr()); -// deviceRepairOrderEntity.setAuditTime(date); -// } deviceRepairOrderEntity.setUpdateTime(date); deviceRepairOrderEntity.setAuditTime(date); - deviceRepairOrderEntity.setAuditUser(authAdmin.getId()+""); - if(null != repariName){ + deviceRepairOrderEntity.setAuditUser(authAdmin.getId() + ""); + if (null != repariName) { deviceRepairOrderEntity.setRepariName(repariName); } deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + //生成计划主表 + DeviceInspectTaskEntity deviceInspectTaskEntity = getDeviceInspectTaskEntity(orderId); + //生成计划详情主表 + getDeviceInspectTaskDetailEntity(orderId, deviceInspectTaskEntity.getOrderId()); return ResultVOUtils.success(); } @@ -154,4 +167,53 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { return ResultVOUtils.success(); } + + //组装任务实体 + public DeviceInspectTaskEntity getDeviceInspectTaskEntity(String orderId) { + //查询保修单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + if (deviceRepairOrderEntity == null) { + return null; + } + String takeOrderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_TAKE_ORDER, "yyyyMMdd")); + DeviceInspectTaskEntity deviceInspectTaskEntity = new DeviceInspectTaskEntity(); + deviceInspectTaskEntity.setOrderId(takeOrderId); + deviceInspectTaskEntity.setPlanOrderIdFk(orderId); + deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); + deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); + deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode()); + deviceInspectTaskEntity.setStatus(0); + deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark()); + deviceInspectTaskEntity.setCreateTime(new Date()); + deviceInspectTaskEntity.setUpdateTime(new Date()); + deviceInspectTaskService.addDeviceInspectTask(deviceInspectTaskEntity); + return deviceInspectTaskEntity; + } + + //组装任务实体 + public List getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) { + //查询计划详情单 + DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId); + List deviceInspectTaskDetailEntityLis = new ArrayList<>(); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("orderIdFK", orderId); + List deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew); + if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) { + return null; + } + for (DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity : deviceInspectPlanDelectEntityList) { + DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity(); + deviceInspectTaskDetailEntity.setProjectCode(deviceInspectPlanEntity.getCode()); + deviceInspectTaskDetailEntity.setProjectContent(deviceInspectPlanDelectEntity.getContent()); + deviceInspectTaskDetailEntity.setStatus(1); + deviceInspectTaskDetailEntity.setInspectUser(deviceInspectPlanEntity.getInspectUser()); + deviceInspectTaskDetailEntity.setUpdateTime(new Date()); + deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk); + deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity); + } + deviceInspectTaskDetailService.addDeviceInspectTaskDelectList(deviceInspectTaskDetailEntityLis); + return deviceInspectTaskDetailEntityLis; + } + + } From 32c2798027f10c25af418625441d471d98daf5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 16:00:41 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/DeviceRepairOrderDetailMapper.java | 9 ++++ .../entity/inv/DeviceRepairOrderDetail.java | 54 +++++++++++++++++++ .../inv/DeviceRepairOrderDetailService.java | 8 +++ .../DeviceRepairOrderDetailServiceImpl.java | 13 +++++ .../inv/DeviceRepairOrderDetailMapper.xml | 20 +++++++ 5 files changed, 104 insertions(+) create mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java create mode 100644 src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java create mode 100644 src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java create mode 100644 src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java new file mode 100644 index 000000000..294db96f9 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.inv; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface DeviceRepairOrderDetailMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java new file mode 100644 index 000000000..c48bf54d1 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java @@ -0,0 +1,54 @@ +package com.glxp.api.entity.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.Data; + +@Data +@TableName(value = "udi_wms_wmd.device_repair_order_detail") +public class DeviceRepairOrderDetail { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 项目编号 + */ + @TableField(value = "code") + private String code; + + /** + * 项目内容 + */ + @TableField(value = "content") + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java new file mode 100644 index 000000000..9661cadfd --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -0,0 +1,8 @@ +package com.glxp.api.service.inv; + +import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import com.baomidou.mybatisplus.extension.service.IService; +public interface DeviceRepairOrderDetailService extends IService{ + + +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java new file mode 100644 index 000000000..fb65e50ec --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -0,0 +1,13 @@ +package com.glxp.api.service.inv.impl; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; +import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +@Service +public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ + +} diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml new file mode 100644 index 000000000..38267d614 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + id, orderIdFk, code, content, `type`, remark, updateUser, updateTime + + \ No newline at end of file From f6f9b599a59121c74903c1c77773796aa3b5ada4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 16:03:46 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=9D=E4=BF=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java | 4 ++-- ...rOrderDetail.java => DeviceRepairOrderDetailEntity.java} | 4 ++-- .../api/service/inv/DeviceRepairOrderDetailService.java | 4 ++-- .../inv/impl/DeviceRepairOrderDetailServiceImpl.java | 6 ++---- .../mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) rename src/main/java/com/glxp/api/entity/inv/{DeviceRepairOrderDetail.java => DeviceRepairOrderDetailEntity.java} (91%) diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java index 294db96f9..0e5e4b37c 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java @@ -1,9 +1,9 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface DeviceRepairOrderDetailMapper extends BaseMapper { +public interface DeviceRepairOrderDetailMapper extends BaseMapper { } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java similarity index 91% rename from src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java rename to src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java index c48bf54d1..ed564593c 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java @@ -8,8 +8,8 @@ import java.util.Date; import lombok.Data; @Data -@TableName(value = "udi_wms_wmd.device_repair_order_detail") -public class DeviceRepairOrderDetail { +@TableName(value = "device_repair_order_detail") +public class DeviceRepairOrderDetailEntity { @TableId(value = "id", type = IdType.INPUT) private Long id; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 9661cadfd..8f5944716 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.inv; -import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; import com.baomidou.mybatisplus.extension.service.IService; -public interface DeviceRepairOrderDetailService extends IService{ +public interface DeviceRepairOrderDetailService extends IService{ } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index fb65e50ec..d64e3bed1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,13 +1,11 @@ package com.glxp.api.service.inv.impl; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; -import com.glxp.api.entity.inv.DeviceRepairOrderDetail; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; import com.glxp.api.service.inv.DeviceRepairOrderDetailService; @Service -public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ +public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ } diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml index 38267d614..4866e735e 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml @@ -1,9 +1,9 @@ - + - + From 8be3506529c67cd0894ed1c8ae1bcefac0575ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 16:36:22 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E5=92=8C=E4=BF=9D=E4=BF=AE=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/inv/DeviceInspectTaskEntity.java | 6 ++++++ .../glxp/api/req/inv/FilterDeviceInspectTakeRequest.java | 7 +++++++ .../com/glxp/api/res/inv/DeviceInspectTakeResponse.java | 2 ++ src/main/resources/schemas/schema_v2.2.sql | 3 +++ 4 files changed, 18 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java index 19b83f221..f51a2ad9f 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java @@ -99,6 +99,12 @@ public class DeviceInspectTaskEntity implements Serializable { @TableField(value = "type") private Integer type; + @TableField(value = "repairType") + private Integer repairType; + + @TableField(value = "level") + private Integer level; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java index 3d82505ee..240f2a381 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.inv; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -61,4 +62,10 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest { private String yjjsEndDate; + private Integer repairType; + + + + + } diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java index 3ce7a8062..8f46ade58 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java @@ -109,6 +109,8 @@ public class DeviceInspectTakeResponse { private String inspectName; private Date expectedTime; private Integer type; + private Integer repairType; + private Integer level; diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 4ffc83b51..72d6e2edc 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -85,3 +85,6 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1); + +CALL Pro_Temp_ColumnWork('device_inspect_task', 'repairType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('device_inspect_task', 'level', 'tinyint', 1); From 6d8e7bdf87cf495cb8ab59964c4dbab1b8157c3a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 16:42:11 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceRepairOrderDetailController.java | 92 +++++++++++++++++++ .../inv/DeviceRepairOrderDetailMapper.java | 8 +- .../FilterDeviceRepairOrderDetailRequest.java | 48 ++++++++++ .../inv/DeviceRepairOrderDetailResponse.java | 48 ++++++++++ .../inv/DeviceRepairOrderDetailService.java | 16 +++- .../DeviceRepairOrderDetailServiceImpl.java | 38 +++++++- .../inv/DeviceRepairOrderDetailMapper.xml | 24 ++++- 7 files changed, 270 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java new file mode 100644 index 000000000..48e5dc856 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -0,0 +1,92 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备报修单接口 + */ +@Slf4j +@RestController +public class DeviceRepairOrderDetailController { + + @Resource + private DeviceRepairOrderDetailService deviceRepairOrderDetailService; + + /** + * 查询设备报修单列表 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @GetMapping("/udiwms/inv/device/repairDetail/order/filter") + public BaseResponse filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + List list = deviceRepairOrderDetailService.filterList(filterDeviceRepairOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加设备报修单详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrderDetail") + public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + + deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(); + } + + /** + * 更新设备报修单信息详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrderDetail") + public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(); + } + + + /** + * 删除报修单详情 + * + * @param id + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") + public BaseResponse deleteRepairOrderDetail( String id) { + deviceRepairOrderDetailService.deleteRepairOrderDetail(id); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java index 0e5e4b37c..49366c773 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java @@ -2,8 +2,14 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface DeviceRepairOrderDetailMapper extends BaseMapper { -} \ No newline at end of file + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java new file mode 100644 index 000000000..f3d36467c --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +/** + * 查询部门设备报修单接口参数 + */ +@Data +public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest { + + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java new file mode 100644 index 000000000..30f419857 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java @@ -0,0 +1,48 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单VO + */ +@Data +public class DeviceRepairOrderDetailResponse { + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + + +} diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 8f5944716..5afd31c93 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -1,8 +1,22 @@ package com.glxp.api.service.inv; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; + +import java.util.List; + public interface DeviceRepairOrderDetailService extends IService{ + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + + boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean deleteRepairOrderDetail(String id); + + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index d64e3bed1..c3723ffc0 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,11 +1,47 @@ package com.glxp.api.service.inv.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + @Service public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ + @Resource + DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; + @Override + public List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest) { + return Collections.emptyList(); + } + if (null != filterDeviceRepairOrderDetailRequest.getPage() && null != filterDeviceRepairOrderDetailRequest.getLimit()) { + PageHelper.offsetPage((filterDeviceRepairOrderDetailRequest.getPage() - 1) * filterDeviceRepairOrderDetailRequest.getLimit(), filterDeviceRepairOrderDetailRequest.getLimit()); + } + return deviceRepairOrderDetailMapper.filterList(filterDeviceRepairOrderDetailRequest); + } + + @Override + public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + + return deviceRepairOrderDetailMapper.insert(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + return deviceRepairOrderDetailMapper.updateById(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean deleteRepairOrderDetail(String id) { + return deviceRepairOrderDetailMapper.deleteById(id)>0; + } } diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml index 4866e735e..58eae9db2 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml @@ -17,4 +17,26 @@ id, orderIdFk, code, content, `type`, remark, updateUser, updateTime - \ No newline at end of file + + + + + From 21294acab7f4c4a21cff8484625070a8a0f137fc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 17:02:03 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/DeviceRepairOrderDetailController.java | 9 ++++++++- .../api/service/inv/DeviceRepairOrderDetailService.java | 4 ++++ .../inv/impl/DeviceRepairOrderDetailServiceImpl.java | 7 +++++++ src/main/resources/application-dev.yml | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 48e5dc856..71e51e39c 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -40,6 +40,13 @@ public class DeviceRepairOrderDetailController { PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } + @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk") + public BaseResponse filterByorderIdFk(String orderIdFk) { + DeviceRepairOrderDetailEntity detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); + return ResultVOUtils.success(detailEntity); + + } + /** * 添加设备报修单详情 @@ -83,7 +90,7 @@ public class DeviceRepairOrderDetailController { * @param id * @return */ - @PostMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") + @GetMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") public BaseResponse deleteRepairOrderDetail( String id) { deviceRepairOrderDetailService.deleteRepairOrderDetail(id); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 5afd31c93..2f027dac4 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -11,6 +11,10 @@ public interface DeviceRepairOrderDetailService extends IService filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk); + + + boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index c3723ffc0..b997b1701 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; @@ -29,6 +30,12 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl().eq("orderIdFk", orderIdFk)); + + } + @Override public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e043ce625..debdb6ea4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: From c959fc118d8a40174636be418a741612a3277e33 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 17:08:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/DeviceRepairOrderDetailController.java | 2 +- .../glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 71e51e39c..454c57d73 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -63,7 +63,7 @@ public class DeviceRepairOrderDetailController { BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(deviceRepairOrderDetailEntity); } /** diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java index ed564593c..9bb3d9f3b 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java @@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "device_repair_order_detail") public class DeviceRepairOrderDetailEntity { - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Long id; @TableField(value = "orderIdFk") @@ -51,4 +52,4 @@ public class DeviceRepairOrderDetailEntity { */ @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} From cffb59531958e9ea7f33c8a05ecd0cbe208638e0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 17:27:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inv/DeviceRepairOrderDetailController.java | 2 +- .../glxp/api/service/inv/DeviceRepairOrderDetailService.java | 2 +- .../service/inv/impl/DeviceRepairOrderDetailServiceImpl.java | 4 ++-- .../api/service/inv/impl/DeviceRepairOrderServiceImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 454c57d73..6be387284 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -42,7 +42,7 @@ public class DeviceRepairOrderDetailController { } @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk") public BaseResponse filterByorderIdFk(String orderIdFk) { - DeviceRepairOrderDetailEntity detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); + List detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); return ResultVOUtils.success(detailEntity); } diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 2f027dac4..f76cd62c1 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -11,7 +11,7 @@ public interface DeviceRepairOrderDetailService extends IService filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); - DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk); + List filterByorderIdFk(String orderIdFk); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index b997b1701..3bce47c36 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -31,8 +31,8 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl().eq("orderIdFk", orderIdFk)); + public List filterByorderIdFk(String orderIdFk) { + return deviceRepairOrderDetailMapper.selectList(new QueryWrapper().eq("orderIdFk", orderIdFk)); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index c21866001..4261ad0d1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -82,7 +82,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime()); deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage()); deviceRepairOrderDao.insert(deviceRepairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(deviceRepairOrderEntity); } @Override @@ -91,7 +91,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser"); repairOrderEntity.setUpdateTime(new Date()); deviceRepairOrderDao.updateById(repairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(repairOrderEntity); } @Override From e5d28786dd3415a76f1cde3b22aea2655826db28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 17:44:20 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/DeviceRepairOrderDetailController.java | 8 ++------ .../inv/impl/DeviceRepairOrderDetailServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 6be387284..39d200698 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -56,9 +56,7 @@ public class DeviceRepairOrderDetailController { */ @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrderDetail") public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { - if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { - return ResultVOUtils.paramVerifyFail(); - } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); @@ -74,9 +72,7 @@ public class DeviceRepairOrderDetailController { */ @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrderDetail") public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { - if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { - return ResultVOUtils.paramVerifyFail(); - } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index 3bce47c36..e614dd647 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -38,7 +39,8 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl0; } From a8ad9715670b87e3e6c7fa4d9510e539cbea81ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 10 Aug 2023 09:51:46 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceRepairOrderServiceImpl.java | 27 +++++++++++-------- .../mapper/inv/DeviceInspectTaskMapper.xml | 5 ++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index 4261ad0d1..9bc6ccb9f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -7,9 +7,12 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; +import com.glxp.api.constant.DeviceType; import com.glxp.api.dao.inv.DeviceInspectPlanDao; import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; @@ -52,7 +55,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { @Resource private DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource - private DeviceInspectPlanDao deviceInspectPlanDao; + private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; @Override @@ -182,7 +185,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode()); - deviceInspectTaskEntity.setStatus(0); + deviceInspectTaskEntity.setStatus(DeviceStatus.DEVICE_STATUS_TEMP_SAVE); + deviceInspectTaskEntity.setType(DeviceType.TYPE_REPAIR); + deviceInspectTaskEntity.setLevel(deviceRepairOrderEntity.getUrgencyType()); + deviceInspectTaskEntity.setRepairType(deviceRepairOrderEntity.getRepairType()); deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark()); deviceInspectTaskEntity.setCreateTime(new Date()); deviceInspectTaskEntity.setUpdateTime(new Date()); @@ -192,21 +198,20 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { //组装任务实体 public List getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) { - //查询计划详情单 - DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId); + //查询报修详情单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); List deviceInspectTaskDetailEntityLis = new ArrayList<>(); - QueryWrapper ew = new QueryWrapper<>(); + QueryWrapper ew = new QueryWrapper<>(); ew.eq("orderIdFK", orderId); - List deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew); - if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) { + List deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew); + if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) { return null; } - for (DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity : deviceInspectPlanDelectEntityList) { + for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) { DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity(); - deviceInspectTaskDetailEntity.setProjectCode(deviceInspectPlanEntity.getCode()); - deviceInspectTaskDetailEntity.setProjectContent(deviceInspectPlanDelectEntity.getContent()); + deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode()); + deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent()); deviceInspectTaskDetailEntity.setStatus(1); - deviceInspectTaskDetailEntity.setInspectUser(deviceInspectPlanEntity.getInspectUser()); deviceInspectTaskDetailEntity.setUpdateTime(new Date()); deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk); deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity); diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 0caccb29c..78e2a0b5a 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -44,6 +44,8 @@ t.remark, t.remindTime, t.expectedTime, + t.repairType, + t.level, (select `name` from auth_dept where code = t.deptCode) deptName, (select `name` from auth_warehouse where code = t.invCode) invName, ( SELECT `employeeName` FROM auth_user WHERE id = t.inspectUser ) inspectName, @@ -69,6 +71,9 @@ AND t.level = #{level} + + AND t.repairType = #{repairType} + AND t.status = #{status} From 8cf48f17d2288edccb92222c04f801e6e0886369 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 10 Aug 2023 10:03:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AA=E6=A0=A1=E9=AA=8C=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/ThirdSysConstant.java | 20 +++++++----- .../api/dao/inout/IoOrderDetailBizDao.java | 2 +- .../service/inout/IoCheckInoutService.java | 3 +- .../service/thrsys/ThrProductsService.java | 11 +++++-- .../thrsys/impl/ThrProductsServiceImpl.java | 19 ++++++++++++ .../com/glxp/api/task/SyncThirdSysTask.java | 31 +++++++++++++++++-- src/main/resources/schemas/schema_v2.2.sql | 1 + 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java index 1d5fdb608..e13d60168 100644 --- a/src/main/java/com/glxp/api/constant/ThirdSysConstant.java +++ b/src/main/java/com/glxp/api/constant/ThirdSysConstant.java @@ -8,36 +8,42 @@ public interface ThirdSysConstant { /** * 仓库货位码查询 */ - public static final String WAREHOUSE_QUERY_URL = "warehouseQueryUrl"; + String WAREHOUSE_QUERY_URL = "warehouseQueryUrl"; /** * 业务单据提交 */ - public static final String ORDER_SUBMIT_URL = "orderSubmitUrl"; + String ORDER_SUBMIT_URL = "orderSubmitUrl"; /** * 业务单据查询 */ - public static final String ORDER_QUERY_URL = "orderQueryUrl"; + String ORDER_QUERY_URL = "orderQueryUrl"; /** * 单据类型查询 */ - public static final String BUS_TYPE_QUERY_URL = "busTypeQueryUrl"; + String BUS_TYPE_QUERY_URL = "busTypeQueryUrl"; /** * 仓库/科室查询 */ - public static final String invPiUrl = "invPiUrl"; + String invPiUrl = "invPiUrl"; /** * 往来单位查询 */ - public static final String CORP_URL = "corpUrl"; + String CORP_URL = "corpUrl"; /** * 产品信息查询 */ - public static final String PI_QUERY_URL = "piQueryUrl"; + String PI_QUERY_URL = "piQueryUrl"; + + /** + * 产品信息提交 + */ + String PI_SUBMIT_URL = "productSubmitUrl"; + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index 1e56cf232..8b89b4f18 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -34,7 +34,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus { /** * 导入第三方产品信息 * - * @param files * @param thirdSys * @return */ @@ -74,7 +74,14 @@ public interface ThrProductsService extends IService { * @param filterThrProductsRequest * @return */ - BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest); + BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest); ThrProductsEntity filterThrProductsByMainId(String relId); + + /** + * 上传本地变更产品信息 + * + * @return + */ + BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 9fc482659..967ea650c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -17,8 +17,10 @@ import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; @@ -281,6 +283,23 @@ public class ThrProductsServiceImpl extends ServiceImpl { + log.info("开始下载第三方业务单据"); + try { + thrProductsService.uploadThrProduct(thrSystemDetailEntity); + } catch (Exception e) { + log.error("下载第三方业务单据", e); + } finally { + updateTask(getTaskKey(thrSystemDetailEntity)); + } + log.info("第三方业务单据下载完成"); + }); + } + } + /** * 更新任务状态为已完成 * @@ -289,7 +314,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer { */ private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) { String taskKey = getTaskKey(thrSystemDetailEntity); - ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey); + ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey); if (null != vo && !vo.isFinished()) { log.info(vo.getKey() + "有任务尚未执行完成，当前任务key：{}", taskKey); return false; @@ -298,12 +323,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer { if (vo != null) { long lastTime = vo.getNextTime(); - long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60; + long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60; if (curTime - lastTime < timeInterval) { log.info("定时任务时间未到---" + taskKey); return false; } else { - return true; + return true; } } else { vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo()); diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 4ffc83b51..4cb5d8668 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -85,3 +85,4 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1); +INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL);