入库仓库报错

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -621,7 +621,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         if (StringUtils.isNotBlank(vo.getNextDate())) {
             checkStandard.setNextDate(LocalDate.parse(vo.getNextDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         }
-        checkStandard.setPeriodType(DictCache.getValueByLabel("PERIOD_TYPE", vo.getPeriodType()));
+        checkStandard.setPeriodType(DictCache.getValueByLabel("CHECK_PLAN_PERIOD_TYPE", vo.getPeriodType()));
         checkStandard.setCreatedTime(LocalDateTime.now());
         checkStandard.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
         checkStandard.setUpdateTime(LocalDateTime.now());
@@ -685,7 +685,7 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         List<CheckStandard> deletes = new ArrayList<>();
         for (ExportCheckStandardVO2 vo : list) {
             CheckStandard checkStandard = new CheckStandard();
-            checkStandard.setPeriodType(DictCache.getValueByLabel("PERIOD_TYPE", vo.getPeriodType()));
+            checkStandard.setPeriodType(DictCache.getValueByLabel("CHECK_PLAN_PERIOD_TYPE", vo.getPeriodType()));
             if (StringUtils.isNotBlank(vo.getId()) && vo.getId().trim().equals("新增")) {
                 //新增
                 packageSbInfoAndCheckStandard(sbInfo, vo, checkStandard);

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

@@ -47,6 +47,7 @@ import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.store.InStoreFormService;
 import com.platform.service.store.StoreService;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.session.StoreType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,6 +69,7 @@ import java.util.stream.Collectors;
  */
 @AllArgsConstructor
 @Service("inStoreFormService")
+@Slf4j
 public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, InStoreForm, InStoreFormDTO> implements InStoreFormService {
     private InStoreDetailMapper detailMapper;
     private SpareStoreMapper spareStoreMapper;
@@ -97,7 +99,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setUserId(userInfo.getUserId());
         }
-        if(StringUtils.isNotEmpty(model.getModel())){
+        if (StringUtils.isNotEmpty(model.getModel())) {
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
             sbModelDTO.setKeyword(model.getModel());
             List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
@@ -106,7 +108,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         }
         PageHelper.startPage(pageNum, pageSize);
         List<InStoreFormVO> list = mapper.selectList(model);
-        addSbRelationShip(null,list);
+        addSbRelationShip(null, list);
         list = getSparePartInfoVOS(list);
         return new MyPage(list);
     }
@@ -199,6 +201,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
 
     /**
      * 入库，只记录不更新
+     *
      * @param model
      * @return
      */
@@ -206,9 +209,9 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     public InStoreForm saveModelByDTO(InStoreFormDTO model) {
         Store store = storeService.getModelById(model.getStoreId());
         if (store == null) {
-            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId() );
+            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId());
         }
-        if (store.getLevel().equals(StoreLevelEnum.ZONGCANG)){
+        if (store.getLevel().equals(StoreLevelEnum.ZONGCANG)) {
             throw new BusinessException("请选择库位");
         }
         UserInfo userInfo = SecurityUtils.getUserInfo();
@@ -278,28 +281,29 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         }
     }
 
-    private List<InStoreFormVO> getSparePartInfoVOS(List<InStoreFormVO> sparePartInfoVOS){
+    private List<InStoreFormVO> getSparePartInfoVOS(List<InStoreFormVO> sparePartInfoVOS) {
         StoreDTO dto = new StoreDTO();
 //        dto.setName("B-2");
         List<StoreVO> stores = storeMapper.selectList(dto);
-        Map<String,String> map = new HashMap<>();
-        for (StoreVO vo:stores){
+        Map<String, String> map = new HashMap<>();
+        for (StoreVO vo : stores) {
 //            if (vo.getName().trim().equals("A-2")){
 //                int i=0;
 //            }
-            if (vo.getLevel()==3){
-                first:for (StoreVO vo1:stores){
+            if (vo.getLevel() == 3) {
+                first:
+                for (StoreVO vo1 : stores) {
                     System.out.println("11111111111");
-                    if (vo.getParentId().equals(vo1.getId())){
-                        for (StoreVO vo2:stores){
+                    if (vo.getParentId().equals(vo1.getId())) {
+                        for (StoreVO vo2 : stores) {
                             System.out.println("22222222222");
-                            if (vo1.getParentId().equals(vo2.getId())){
+                            if (vo1.getParentId().equals(vo2.getId())) {
                                 System.out.println("33333333333");
-                                String name1 = vo2.getName().replaceAll("\\s*","").replaceAll("[^(0-9)]","");
-                                String name2 = vo1.getName().replaceAll("\\s*","").replaceAll("[^(0-9)]","");
-                                String name =name1+"-"+name2+"-"+vo.getName();
-                                map.put(vo.getId(),name);
-                                System.out.println("========="+name);
+                                String name1 = vo2.getName().replaceAll("\\s*", "").replaceAll("[^(0-9)]", "");
+                                String name2 = vo1.getName().replaceAll("\\s*", "").replaceAll("[^(0-9)]", "");
+                                String name = name1 + "-" + name2 + "-" + vo.getName();
+                                map.put(vo.getId(), name);
+                                System.out.println("=========" + name);
                                 break first;
                             }
                         }
@@ -308,9 +312,9 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             }
         }
         Set<String> ids = map.keySet();
-        for (String id:ids){
-            for (InStoreFormVO vo:sparePartInfoVOS){
-                if (vo.getStoreId()!=null&&vo.getStoreId().equals(id)){
+        for (String id : ids) {
+            for (InStoreFormVO vo : sparePartInfoVOS) {
+                if (vo.getStoreId() != null && vo.getStoreId().equals(id)) {
                     vo.setStoreName(map.get(id));
                     continue;
                 }
@@ -320,23 +324,23 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
     @Override
-    public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageNum,Integer pageSize) {
-        if(StringUtils.isNotEmpty(dto.getModel())){
+    public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageNum, Integer pageSize) {
+        if (StringUtils.isNotEmpty(dto.getModel())) {
             SbModelSpareBomDTO sbModelDTO = new SbModelSpareBomDTO();
             sbModelDTO.setKeyword(dto.getModel());
             List<SbModelSpareBomVO> modelList = sbModelSpareBomMapper.selectVOList(sbModelDTO);
             List<String> spareList = modelList.stream().map(item -> item.getSpareId()).distinct().collect(Collectors.toList());
             dto.setSpareIdList(spareList);
         }
-        PageHelper.startPage(pageNum,pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<InStoreFormVO> list = mapper.getInStoreFormCollect(dto);
-        addSbRelationShip(null,list);
+        addSbRelationShip(null, list);
         getSparePartInfoVOS(list);
         return new MyPage<>(list);
     }
 
     @Override
-    public List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer searchYear,Integer month) {
+    public List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto, Integer searchYear, Integer month) {
         LocalDateTime searchStartTime = null;
         LocalDateTime searchEndTime = null;
         searchStartTime = DateUtils.getFirstDayOfMonth(searchYear, month);
@@ -386,7 +390,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
             for (InStoreFormVO inStoreFormVO : list) {
                 if (inStoreFormVO.getCreatedTime().isAfter(map.get("searchStartTimeMonth")) && inStoreFormVO.getCreatedTime().isBefore(map.get("searchEndTimeMonth"))) {
-                    i+=(inStoreFormVO.getInNum()==null?0:inStoreFormVO.getInNum());
+                    i += (inStoreFormVO.getInNum() == null ? 0 : inStoreFormVO.getInNum());
                     detailList.add(inStoreFormVO);
                 }
             }
@@ -399,8 +403,8 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
     @Override
-    public AbstractPageResultBean<InStoreFormVO> getInStoreForm(InStoreFormDTO dto,Integer pageNum,Integer pageSize) {
-        PageHelper.startPage(pageNum,pageSize);
+    public AbstractPageResultBean<InStoreFormVO> getInStoreForm(InStoreFormDTO dto, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
         return new MyPage<>(mapper.getInStoreForm(dto));
     }
 
@@ -411,15 +415,15 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         SpareStore spareStore = new SpareStore();
         spareStore.setSpareId(model.getSpareId());
         spareStore = spareStoreMapper.selectOne(spareStore);
-        if(spareStore==null){
+        if (spareStore == null) {
             throw new BusinessException("该备件暂未选择库位，请前往备件基础信息修改！");
         }
 
-        BigDecimal num = spareStore.getNum()==null?new BigDecimal(0):spareStore.getNum();
-        BigDecimal maxStock = sparePartInfo.getMaxStock()==null?new BigDecimal(0):sparePartInfo.getMaxStock();
+        BigDecimal num = spareStore.getNum() == null ? new BigDecimal(0) : spareStore.getNum();
+        BigDecimal maxStock = sparePartInfo.getMaxStock() == null ? new BigDecimal(0) : sparePartInfo.getMaxStock();
 
-        if (num.intValue()+model.getInNum()>maxStock.intValue()){
-            throw new BusinessException("该备件的最大库存量为"+maxStock+"目前已超出，请修改入库数量或者先增加备件最大库存！");
+        if (num.intValue() + model.getInNum() > maxStock.intValue()) {
+            log.info("该备件的最大库存量为" + maxStock + "目前已超出，请修改入库数量或者先增加备件最大库存！,备件id：" + sparePartInfo.getId());
         }
         UserInfo userInfo = SecurityUtils.getUserInfo();
         Weekend<InStoreForm> weekend = new Weekend<>(InStoreForm.class);
@@ -431,7 +435,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         model.setStatus(InStoreStatusEnum.EXECUTING.getValue());
         InStoreForm inStoreForm = super.saveModelByDTO(model);
         //修改库存
-        spareStore.setNum(new BigDecimal(num.intValue()+model.getInNum()));
+        spareStore.setNum(new BigDecimal(num.intValue() + model.getInNum()));
         spareStoreMapper.updateByPrimaryKeySelective(spareStore);
 
     }
@@ -440,9 +444,9 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     public InStoreForm saveInStoreForm(InStoreFormDTO model) {
         Store store = storeService.getModelById(model.getStoreId());
         if (store == null) {
-            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId() );
+            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId());
         }
-        if (store.getLevel().equals(StoreLevelEnum.ZONGCANG)){
+        if (store.getLevel().equals(StoreLevelEnum.ZONGCANG)) {
             throw new BusinessException("请选择库位");
         }
         UserInfo userInfo = SecurityUtils.getUserInfo();
@@ -496,7 +500,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     public void updateModelByDTO(InStoreFormDTO model) {
         Store store = storeService.getModelById(model.getStoreId());
         if (store == null) {
-            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId() );
+            throw new BusinessException("仓库不存在, storeId:" + model.getStoreId());
         }
         if (store.getLevel().equals(StoreLevelEnum.ZONGCANG)) {
             throw new BusinessException("请选择库位");