From ab69f6bb8586db3f66418e31dd5a8f59bf675e99 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Wed, 21 Aug 2024 19:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BC=98=E5=8C=96#=201?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E9=85=8D=E4=BB=B6=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=202=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96sparePartPurchase/detail=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80=203=E3=80=81=E4=BC=98=E5=8C=96spare?= =?UTF-8?q?PartStockAudit/detai=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoutingInspectionOrderServiceImpl.java | 4 +- .../sparePart/impl/SparePartServiceImpl.java | 28 +++++------ .../impl/SparePartInWarehouseServiceImpl.java | 2 - .../impl/SparePartPurchaseServiceImpl.java | 43 +++++++++++++++++ .../impl/SparePartStockAuditServiceImpl.java | 17 +++++-- .../impl/SystemAuthAdminServiceImpl.java | 1 + .../order/RoutingInspectionOrderParam.java | 4 +- .../validate/system/SystemAuthAdminParam.java | 2 + .../vo/order/MaintenanceOrderDetailVo.java | 2 +- .../order/RoutingInspectionOrderDetailVo.java | 2 +- .../order/RoutingInspectionOrderListVo.java | 4 +- .../admin/vo/sparePart/SparePartDetailVo.java | 1 + .../SparePartPurchaseListVo.java | 5 +- .../SparePartStockAuditDetailVo.java | 3 +- .../common/dto/RoutingInspectionOrderDto.java | 4 +- .../entity/order/RoutingInspectionOrder.java | 6 +-- .../SparePartStockAudit.java | 3 ++ .../common/entity/system/SystemAuthAdmin.java | 1 + .../mapper/RoutingInspectionOrderMapper.xml | 8 ++-- .../classes/mapper/MaintenanceOrderMapper.xml | 48 +++++++++++++++++++ .../mapper/RoutingInspectionOrderMapper.xml | 8 ++-- .../RoutingInspectionOrderServiceImpl.java | 9 +++- .../order/RoutingInspectionOrderParam.java | 10 ++-- .../order/RoutingInspectionOrderDetailVo.java | 2 +- .../order/RoutingInspectionOrderListVo.java | 2 +- 25 files changed, 169 insertions(+), 50 deletions(-) create mode 100644 common/target/classes/mapper/MaintenanceOrderMapper.xml diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java index 4924b13..263b71c 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java @@ -114,7 +114,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde //设备编号、名称、地址 Equipment equipment = equipmentMapper.selectOne( new QueryWrapper() - .eq("id", model.getDeviceId()) + .eq("id", model.getEquipmentId()) .last("limit 1")); vo.setDeviceNumber(equipment.getNumber()); vo.setDeviceName(equipment.getName()); @@ -152,7 +152,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde } model.setClientId(routingInspectionOrderParam.getClientId()); //客户id - model.setDeviceId(routingInspectionOrderParam.getDeviceId());// 设备id + model.setEquipmentId(routingInspectionOrderParam.getEquipmentId());// 设备id model.setReceiverId(routingInspectionOrderParam.getReceiverId()); // 接单人id model.setRemark(routingInspectionOrderParam.getRemark()); // 备注 model.setReceiverType(routingInspectionOrderParam.getReceiverType()); // 接单类型 0-区域派单；1-距离派单 diff --git a/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java index 3b8d812..3312e91 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java @@ -133,11 +133,11 @@ public class SparePartServiceImpl implements ISparePartService { .eq("id", id) .eq("is_delete", 0) .last("limit 1")); - Assert.notNull(model, "数据不存在"); SparePartDetailVo vo = new SparePartDetailVo(); BeanUtils.copyProperties(model, vo); + //获取仓库名 Warehouse warehouse = warehouseMapper.selectOne( new QueryWrapper() .eq("id", model.getWarehouseId()) @@ -279,25 +279,25 @@ public class SparePartServiceImpl implements ISparePartService { ClientContacts clientId = clientContactsMapper.selectOne( new QueryWrapper() .eq("admin_id", adminId) - .eq("is_delete", 0) .last("limit 1")); - Assert.notNull(clientId, "数据不存在!"); - //当前用户所属客户的配件采购价格因子 - Client model = clientMapper.selectOne( - new QueryWrapper() - .eq("id", clientId.getClientId()) - .eq("is_delete", 0) - .last("limit 1")); - Assert.notNull(model, "数据不存在!"); - - BigDecimal purchaseDivisor = model.getPurchaseDivisor(); // 配件采购价格因子 + BigDecimal purchaseDivisor = null; + if(clientId != null){ + //当前用户所属客户的配件采购价格因子 + Client model = clientMapper.selectOne( + new QueryWrapper() + .eq("id", clientId.getClientId()) + .last("limit 1")); + purchaseDivisor = model.getPurchaseDivisor(); // 配件采购价格因子 + } List list = new LinkedList<>(); for(SparePart item : iPage.getRecords()) { SparePartListVo vo = new SparePartListVo(); BeanUtils.copyProperties(item, vo); - //采购员采购时的销售价（配件采购里的销售价）=配件价格*配件采购价格因子（当前用户所属客户的配件采购价格因子） - vo.setUnitPrice(vo.getUnitPrice().multiply(purchaseDivisor)); // 采购员采购时的销售价 + if(purchaseDivisor != null){ + //采购员采购时的销售价（配件采购里的销售价）=配件价格*配件采购价格因子（当前用户所属客户的配件采购价格因子） + vo.setUnitPrice(vo.getUnitPrice().multiply(purchaseDivisor)); // 采购员采购时的销售价 + } vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); Warehouse warehouse = warehouseMapper.selectOne( diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java index 59edc84..1536580 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java @@ -84,7 +84,6 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer Warehouse warehouse = warehouseMapper.selectOne( new QueryWrapper() .eq("id", item.getWarehouseId()) - .eq("is_delete", 0) .last("limit 1")); vo.setWarehouseName(warehouse.getWarehouseName()); list.add(vo); @@ -115,7 +114,6 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer Warehouse warehouse = warehouseMapper.selectOne( new QueryWrapper() .eq("id", model.getWarehouseId()) - .eq("is_delete", 0) .last("limit 1")); vo.setWarehouseName(warehouse.getWarehouseName()); BeanUtils.copyProperties(model, vo); diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartPurchase/impl/SparePartPurchaseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartPurchase/impl/SparePartPurchaseServiceImpl.java index 96d70a4..76c3d7c 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartPurchase/impl/SparePartPurchaseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartPurchase/impl/SparePartPurchaseServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hcy.admin.AdminThreadLocal; +import com.hcy.admin.service.region.IDevRegionService; import com.hcy.admin.service.sparePartPurchase.ISparePartPurchaseService; import com.hcy.admin.validate.common.PageParam; import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam; @@ -11,12 +12,16 @@ import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo; import com.hcy.admin.vo.sparePartPurchase.SparePartPurchaseListVo; import com.hcy.common.core.PageResult; import com.hcy.common.entity.SparePartAudit.SparePartAudit; +import com.hcy.common.entity.client.Client; +import com.hcy.common.entity.client.ClientContacts; import com.hcy.common.entity.sparePart.SparePart; import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.enums.audit.AuditStateEnum; import com.hcy.common.exception.OperateException; import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper; +import com.hcy.common.mapper.client.ClientContactsMapper; +import com.hcy.common.mapper.client.ClientMapper; import com.hcy.common.mapper.sparePart.SparePartMapper; import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; import com.hcy.common.mapper.warehouse.WarehouseMapper; @@ -47,6 +52,15 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService { @Resource WarehouseMapper warehouseMapper; + @Resource + ClientContactsMapper clientContactsMapper; + + @Resource + ClientMapper clientMapper; + + @Resource + private IDevRegionService regionService; + /** * 备件采购列表 * @@ -185,6 +199,28 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService { vo.setSparePartAuditList(listVo); vo.setResponsiblePersonPhone(vo.getResponsiblePerson() + "/" + vo.getPhone()); //采购人/联系电话 + + //获取客户id + ClientContacts clientId = clientContactsMapper.selectOne( + new QueryWrapper() + .eq("admin_id", model.getResponsiblePersonId()) + .last("limit 1")); + Map regionMap = regionService.getRegionMap(); + if(clientId != null) { + //获取当前用户的客户，获取客户名称、地址 + Client client = clientMapper.selectOne( + new QueryWrapper() + .eq("id", clientId.getClientId()) + .last("limit 1")); + vo.setClientName(client.getClientName()); + //获取客户地址 + String province = regionMap.get(client.getProvinceId()); + String city = regionMap.get(client.getCityId()); + String district = regionMap.get(client.getDistrictId()); + + vo.setClientAddress(province + city + district + client.getAddress()); + } + vo.setHandlingTime(TimeUtil.timestampToDate(model.getHandlingTime())); //经办时间 return vo; } @@ -239,6 +275,9 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService { model.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); //状态 未审核 } + //获取当前用户id + Integer adminId = AdminThreadLocal.getAdminId(); + model.setResponsiblePersonId(adminId); // 获取当前的用户 Object username = AdminThreadLocal.get("username"); model.setResponsiblePerson((String) username); // 经办人 @@ -302,6 +341,9 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService { }else { model.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); //状态 未审核 } + //获取当前用户id + Integer adminId = AdminThreadLocal.getAdminId(); + model.setResponsiblePersonId(adminId); // 获取当前的用户 Object username = AdminThreadLocal.get("username"); model.setResponsiblePerson((String) username); // 经办人 @@ -509,6 +551,7 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService { model.setConsigner(sparePartStockAuditParam.getConsigner()); //发货人 model.setConsignerPhone(sparePartStockAuditParam.getConsignerPhone()); //发货人联系电话 + model.setConsignerTime(new Date()); //发货时间 model.setShipAddress(sparePartStockAuditParam.getShipAddress()); //发货地址 model.setLogisticsCompany(sparePartStockAuditParam.getLogisticsCompany()); //物流公司 model.setTrackingNumber(sparePartStockAuditParam.getTrackingNumber()); //物流编号 diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java index 70e5150..527c758 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hcy.admin.service.sparePartStockAudit.ISparePartStockAuditService; import com.hcy.admin.validate.common.PageParam; import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam; +import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo; import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditListVo; import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditDetailVo; import com.hcy.common.core.PageResult; @@ -86,7 +87,6 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi Warehouse warehouse = warehouseMapper.selectOne( new QueryWrapper() .eq("id", item.getWarehouseId()) - .eq("is_delete", 0) .last("limit 1")); if (warehouse != null){ vo.setWarehouseName(warehouse.getWarehouseName()); @@ -149,7 +149,6 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi Warehouse warehouse = warehouseMapper.selectOne( new QueryWrapper() .eq("id", model.getWarehouseId()) - .eq("is_delete", 0) .last("limit 1")); if (warehouse != null){ vo.setWarehouseName(warehouse.getWarehouseName()); @@ -182,7 +181,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .eq("is_delete", 0) ); //获取备件信息 - List listVo = new ArrayList<>(); + List listVo = new ArrayList<>(); for (SparePartAudit sparePartAudit : stockAuditId) { SparePart sparePart = sparePartMapper.selectOne( new QueryWrapper() @@ -190,12 +189,20 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .eq("is_delete", 0) .last("limit 1")); - SparePartAudit sparePartAudit1 = new SparePartAudit(); + SparePartAuditListVo sparePartAudit1 = new SparePartAuditListVo(); BeanUtils.copyProperties(sparePart, sparePartAudit1); sparePartAudit1.setId(sparePartAudit.getId()); sparePartAudit1.setSparePartsId(sparePart.getId()); sparePartAudit1.setStockAuditId(sparePartAudit.getStockAuditId()); sparePartAudit1.setCount(sparePartAudit.getCount()); // 入库数量 + //获取仓库名称 + Warehouse warehouseName = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", sparePart.getWarehouseId()) + .last("limit 1")); + if (warehouseName != null){ + sparePartAudit1.setWarehouseName(warehouseName.getWarehouseName()); + } listVo.add(sparePartAudit1); } vo.setSupplierPhone(model.getSupplier() + "/" + model.getPhone()); // 供应商/电话 @@ -351,7 +358,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi // 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足 if(sparePart.getQuantity() >= sparePartAudit.getCount()){ sparePart.setQuantity(sparePart.getQuantity() - sparePartAudit.getCount()); - if(model.getPurchaseStatus() == AuditStateEnum.CHECKPENDING.getStatus()){ + if(model.getPurchaseStatus() != null && model.getPurchaseStatus() == AuditStateEnum.CHECKPENDING.getStatus()){ model.setPurchaseStatus(AuditStateEnum.WAITDELIVER.getStatus()); //审核通过改成待发货 } }else{ diff --git a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java index e28c23a..7f62d8b 100644 --- a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -375,6 +375,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setAge(systemAuthAdminParam.getAge()); model.setEmail(systemAuthAdminParam.getEmail()); model.setTechnicalGrade(systemAuthAdminParam.getTechnicalGrade()); + model.setReceiveOrderStatus(systemAuthAdminParam.getReceiveOrderStatus()); // 接单状态 systemAuthAdminMapper.insert(model); } diff --git a/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java b/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java index 0633284..bec9b75 100644 --- a/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/order/RoutingInspectionOrderParam.java @@ -36,8 +36,8 @@ public class RoutingInspectionOrderParam implements Serializable { @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class}) private Long clientId; - @DecimalMin(value = "0", message = "deviceId参数值不能少于0", groups = {create.class, update.class}) - private Long deviceId; + @DecimalMin(value = "0", message = "equipmentId参数值不能少于0", groups = {create.class, update.class}) + private Long equipmentId; @DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class}) private Long provinceId; diff --git a/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java b/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java index 87994b3..2063406 100644 --- a/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java @@ -76,4 +76,6 @@ public class SystemAuthAdminParam implements Serializable { private Integer age; // 年龄 private String email; // 邮箱 private String technicalGrade; // 技术等级 + private Integer receiveOrderStatus; //接单状态（0=休假/停止接单中 1=作业中 2=可接单） + } diff --git a/admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderDetailVo.java index fb84e48..24446b2 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderDetailVo.java @@ -19,7 +19,7 @@ public class MaintenanceOrderDetailVo implements Serializable { private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建 private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭 private Long clientId; // 客户id - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private Long faultId; // 故障id private String faultDescription; // 故障描述 private String faultImg; // 故障图片 diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java index 67b367b..7f24382 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderDetailVo.java @@ -24,7 +24,7 @@ public class RoutingInspectionOrderDetailVo implements Serializable { private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Integer inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long clientId; // 客户id - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private Long receiverId; // 接单人id private Date receiverTime; // 接单时间 private String remark; // 备注 diff --git a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java index 4052ece..42d1a54 100644 --- a/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/order/RoutingInspectionOrderListVo.java @@ -23,14 +23,14 @@ public class RoutingInspectionOrderListVo implements Serializable { private Date orderAccomplishTime; // 订单完成时间 private Long clientId; // 客户id private String clientName; // 客户名称 - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private String deviceNumber; //设备编号 private String deviceName; //设备名称 private String detailedAddress; // 设备详细地址 private Long creatorId; // 创建人id private String creatorName; //创建人名称 private String createTime; // 创建时间 - private Long familiarFaultId; // 常见维修结论id + private Long faultId; // 故障id private String familiarFaultName; //故障类型 private Long inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long receiverId; // 接单人id diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java index ed09ab0..d2b8964 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java @@ -22,4 +22,5 @@ public class SparePartDetailVo implements Serializable { private Integer quantity; // 库存数量 private BigDecimal unitPrice; // 单价 private String warehouseName; // 所属仓库名 + } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartPurchase/SparePartPurchaseListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartPurchase/SparePartPurchaseListVo.java index e8b9805..47f039a 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartPurchase/SparePartPurchaseListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartPurchase/SparePartPurchaseListVo.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -49,5 +50,7 @@ public class SparePartPurchaseListVo implements Serializable { private String createTimeStart; private String createTimeEnd; private String purchaseIdea; //采购意见 - + private String clientName; // 客户名称 + private String clientAddress; // 客户地址 + private Date consignerTime; //发货时间 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java index a6e97f2..ece0023 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java @@ -1,5 +1,6 @@ package com.hcy.admin.vo.sparePartStockAudit; +import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo; import com.hcy.common.entity.SparePartAudit.SparePartAudit; import io.swagger.models.auth.In; import lombok.Data; @@ -36,7 +37,7 @@ public class SparePartStockAuditDetailVo implements Serializable { private String warehouseName; // 所属仓库名 private String importWarehouseName; // 调入仓库名 private String exportWarehouseName; // 调出仓库名 - private List sparePartAuditList; //待入库的备件 + private List sparePartAuditList; //待入库的备件 private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） private String supplierPhone; // 供应商/电话 private String consigneePhone; // 收货单位（人员）/电话 diff --git a/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java index 5a58385..d02a641 100644 --- a/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java +++ b/common/src/main/java/com/hcy/common/dto/RoutingInspectionOrderDto.java @@ -17,14 +17,14 @@ public class RoutingInspectionOrderDto implements Serializable { private Date orderAccomplishTime; // 订单完成时间 private Long clientId; // 客户id private String clientName; // 客户名称 - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private String deviceNumber; //设备编号 private String deviceName; //设备名称 private String detailedAddress; // 设备详细地址 private Long creatorId; // 创建人id private String creatorName; //创建人名称 private String createTime; // 创建时间 - private Long familiarFaultId; // 常见维修结论id + private Long faultId; // 故障id private String familiarFaultName; //故障类型 private Long inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long receiverId; // 接单人id diff --git a/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java b/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java index b667cdf..c21597e 100644 --- a/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java +++ b/common/src/main/java/com/hcy/common/entity/order/RoutingInspectionOrder.java @@ -25,7 +25,7 @@ public class RoutingInspectionOrder implements Serializable { private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Integer inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long clientId; // 客户id - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private Long faultId; // 故障id private String faultDescription; // 故障描述 private String faultImg; // 故障图片 @@ -46,10 +46,10 @@ public class RoutingInspectionOrder implements Serializable { private String remark; // 备注 private Integer creatorId; // 创建人id private Date orderAccomplishTime; // 订单完成时间 - private Long familiarFaultId; // 常见维修结论id private Date createTime; // 创建时间 private Date updateTime; // 更新时间 private Integer isDelete; // 是否删除 0-未删除 1-删除 private Long maintenanceId; //检修单id - private Integer InspectionResult; //巡检结果（0=正常 1=异常） + private Integer inspectionResult; //巡检结果（0=正常 1=异常） + private String inspectionPhoto; //巡检照片 } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java b/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java index 29d27df..7c618ed 100644 --- a/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java +++ b/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java @@ -8,6 +8,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 备件出入库审核实体 @@ -56,4 +57,6 @@ public class SparePartStockAudit implements Serializable { private Integer recipientNumber; //领用数量 private Integer purchaseStatus; //配件领用状态（0=待审核，1=未通过，2=待管理员审核，3=待发货，4=待收货，5=已完成，6=填写中，7=收货超期） private String purchaseIdea; //采购意见 + private Integer responsiblePersonId; //经办人id + private Date consignerTime; //发货时间 } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java b/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java index cf7b990..84b1af7 100644 --- a/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java +++ b/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java @@ -46,4 +46,5 @@ public class SystemAuthAdmin implements Serializable { private String technicalGrade; // 技术等级 @TableField(updateStrategy = FieldStrategy.IGNORED) private Long userId; //用户id + private Integer receiveOrderStatus; //接单状态（0=休假/停止接单中 1=作业中 2=可接单） } diff --git a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml index 975ca65..edb9212 100644 --- a/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml +++ b/common/src/main/resources/mapper/RoutingInspectionOrderMapper.xml @@ -16,9 +16,9 @@ FROM la_routing_inspection_order AS i LEFT JOIN la_client AS c ON i.client_id = c.id - LEFT JOIN la_equipment AS e ON i.device_id = e.id + LEFT JOIN la_equipment AS e ON i.equipment_id = e.id LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id - LEFT JOIN la_common_fault AS f ON i.fault_id = f.id + LEFT JOIN la_fault AS f ON i.fault_id = f.id LEFT JOIN la_system_auth_admin as aa on i.receiver_id = aa.id WHERE i.is_delete = 0 @@ -54,9 +54,9 @@ FROM la_routing_inspection_order AS i LEFT JOIN la_client AS c ON i.client_id = c.id - LEFT JOIN la_equipment AS e ON i.device_id = e.id + LEFT JOIN la_equipment AS e ON i.equipment_id = e.id LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id - LEFT JOIN la_common_fault AS f ON i.fault_id = f.id + LEFT JOIN la_fault AS f ON i.fault_id = f.id LEFT JOIN la_system_auth_admin as aa on i.receiver_id = aa.id WHERE i.is_delete = 0 diff --git a/common/target/classes/mapper/MaintenanceOrderMapper.xml b/common/target/classes/mapper/MaintenanceOrderMapper.xml new file mode 100644 index 0000000..5666319 --- /dev/null +++ b/common/target/classes/mapper/MaintenanceOrderMapper.xml @@ -0,0 +1,48 @@ + + + + + + diff --git a/common/target/classes/mapper/RoutingInspectionOrderMapper.xml b/common/target/classes/mapper/RoutingInspectionOrderMapper.xml index 975ca65..edb9212 100644 --- a/common/target/classes/mapper/RoutingInspectionOrderMapper.xml +++ b/common/target/classes/mapper/RoutingInspectionOrderMapper.xml @@ -16,9 +16,9 @@ FROM la_routing_inspection_order AS i LEFT JOIN la_client AS c ON i.client_id = c.id - LEFT JOIN la_equipment AS e ON i.device_id = e.id + LEFT JOIN la_equipment AS e ON i.equipment_id = e.id LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id - LEFT JOIN la_common_fault AS f ON i.fault_id = f.id + LEFT JOIN la_fault AS f ON i.fault_id = f.id LEFT JOIN la_system_auth_admin as aa on i.receiver_id = aa.id WHERE i.is_delete = 0 @@ -54,9 +54,9 @@ FROM la_routing_inspection_order AS i LEFT JOIN la_client AS c ON i.client_id = c.id - LEFT JOIN la_equipment AS e ON i.device_id = e.id + LEFT JOIN la_equipment AS e ON i.equipment_id = e.id LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id - LEFT JOIN la_common_fault AS f ON i.fault_id = f.id + LEFT JOIN la_fault AS f ON i.fault_id = f.id LEFT JOIN la_system_auth_admin as aa on i.receiver_id = aa.id WHERE i.is_delete = 0 diff --git a/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java index 4de405c..a95845d 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/RoutingInspectionOrderServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import javax.annotation.Resource; +import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -112,7 +113,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde //设备编号、名称、地址 Equipment equipment = equipmentMapper.selectOne( new QueryWrapper() - .eq("id", model.getDeviceId()) + .eq("id", model.getEquipmentId()) .last("limit 1")); vo.setDeviceNumber(equipment.getNumber()); vo.setDeviceName(equipment.getName()); @@ -144,7 +145,9 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde Assert.notNull(model, "数据不存在!"); + model.setReceiverTime(new Date()); //接单时间 model.setInspectionOrderStatus(OrderStateEnum.TO_BE_INSPECTED.getStatus()); //用户接单后工单状态为待巡检 + routingInspectionOrderMapper.updateById(model); } @@ -182,7 +185,11 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde Assert.notNull(model, "数据不存在!"); + model.setFaultId(routingInspectionOrderParam.getFaultId()); // 故障id + model.setFaultDescription(routingInspectionOrderParam.getFaultDescription()); // 故障描述 model.setInspectionResult(routingInspectionOrderParam.getInspectionResult()); //巡检结果（0=正常 1=异常） + String inspectionResultRemark = routingInspectionOrderParam.getInspectionResultRemark();//巡检结果备注 + model.setInspectionPhoto(routingInspectionOrderParam.getInspectionPhoto()); // 巡检照片 model.setInspectionOrderStatus(OrderStateEnum.COMPLETED.getStatus()); //故障检测完工单状态就为已完成 routingInspectionOrderMapper.updateById(model); } diff --git a/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java b/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java index 1dd23b1..8118d3d 100644 --- a/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/RoutingInspectionOrderParam.java @@ -36,8 +36,8 @@ public class RoutingInspectionOrderParam implements Serializable { @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class}) private Long clientId; - @DecimalMin(value = "0", message = "deviceId参数值不能少于0", groups = {create.class, update.class}) - private Long deviceId; + @DecimalMin(value = "0", message = "equipmentId参数值不能少于0", groups = {create.class, update.class}) + private Long equipmentId; @DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class}) private Long provinceId; @@ -62,6 +62,10 @@ public class RoutingInspectionOrderParam implements Serializable { private Integer receiverType; // 接单类型 0-区域派单；1-距离派单 private BigDecimal orderDistance; // 订单距离 private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 - private Integer InspectionResult; //巡检结果（0=正常 1=异常） + private Integer inspectionResult; //巡检结果（0=正常 1=异常） + private Long faultId; // 故障id + private String faultDescription; // 故障描述 + private String inspectionResultRemark; //巡检结果备注 + private String inspectionPhoto; //巡检照片 } diff --git a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderDetailVo.java b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderDetailVo.java index a056f13..020d07e 100644 --- a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderDetailVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderDetailVo.java @@ -20,7 +20,7 @@ public class RoutingInspectionOrderDetailVo implements Serializable { private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Integer inspectionOrderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检 private Long clientId; // 客户id - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private Long receiverId; // 接单人id private Date receiverTime; // 接单时间 private String remark; // 备注 diff --git a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java index 56a3b50..7197f02 100644 --- a/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/RoutingInspectionOrderListVo.java @@ -18,7 +18,7 @@ public class RoutingInspectionOrderListVo implements Serializable { private Date orderAccomplishTime; // 订单完成时间 private Long clientId; // 客户id private String clientName; // 客户名称 - private Long deviceId; // 设备id + private Long equipmentId; // 设备id private String deviceNumber; //设备编号 private String deviceName; //设备名称 private String detailedAddress; // 设备详细地址