From 0d046b2eaa65ae4f270d509decd658ca4c4d47a9 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Mon, 7 Nov 2022 08:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=9B=98=E5=BA=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleInventoryService.java | 1 - .../ScmVehiclePatrolinspectionMapper.java | 8 ++ .../ScmVehiclePatrolinspectionMapper.xml | 8 +- .../ScmVehiclePatrolinspectionService.java | 22 ++- ...cmVehiclePatrolinspectionsheetService.java | 125 ++++++++++++------ .../ScmVehPatrolinspectionmonthService.java | 32 ++--- 6 files changed, 131 insertions(+), 65 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index fd15725899..8dddf8900f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -537,7 +537,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService SELECT count(*), - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = 1 and svp.mainSid = #{mainSid}) AS totalNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber, @@ -111,6 +111,12 @@ FROM scm_vehicle_patrolinspection svp WHERE vinNo = #{vinNo} AND createOrgSid = #{useOrgSid} ORDER BY id DESC + update scm_vehicle_patrolinspection diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index 35bba19c05..c74b8d8348 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -145,7 +145,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService selectByVinNo(String vinNo, String useOrgSid) { return baseMapper.selectByVinNo(vinNo, useOrgSid); } @@ -371,10 +375,18 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); - ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null; if (monthVoList.size() > 0) { // 有 根据生成巡检月度报告 判断 是否已生成报告 - scmVehPatrolinspectionmonthVo = monthVoList.get(0); if (scmVehPatrolinspectionmonthVo.getState() == 0) { // 否 继续走新增 - scmVehPatrolinspectionmonthVo = monthVoList.get(0); +// AppScmVehiclePatrolinspectionDetailedsVo patrolinspectionVo = scmVehiclePatrolinspectionService.selectByMainSidAndVinNo(monthVoList.get(0).getSid(), vinNo); + addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo); } else if (scmVehPatrolinspectionmonthVo.getState() == 1) { // 是 先生成月度巡检 和 巡检记录 @@ -456,48 +447,97 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { scmVehPatrolinspectionmonthVo = monthVoList.get(0); + addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo); } else { rb.setMsg("暂无需要巡检车辆"); } } } else { // 否 先生成月度巡检 和 巡检记录 - scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery); monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); if (monthVoList.size() > 0) { scmVehPatrolinspectionmonthVo = monthVoList.get(0); + addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo); } else { rb.setMsg("暂无需要巡检车辆"); } } - List list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid); - if (list.size() > 0) { - String id = list.get(0).getId(); - String mainSid = list.get(0).getSid(); - scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id); - int count = baseMapper.selectByMainSidNum(mainSid); - if (count > 0) { - baseMapper.deleteByMainSid(mainSid); - } + return rb.success().setMsg("添加成功"); + } + + + public void addPatrolinspectionsheet(ScmVehiclePatrolinspectionsheetDto dto, ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo) { + String s1 = ""; + String type1 = "06"; //巡检相关照片 + String oneKey = "001"; + String oneValue = "问题未解决"; + String useOrgSid = ""; + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(orgPath)) { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } - ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); - scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); - scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); - scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); - scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); - scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); - scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); - scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); - scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid()); - scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); - Boolean newAdd = dto.getNewAdd(); - if(newAdd){ + VehRecordsQuery vehRecordsQuery = new VehRecordsQuery(); + vehRecordsQuery.setOrgPath(orgPath); + vehRecordsQuery.setUserSid(dto.getUserSid()); + + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + + ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet(); + // 待巡检记录列表添加数据 + ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo()); + + if (scmVehiclePatrolinspection == null) { + scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); + scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); + scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); + scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); + scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); + scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); + scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); + scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid()); + scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspection.setPushState(dto.getPushState()); scmVehiclePatrolinspection.setState(0); + scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); + } else { + if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) { + scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); + scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); + scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); + scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); + scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); + scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); + scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); + scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid()); + scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspection.setPushState(dto.getPushState()); + scmVehiclePatrolinspection.setState(0); + scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); + } else { + scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); + scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); + scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); + scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); + scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); + scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); + scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid()); + scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspection.setPushState(dto.getPushState()); + scmVehiclePatrolinspection.setState(1); + int count = baseMapper.selectByMainSidNum(scmVehiclePatrolinspection.getSid()); + if (count > 0) { + baseMapper.deleteByMainSid(scmVehiclePatrolinspection.getSid()); + } + scmVehiclePatrolinspectionService.updateById(scmVehiclePatrolinspection); + } } - scmVehiclePatrolinspection.setPushState(dto.getPushState()); - scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); - + // 巡检记录列表添加数据 BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid"); ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(dto.getWarehouseSid()); scmVehiclePatrolinspectionsheet.setDutyName(scmWarehouse.getLibTubeName()); @@ -513,6 +553,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = dto.getImages(); if (images != null) { @@ -530,7 +571,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); SysUserVo sysUserVos = sysUserFeign.fetchBySid(scmWarehouse.getLibTubeSid()).getData(); Integer id = sysUserVos.getId(); @@ -542,7 +583,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", dto.getMainSid()); @@ -557,7 +597,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService mainList = new ArrayList<>(); //所有巡检记录 List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(orgPath); + List list = new ArrayList<>(); - if (patrolinspectionVos.size() > 0) { - for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) { - // 判断是否生成报告 - ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid()); + if (patrolinspectionVos.size() > 0) {// 如果存在巡检记录 + for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) { // 判断是否生成报告 + ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid()); //根据月度巡检管理表sid查询 是否生成报告 if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录 return rb.setMsg("上次巡检记录未生成报告，请先生成再操作！"); } - //问题未解决 - if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { - String vinNo = patrolinspectionVo.getVinNo(); - String sid = patrolinspectionVo.getSid(); - vinNoList.add(vinNo); - if (vinNoList.contains(vinNo)) { - mainList.add(sid); + if (scmVehPatrolinspectionmonth.getState() == 1) { + //问题未解决 + if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { + String vinNo = patrolinspectionVo.getVinNo(); + String sid = patrolinspectionVo.getSid(); + vinNoList.add(vinNo); + if (vinNoList.contains(vinNo)) { + mainList.add(sid); + } + } + if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { + scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid()); } - } - if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { - scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid()); } } appScmInventoryRecordsQuery.setVinNoList(vinNoList); list = baseVehicleFeign.selectPatrolinspections(appScmInventoryRecordsQuery).getData(); - } else { + } else { // 如果不存在 list = baseVehicleFeign.selectInventoryRecords(appScmInventoryRecordsQuery).getData(); } list.removeAll(Collections.singleton(null));