From e2580f5b876a88c089ad44ff3bb6b8cb84c87519 Mon Sep 17 00:00:00 2001 From: dabin <2827029098@qq.com> Date: Thu, 29 Aug 2024 11:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90front=E3=80=91=E6=96=B0=E5=A2=9E#=201.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E4=BF=AE=E5=91=98=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=88=91=E7=9A=84=E4=BB=93=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaintenanceOrderServiceImpl.java | 62 ++++++++++++------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java index 4d21007..9e3e7de 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java @@ -548,9 +548,12 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { maintenanceOrder.setIsConfirmReceipt(MaintenanceOrderStatusEnum.CONFIRM_RECEIPT.getStatus()); maintenanceOrder.setIsMaintain(MaintenanceOrderStatusEnum.MAINTAIN.getStatus()); maintenanceOrderMapper.updateById(maintenanceOrder); - }else{ - User user = userMapper.selectById(FrontThreadLocal.getUserId()); + //我的仓库也要新增配件领用记录 并且状态是已完成 + SparePartStockAudit sparePartStockAudit = getSparePartStockAudit(maintenanceOrderParam); + sparePartStockAudit.setPurchaseStatus(AuditStateEnum.DONE.getStatus()); + sparePartStockAuditMapper.insert(sparePartStockAudit); + }else{ SparePartStockAudit resultSps = sparePartStockAuditMapper.findSparePartStockAuditByOrderId(maintenanceOrder.getId()); if(resultSps != null){ //已有领取记录但被拒绝则重新审核 @@ -559,33 +562,46 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { sparePartStockAuditMapper.updateById(resultSps); }else{ //没领过配件则创建新的领用单 - SparePartStockAudit lastSparePartStockAudit = sparePartStockAuditMapper.findLastSparePartStockAuditByTime(TimeUtil.getCurrentTimeYYYYMMDD()); - SparePartStockAudit sparePartStockAudit = new SparePartStockAudit(); - sparePartStockAudit.setReceiptNumber(OrderUtil.getOrderNo(lastSparePartStockAudit == null ? "" :lastSparePartStockAudit.getReceiptNumber())); - sparePartStockAudit.setOrderId(maintenanceOrderParam.getId()); - sparePartStockAudit.setOrderType(SparePartStockAuditEnum.MAINTENANCE_ORDER.getStatus()); - sparePartStockAudit.setReceiptType(AuditStateEnum.OUT_WAREHOUSE.getStatus()); - sparePartStockAudit.setOutInWarehouseType(AuditStateEnum.STAFF_MATERIALS.getStatus()); - sparePartStockAudit.setConsignee(user.getUsername()); - sparePartStockAudit.setPhone(user.getMobile()); - sparePartStockAudit.setCreatorId(FrontThreadLocal.getUserId()); + SparePartStockAudit sparePartStockAudit = getSparePartStockAudit(maintenanceOrderParam); sparePartStockAudit.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); - //获取检修员选择地址 - if(maintenanceOrderParam.getAddressId() != null){ - UserAddress userAddress = userAddressMapper.findUserAddressById(maintenanceOrderParam.getAddressId()); - Map regionMap = regionService.getRegionMap(); - sparePartStockAudit.setShippingAddress(regionMap.get(userAddress.getProvinceId()) + - regionMap.get(userAddress.getCityId()) + - regionMap.get(userAddress.getDistrictId()) + - userAddress.getAddress()); - } - sparePartStockAudit.setDeliveryMethod(maintenanceOrderParam.getDeliveryMethod()); - sparePartStockAudit.setRemark(maintenanceOrderParam.getRemark()); sparePartStockAuditMapper.insert(sparePartStockAudit); } } } + /** + * 新增配件领用记录 + * @param maintenanceOrderParam 参数 + * @return SparePartStockAudit + */ + private SparePartStockAudit getSparePartStockAudit(MaintenanceOrderParam maintenanceOrderParam) { + User user = userMapper.selectById(FrontThreadLocal.getUserId()); + //没领过配件则创建新的领用单 + SparePartStockAudit lastSparePartStockAudit = sparePartStockAuditMapper.findLastSparePartStockAuditByTime(TimeUtil.getCurrentTimeYYYYMMDD()); + SparePartStockAudit sparePartStockAudit = new SparePartStockAudit(); + sparePartStockAudit.setReceiptNumber(OrderUtil.getOrderNo(lastSparePartStockAudit == null ? "" :lastSparePartStockAudit.getReceiptNumber())); + sparePartStockAudit.setOrderId(maintenanceOrderParam.getId()); + sparePartStockAudit.setOrderType(SparePartStockAuditEnum.MAINTENANCE_ORDER.getStatus()); + sparePartStockAudit.setReceiptType(AuditStateEnum.OUT_WAREHOUSE.getStatus()); + sparePartStockAudit.setOutInWarehouseType(AuditStateEnum.STAFF_MATERIALS.getStatus()); + sparePartStockAudit.setConsignee(user.getUsername()); + sparePartStockAudit.setPhone(user.getMobile()); + sparePartStockAudit.setCreatorId(FrontThreadLocal.getUserId()); + + //获取检修员选择地址 + if(maintenanceOrderParam.getAddressId() != null){ + UserAddress userAddress = userAddressMapper.findUserAddressById(maintenanceOrderParam.getAddressId()); + Map regionMap = regionService.getRegionMap(); + sparePartStockAudit.setShippingAddress(regionMap.get(userAddress.getProvinceId()) + + regionMap.get(userAddress.getCityId()) + + regionMap.get(userAddress.getDistrictId()) + + userAddress.getAddress()); + } + sparePartStockAudit.setDeliveryMethod(maintenanceOrderParam.getDeliveryMethod()); + sparePartStockAudit.setRemark(maintenanceOrderParam.getRemark()); + return sparePartStockAudit; + } + @Override public void fillInReceipt(MaintenanceOrderParam maintenanceOrderParam) { MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(maintenanceOrderParam.getId());