完善

platform-dao/src/main/java/com/platform/dao/dto/store/SpareStoreDTO.java

@@ -66,6 +66,18 @@ public class SpareStoreDTO extends BaseDTO implements Serializable {
      * 备件类型id
      */
     private String typeId;
+    /**
+     * 备件一级类别
+     */
+    private String parentTypeId;
+    /**
+     * 二级类别
+     */
+    private String middleTypeId;
+    /**
+     * 三级类别
+     */
+    private String childTypeId;
     /**
      * 备件id
      */

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

@@ -284,16 +284,18 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
         // 设置备件的统一编号
         SpareType parentType = spareTypeMapper.selectByPrimaryKey(model.getParentTypeId());
         SpareType middleType = spareTypeMapper.selectByPrimaryKey(model.getMiddleTypeId());
-
-        String parentTypeNo = parentType.getNo();
-        String middleTypeNo = middleType.getNo();
-
-        model.setParentNo(parentTypeNo);
-        model.setMiddleNo(middleTypeNo);
-
+        String parentTypeNo = "";
+        String middleTypeNo = "";
+        if(parentType !=null){
+            parentTypeNo = parentType.getNo();
+            model.setParentNo(parentTypeNo);
+        }
+        if(middleType != null){
+            middleTypeNo = middleType.getNo();
+            model.setMiddleNo(middleTypeNo);
+        }
         String nameNo = model.getNameNo();
         String ggNo = model.getGgNo();
-
         String childTypeNo = null;
         if(StringUtils.isNotBlank(model.getChildTypeId())){
             SpareType childType = spareTypeMapper.selectByPrimaryKey(model.getChildTypeId());
@@ -303,7 +305,11 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
             model.setUniteNo(parentTypeNo + "-" + middleTypeNo + "-" + childTypeNo + "-" + nameNo + "-" + ggNo);
         }else{
             model.setTypeId(model.getMiddleTypeId());
-            model.setUniteNo(parentTypeNo + "-" + middleTypeNo + "-" + nameNo + "-" + ggNo);
+            if(StringUtils.isNotBlank(middleTypeNo)){
+                model.setUniteNo(parentTypeNo + "-" + middleTypeNo + "-" + nameNo + "-" + ggNo);
+            }else{
+                model.setUniteNo(parentTypeNo + "-" + nameNo + "-" + ggNo);
+            }
         }
 
         Weekend<SparePartInfo> weekend = new Weekend<>(SparePartInfo.class);

platform-service/src/main/java/com/platform/service/store/impl/StoreServiceImpl.java

@@ -67,6 +67,12 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         WeekendCriteria<Store, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(Store::getId, ids);
         mapper.deleteByExample(weekend);
+
+        // 删除仓库备件数据
+        Weekend<SpareStore> weekendSpareStore = new Weekend<>(SpareStore.class);
+        WeekendCriteria<SpareStore, Object> weekendCriteriaSpareStore = weekendSpareStore.weekendCriteria();
+        weekendCriteriaSpareStore.andIn(SpareStore::getStoreId, ids);
+        spareStoreMapper.deleteByExample(weekendSpareStore);
         return 1;
     }