完善

platform-dao/src/main/resources/application-daoDev.yml

@@ -3,10 +3,10 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://59.110.28.5:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
-        username: sbgl
+        url: jdbc:mysql://localhost:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        username: root
         # password: mysql?123!@MYSQL
-        password: sbgl@QYKH@$_^mysql
+        password: 123456
         # password: sbgld@QYKH@$_e^mysqlv
         filters: wall,stat
         filter:

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

@@ -28,6 +28,7 @@ import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.entity.sqarepartmanage.SpareType;
 import com.platform.dao.entity.store.InStoreDetail;
 import com.platform.dao.entity.store.SpareStore;
+import com.platform.dao.entity.store.Store;
 import com.platform.dao.entity.upms.SysDept;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
@@ -40,6 +41,7 @@ import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
 import com.platform.dao.mapper.sqarepartmanage.SpareTypeMapper;
 import com.platform.dao.mapper.store.SpareStoreMapper;
+import com.platform.dao.mapper.store.StoreMapper;
 import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.util.MessageTemplateUtil;
@@ -54,6 +56,7 @@ import com.platform.service.sqarepartmanage.SpareTypeService;
 import com.platform.service.util.CodeFileUtils;
 import com.platform.service.util.SysFileUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.session.StoreType;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -85,6 +88,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
     private final SbInfoMapper sbInfoMapper;
     private final SpareTypeMapper spareTypeMapper;
     private final SbModelMapper sbModelMapper;
+    private final StoreMapper storeMapper;
     private final SbModelSpareBomMapper sbModelSpareBomMapper;
     private final SpareStoreMapper spareStoreMapper;
     private final Environment environment;
@@ -519,6 +523,13 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
             if (StringUtils.isBlank(model.getStoreId())) {
                 throw new BusinessException("请设置库位信息");
             }
+            Store store = storeMapper.selectByPrimaryKey(model.getStoreId());
+            if (store == null) {
+                throw new BusinessException("找不到仓库，请重新选择");
+            }
+            if (StoreLevelEnum.ZONGCANG.getValue().equals(store.getLevel())) {
+                throw new BusinessException("备件不可放到总仓，请具体到库位");
+            }
             spareStore.setStoreId(model.getStoreId());
             BigDecimal price = model.getInitialValue();
             spareStore.setPrice(model.getInitialValue());

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

@@ -76,6 +76,7 @@ public class SpareTypeServiceImpl extends BaseServiceImpl<SpareTypeMapper, Spare
         WeekendCriteria<SpareType, Object> weekendCriteriaChild = weekendChild.weekendCriteria();
         weekendCriteriaChild.andEqualTo(SpareType::getParentId, id);
         mapper.deleteByExample(weekendChild);
+
     }
 
     @Override

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

@@ -30,6 +30,7 @@ import com.platform.dao.entity.store.SpareStore;
 import com.platform.dao.entity.store.Store;
 import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.DeptNatureEnum;
+import com.platform.dao.enums.StoreLevelEnum;
 import com.platform.dao.mapper.store.SpareStoreMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.vo.query.store.SpareStoreVO;
@@ -93,6 +94,13 @@ public class SpareStoreServiceImpl extends BaseServiceImpl<SpareStoreMapper, Spa
     @Override
     public SpareStore saveModelByDTO(SpareStoreDTO model) {
 
+        Store store = storeService.getModelById(model.getStoreId());
+        if (store == null) {
+            throw new BusinessException("找不到仓库，请重新选择");
+        }
+        if (StoreLevelEnum.ZONGCANG.getValue().equals(store.getLevel())) {
+            throw new BusinessException("备件不可放到总仓，请具体到库位");
+        }
         // 判断是否已经存在，已经存在则不新增
         SpareStore check = new SpareStore();
         check.setSpareId(model.getSpareId());

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

@@ -7,7 +7,6 @@ import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
@@ -16,25 +15,20 @@ import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.entity.store.SpareStore;
 import com.platform.dao.entity.store.Store;
 import com.platform.dao.entity.upms.SysDept;
-import com.platform.dao.entity.upms.SysLog;
 import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.DelFlagEnum;
 import com.platform.dao.enums.DeptNatureEnum;
 import com.platform.dao.enums.StoreLevelEnum;
-import com.platform.dao.mapper.store.InStoreDetailMapper;
 import com.platform.dao.mapper.store.SpareStoreMapper;
 import com.platform.dao.mapper.upms.SysDeptMapper;
-import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.util.UserUtil;
 import com.platform.dao.vo.query.store.StoreVO;
 import com.platform.dao.vo.query.upms.SysDeptVO;
-import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.store.StoreService;
 import com.platform.service.upms.SysDeptService;
 import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.util.ExecuteSql;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.dao.mapper.store.StoreMapper;