完善

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -65,7 +65,10 @@ public class SbInfo implements Serializable {
      * 制造号（车架号）/系列号
      */
     private String zzh;
-
+    /**
+     * 车牌号/房间
+     */
+    private String cph;
     /**
      * 状态
      */
@@ -306,7 +309,6 @@ public class SbInfo implements Serializable {
      */
     private String updateUserName;
     private String fdjxh;//发动机型号
-    private String cph;//车牌号
     private String dph;//底盘号
     private String zaiz;//载重
     private LocalDate lastRepaireTime;//最近维修时间

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -414,12 +414,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             SbInfoVO parentVo = mapper.getById(vo.getParentId());
             vo.setParentSbName(parentVo.getName());
         }
-        SbModelVO modelVO = sbModelMapper.getById(vo.getModelId());
-        vo.setProducerId(modelVO.getProducerId());
-        FirmProducer producer = firmProducerMapper.selectByPrimaryKey(modelVO.getProducerId());
-        if (producer != null) {
-            vo.setProducerName(producer.getName());
+        if(StringUtils.isNotBlank(vo.getProducerId())){
+            FirmProducer producer = firmProducerMapper.selectByPrimaryKey(vo.getProducerId());
+            if (producer != null) {
+                vo.setProducerName(producer.getName());
+            }
         }
+
         /*vo.setUnit(modelVO.getUnit());
         vo.setLevel(modelVO.getLevel());
         vo.setUseType(modelVO.getUseType());
@@ -494,58 +495,59 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             deptIdList.add(vo.getSaveDept());
         }
         int num = deptIdList.size();
-        Weekend<SysDept> weekend3 = new Weekend<>(SysDept.class);
-        weekend3.weekendCriteria().andIn(SysDept::getDeptId, deptIdList);
-        List<SysDept> deptList = deptMapper.selectByExample(weekend3);
-        if (vo.getUseArea() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getUseArea())) {
-                    vo.setUseAreaName(sysDept.getName());
-                    return;
-                }
-            });
-        }
-        if (vo.getUseCompany() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getUseCompany())) {
-                    vo.setUseCompanyName(sysDept.getName());
-                    return;
-                }
-            });
-        }
-        if (vo.getUseProject() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getUseProject())) {
-                    vo.setUseProjectName(sysDept.getName());
-                    return;
-                }
-            });
-        }
-        if (vo.getUseDept() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getUseDept())) {
-                    vo.setUseDeptName(sysDept.getName());
-                    return;
-                }
-            });
-        }
-        if (vo.getUseGroup() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getUseGroup())) {
-                    vo.setUseGroupName(sysDept.getName());
-                    return;
-                }
-            });
-        }
-        if (vo.getSaveDept() != null) {
-            deptList.forEach(sysDept -> {
-                if (sysDept.getDeptId().equals(vo.getSaveDept())) {
-                    vo.setSaveDeptName(sysDept.getName());
-                    return;
-                }
-            });
+        if(num>0){
+            Weekend<SysDept> weekend3 = new Weekend<>(SysDept.class);
+            weekend3.weekendCriteria().andIn(SysDept::getDeptId, deptIdList);
+            List<SysDept> deptList = deptMapper.selectByExample(weekend3);
+            if (vo.getUseArea() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getUseArea())) {
+                        vo.setUseAreaName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getUseCompany() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getUseCompany())) {
+                        vo.setUseCompanyName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getUseProject() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getUseProject())) {
+                        vo.setUseProjectName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getUseDept() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getUseDept())) {
+                        vo.setUseDeptName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getUseGroup() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getUseGroup())) {
+                        vo.setUseGroupName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getSaveDept() != null) {
+                deptList.forEach(sysDept -> {
+                    if (sysDept.getDeptId().equals(vo.getSaveDept())) {
+                        vo.setSaveDeptName(sysDept.getName());
+                        return;
+                    }
+                });
+            }
         }
-
         return vo;
     }
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -64,6 +64,16 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private final Environment environment;
     @Override
     public int batchDelete(List<String> ids) {
+
+        // 如果该类下面有仓库，且数量大于0 ，则不能删除
+        Weekend<SpareStore> weekendStore = new Weekend<>(SpareStore.class);
+        WeekendCriteria<SpareStore, Object> weekendCriteriaStore = weekendStore.weekendCriteria();
+        weekendCriteriaStore.andIn(SpareStore::getSpareId, ids).andGreaterThan(SpareStore::getNum, 0);
+        List<SpareStore> spareStoreList = spareStoreMapper.selectByExample(weekendStore);
+        if(!CollectionUtils.isEmpty(spareStoreList)){
+            throw new BusinessException("该备件仓库有数据，不能删除，请先清空仓库库存");
+        }
+        // 删除
         Weekend<SparePartInfo> weekend = new Weekend<>(SparePartInfo.class);
         WeekendCriteria<SparePartInfo, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(SparePartInfo::getId, ids);

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SpareTypeServiceImpl.java

@@ -47,10 +47,19 @@ public class SpareTypeServiceImpl extends BaseServiceImpl<SpareTypeMapper, Spare
 
     @Override
     public int batchDelete(List<String> ids) {
+
+        // 删除该类
         Weekend<SpareType> weekend = new Weekend<>(SpareType.class);
         WeekendCriteria<SpareType, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(SpareType::getId, ids);
         mapper.deleteByExample(weekend);
+
+        // 删除对应的子类
+        Weekend<SpareType> weekendChild = new Weekend<>(SpareType.class);
+        WeekendCriteria<SpareType, Object> weekendCriteriaChild = weekendChild.weekendCriteria();
+        weekendCriteriaChild.andIn(SpareType::getParentId, ids);
+        mapper.deleteByExample(weekendChild);
+
         return 1;
     }