PC物料导入添加

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -27,7 +27,7 @@ public class MaterialBaseInfo extends BaseVOEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("物料基础信息id")
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.AUTO)
     private Long materialBaseInfoId;
 
     @ApiModelProperty("组织表ID")

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/persistence/MaterialBaseInfoImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.common.core.exception.ServiceException;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
@@ -82,6 +83,9 @@ public class MaterialBaseInfoImpl extends ServiceImpl<MaterialBaseInfoMapper, Ma
     @Override
     public MaterialBaseInfoPO getInfo(Long materialBaseInfoId) {
         MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectOne(new QueryWrapper<MaterialBaseInfo>().lambda().eq(MaterialBaseInfo::getMaterialBaseInfoId, materialBaseInfoId));
+        if (materialBaseInfo == null) {
+            throw new ServiceException("物料基础信息不存在，materialBaseInfoId=" + materialBaseInfoId);
+        }
         MaterialBaseInfoPO materialBaseInfoPO = new MaterialBaseInfoPO();
         BeanUtils.copyProperties(materialBaseInfo,materialBaseInfoPO);
         return materialBaseInfoPO;

mhd_wms/src/main/java/com/mhd/wms/domain/materialGoodsRule/repository/todo/MaterialGoodsRuleDO.java

@@ -46,8 +46,8 @@ public class MaterialGoodsRuleDO extends BaseVOEntity {
     @Excel(name = "批次编码")
     private String batchCode;
 
-    @ApiModelProperty("批次名称")
-    @Excel(name = "批次名称")
+    @ApiModelProperty("批次规则")
+    @Excel(name = "批次规则")
     private String batchName;
 
     @ApiModelProperty("上架库区id")