diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/TechnologyPackageParam.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/TechnologyPackageParam.java index 7cd9fc15..cfce765f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/TechnologyPackageParam.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/TechnologyPackageParam.java @@ -29,6 +29,14 @@ public class TechnologyPackageParam { @NotNull(message = "项目类别不能为空") private String projectType; + @ApiModelProperty("图号") + private String drawingNo; + + @ApiModelProperty("名称") + private String materialName; + + @ApiModelProperty("描述") + private String materialDesc; @ApiModelProperty("工艺包类型rowId(创建工艺包时用)") private Long technologyPackageTypeRowId; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index a61bd857..21bc63bc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -9,6 +9,7 @@ import cn.hutool.extra.spring.SpringUtil; import com.alibaba.excel.enums.BooleanEnum; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.ImmutableList; @@ -385,9 +386,9 @@ public class BomNewPbomParentService extends ServiceImpl materials = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, drawingNo).list(); @@ -408,11 +409,18 @@ public class BomNewPbomParentService extends ServiceImpl mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); +// String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); + String materialNo=mMap.get(key).getMaterialNo(); return materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); } @@ -804,7 +812,7 @@ public class BomNewPbomParentService extends ServiceImpl