From a7000a6d02288a50dc7f5946826fca7206f548f3 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Thu, 12 Sep 2024 22:06:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin&front=E3=80=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?&=E4=BC=98=E5=8C=96#=201=E3=80=81=E4=BC=98=E5=8C=96=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BB=B4=E4=BF=AE=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E7=AB=AF=202=E3=80=81=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SparePartStockAuditServiceImpl.java | 53 ++++++++++++++++--- .../enums/order/RepairOrderStatusEnum.java | 1 + .../resources/mapper/RepairOrderMapper.xml | 3 ++ .../order/impl/RepairOrderServiceImpl.java | 8 ++- .../validate/order/RepairOrderParam.java | 2 +- 5 files changed, 58 insertions(+), 9 deletions(-) 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 04f124a..bcf3df0 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 @@ -21,6 +21,7 @@ import com.hcy.common.entity.client.Client; import com.hcy.common.entity.client.ClientContacts; import com.hcy.common.entity.order.MaintenanceOrder; import com.hcy.common.entity.order.RepairOrder; +import com.hcy.common.entity.order.RepairOrderStepData; import com.hcy.common.entity.sparePart.SparePart; import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; import com.hcy.common.entity.system.SystemAuthAdmin; @@ -39,6 +40,7 @@ import com.hcy.common.mapper.client.ClientMapper; import com.hcy.common.mapper.order.MaintenanceOrderMapper; import com.hcy.common.mapper.order.OrderSparePartMapper; import com.hcy.common.mapper.order.RepairOrderMapper; +import com.hcy.common.mapper.order.RepairOrderStepDataMapper; import com.hcy.common.mapper.sparePart.SparePartMapper; import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; import com.hcy.common.mapper.system.SystemAuthAdminMapper; @@ -97,6 +99,9 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi @Resource ClientContactsMapper clientContactsMapper; + @Resource + RepairOrderStepDataMapper repairOrderStepDataMapper; + /** * 备件出入库审核列表 * @@ -154,6 +159,15 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .ne(SparePartStockAudit::getPurchaseStatus, AuditStateEnum.AUDITED.getStatus()) .ne(SparePartStockAudit::getPurchaseStatus, AuditStateEnum.CANCELED_AUDIT.getStatus()) .ne(SparePartStockAudit::getPurchaseStatus, AuditStateEnum.FILLING_OUT.getStatus()))); + //配件领用不用在配件出入库审核显示 + queryWrapper.and(query -> query.isNull(SparePartStockAudit::getReceiveStatus) + .or(orQuery -> orQuery + .ne(SparePartStockAudit::getReceiveStatus, AuditStateEnum.UNREVIEWED.getStatus()) + .ne(SparePartStockAudit::getReceiveStatus, AuditStateEnum.AUDITED.getStatus()) + .ne(SparePartStockAudit::getReceiveStatus, AuditStateEnum.UNCLAIMED.getStatus()) + .ne(SparePartStockAudit::getReceiveStatus, AuditStateEnum.TO_BE_CONFIRMED.getStatus()) + .ne(SparePartStockAudit::getReceiveStatus, AuditStateEnum.FINISHED.getStatus()) + )); }else if(params.getQueryType() == SparePartStockAuditEnum.WAREHOUSING.getStatus() || params.getQueryType() == SparePartStockAuditEnum.GO_OUT_WAREHOUSE.getStatus() || params.getQueryType() == SparePartStockAuditEnum.ALLOT.getStatus()){ @@ -869,6 +883,15 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi repairOrder.setRepairNextStep(RepairOrderStopEnum.RECOLLAR_FITTING.getStatus());//维修单审核不通过步骤为重领配件 repairOrderMapper.updateById(repairOrder); } + + //新增维修单操作记录 + RepairOrderStepData repairOrderStepData = new RepairOrderStepData(); + repairOrderStepData.setRepairOrderId(model.getOrderId());// 维修单id + repairOrderStepData.setRemark("仓管员【"+AdminThreadLocal.get("username")+"】完成审核，审核结果：不通过，审核意见："+sparePartStockAuditParam.getPurchaseIdea());// 备注 + repairOrderStepData.setTitle("仓库员进行审核"); // 标题 + repairOrderStepData.setCreatorId(Long.valueOf(AdminThreadLocal.getAdminId())); //创建人 + repairOrderStepData.setCreateTime(new Date()); // 创建时间 + repairOrderStepDataMapper.insert(repairOrderStepData); } // 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足 @@ -879,7 +902,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .eq("is_delete", 0) ); if (model.getReceiptType() == AuditStateEnum.OUT_WAREHOUSE.getStatus() - && model.getReceiveStatus() == AuditStateEnum.UNREVIEWED.getStatus()) { + && model.getReceiveStatus() == AuditStateEnum.UNCLAIMED.getStatus()) { // 通过审核的出库单 //获取备件信息 for (SparePartAudit sparePartAudit : stockAuditId) { @@ -890,7 +913,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .last("limit 1")); // 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足 if (sparePart.getQuantity() >= sparePartAudit.getCount()) { - model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus()); + /*model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());*/ sparePart.setQuantity(sparePart.getQuantity() - sparePartAudit.getCount()); } else { throw new OperateException("备件库存数量不足，请联系客服人员！"); @@ -904,13 +927,21 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi , OrderOperateRecordEnum.SPARE_PARTS_AUDIT_ONE.getDesc() ,OrderOperateRecordEnum.AUDIT.getStatus() ,"仓管员【"+AdminThreadLocal.get("username")+"】已经完成审核，审核通过；等待管理员审核。"); - } /*else if (model.getOrderType() != null && model.getOrderType() == SparePartStockAuditEnum.REPAIR_ORDER.getStatus()) { - //新增维修单操作记录 + } else if (model.getOrderType() != null && model.getOrderType() == SparePartStockAuditEnum.REPAIR_ORDER.getStatus()) { + /* //新增维修单操作记录 orderOperateRecordService.addRepairOrder(model.getOrderId() , OrderOperateRecordEnum.SPARE_PARTS_AUDIT_ONE.getDesc() ,OrderOperateRecordEnum.AUDIT.getStatus() - ,"仓管员【"+AdminThreadLocal.get("username")+"】已经完成审核，审核通过；等待管理员审核"); - }*/ + ,"仓管员【"+AdminThreadLocal.get("username")+"】已经完成审核，审核通过；等待管理员审核");*/ + //新增维修单操作记录 + RepairOrderStepData repairOrderStepData = new RepairOrderStepData(); + repairOrderStepData.setRepairOrderId(model.getOrderId());// 维修单id + repairOrderStepData.setRemark("仓管员【"+AdminThreadLocal.get("username")+"】完成审核，审核通过");// 备注 + repairOrderStepData.setTitle("仓管员进行审核"); // 标题 + repairOrderStepData.setCreatorId(Long.valueOf(AdminThreadLocal.getAdminId())); //创建人 + repairOrderStepData.setCreateTime(new Date()); // 创建时间 + repairOrderStepDataMapper.insert(repairOrderStepData); + } } } @@ -1102,6 +1133,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi * @param sparePartStockAuditParam */ @Override + @Transactional public void warehouseKeeperImg(SparePartStockAuditParam sparePartStockAuditParam) { SparePartStockAudit model = sparePartStockAuditMapper.selectOne( new LambdaQueryWrapper() @@ -1121,6 +1153,15 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi .eq(RepairOrder::getId, model.getOrderId())); repairOrder.setOrderStatus(AuditStateEnum.TO_BE_CONFIRMED.getStatus());// 维修工单状态 3=待确认 repairOrderMapper.updateById(repairOrder); + + //新增维修单操作记录 + RepairOrderStepData repairOrderStepData = new RepairOrderStepData(); + repairOrderStepData.setRepairOrderId(model.getOrderId());// 维修单id + repairOrderStepData.setRemark("仓管员【"+AdminThreadLocal.get("username")+"】上传确认照片。");// 备注 + repairOrderStepData.setTitle("仓管员上传确认照片"); // 标题 + repairOrderStepData.setCreatorId(Long.valueOf(AdminThreadLocal.getAdminId())); //创建人 + repairOrderStepData.setCreateTime(new Date()); // 创建时间 + repairOrderStepDataMapper.insert(repairOrderStepData); } } } diff --git a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java index cd3356d..fc6a650 100644 --- a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java +++ b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java @@ -22,6 +22,7 @@ public enum RepairOrderStatusEnum { CLIENT(0,"客户端"), REPAIRER(1,"维修员"), + MAINTENANCE_SUPERVISOR(2,"维修主管端"), MAINTAIN(0,"维修"), NOT_MAINTAIN(1,"不维修"), diff --git a/common/src/main/resources/mapper/RepairOrderMapper.xml b/common/src/main/resources/mapper/RepairOrderMapper.xml index 3c2bf5e..94359c4 100644 --- a/common/src/main/resources/mapper/RepairOrderMapper.xml +++ b/common/src/main/resources/mapper/RepairOrderMapper.xml @@ -67,6 +67,9 @@ and ro.client_id = #{form.clientId} + + and ro.creator_id = #{form.creatorId} + and u1.username LIKE concat('%', #{form.creatorName}, '%') diff --git a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java index 8339efe..fc7d124 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java @@ -477,8 +477,12 @@ public class RepairOrderServiceImpl implements IRepairOrderService { }else{ repairOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); // 接单人id } - }else{ + }else if(repairOrderParam.getIsClient() == RepairOrderStatusEnum.CLIENT.getStatus()){ repairOrderDto.setClientId(repairOrderDto.getClientId()); // 根据客户id进行查询 + } else if (repairOrderParam.getIsClient() == RepairOrderStatusEnum.MAINTENANCE_SUPERVISOR.getStatus()) { + repairOrderDto.setCreatorId(FrontThreadLocal.getUserId().longValue()); // 创建人id，只查维修主管自己创建的单 + }else{ + throw new OperateException("isClient不可为空！"); } IPage iPage = repairOrderMapper.pageList(new Page<>(page, limit), repairOrderDto); @@ -857,7 +861,6 @@ public class RepairOrderServiceImpl implements IRepairOrderService { /** * 拆机 - * * @param repairOrderParam */ @Override @@ -1131,6 +1134,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService { repairOrderMapper.updateById(repairOrder); // 更新维修单 return; } else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.CONFIRMATION_SIGNATURE.getStatus()) { + // 确认签名 //判断当前订单是否仓管员已拍照上传 SparePartStockAudit resultSps = sparePartStockAuditMapper.findSparePartStockAuditByOrderId(repairOrder.getId() , SparePartStockAuditEnum.REPAIR_ORDER.getStatus()); diff --git a/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java b/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java index de3ac9c..b4d7cb4 100644 --- a/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java @@ -98,7 +98,7 @@ public class RepairOrderParam implements Serializable { //配件领用列表 private List sparePartParams; - private Integer isClient; //是否客户 0-客户端 1-检修员端 + private Integer isClient; //是否客户 0-客户端 1-维修员端 2-维修主管端 private Integer isMaintain; //是否维修 0-维修 1-不维修 private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库 private Integer deliveryMethod; //配送方式 0-物流 1-上门取件 2-送货上门