bug修改

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java

@@ -9,6 +9,7 @@ import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.OptionalBomConstant;
 import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery;
+import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.OptionalEbomConfigService;
@@ -94,21 +95,30 @@ public class OptionalEbomApi extends BaseApi {
 
     @PutMapping("updateStatus")
     @ApiOperation("更改设备状态")
-    public ResultVO<Boolean> updateStatus(@ApiParam("机型id") @RequestParam("rowId") Long rowId, @ApiParam("状态（0 为隐藏 1显示）") @RequestParam("status") Integer status) {
+    //@ApiParam("机型id") @RequestParam("rowId") Long rowId, @ApiParam("状态（0 为隐藏 1显示）") @RequestParam("status") Integer status
-        if (status != OptionalBomConstant.EnableEnum.HIDDEN.getValue() || status != OptionalBomConstant.EnableEnum.SHOW.getValue()) {
+    public ResultVO<Boolean> updateStatus(@RequestBody OptionalEbomUpdateDTO input ) {
-            return ResultVO.error(STATE.ParamErr, "数据不在范围内");
+        if(input.getRowId()==null || input.getStatus() ==null){
+            return ResultVO.error(STATE.ParamErr, "操作数据为空");
         }
+        if (input.getStatus().equals( OptionalBomConstant.EnableEnum.HIDDEN.getValue()) || input.getStatus().equals(OptionalBomConstant.EnableEnum.SHOW.getValue())) {
+
+
             OptionalEbomMainDTO dto = new OptionalEbomMainDTO();
-        dto.setRowId(rowId);
+            dto.setRowId(input.getRowId());
-        dto.setIsEnable(status);
+            dto.setIsEnable( input.getStatus());
             dto.setUpdatedTime(new Date());
             return ResultVO.success(this.optionalEbomMainService.updateRowById(dto));
+        }else {
+            return ResultVO.error(STATE.ParamErr, "数据不在范围内");
+        }
     }
 
     @DeleteMapping("deleteDevice")
     @ApiOperation("删除设备")
     public ResultVO<Boolean> deleteDevice(@RequestBody List<Long> rowIds) {
-
+        if (  CollectionUtil.isEmpty(rowIds)) {
+            return ResultVO.error(STATE.ParamErr, "选择待删除数据");
+        }
         OptionalEbomMainDelDTO dto = new OptionalEbomMainDelDTO();
         dto.setRowIdList(rowIds);
         try {
@@ -127,15 +137,21 @@ public class OptionalEbomApi extends BaseApi {
 
     @PutMapping("updateOptionStatus")
     @ApiOperation("更改选项状态")
-    public ResultVO<Boolean> updateOptionStatus(@ApiParam("选项id") @RequestParam("rowId") Long rowId, @ApiParam("状态（0 为隐藏 1显示）") @RequestParam("status") Integer status) {
+    public ResultVO<Boolean> updateOptionStatus(@RequestBody OptionalEbomUpdateDTO input) {
-        if (status != OptionalBomConstant.EnableEnum.HIDDEN.getValue() || status != OptionalBomConstant.EnableEnum.SHOW.getValue()) {
+        if(input.getRowId()==null || input.getStatus() ==null){
-            return ResultVO.error(STATE.ParamErr, "数据不在范围内");
+            return ResultVO.error(STATE.ParamErr, "操作数据为空");
         }
+        if ( input.getStatus() .equals( OptionalBomConstant.EnableEnum.HIDDEN.getValue()) || input.getStatus() .equals(OptionalBomConstant.EnableEnum.SHOW.getValue())) {
+
+
             OptionalEbomImportChildVO vo = new OptionalEbomImportChildVO();
-        vo.setRowId(rowId);
+            vo.setRowId(input.getRowId());
-        vo.setIsEnable(status);
+            vo.setIsEnable(input.getStatus() );
 
             return ResultVO.success(this.optionalEbomImportChildService.openCloseStatus(vo));
+        }else {
+            return ResultVO.error(STATE.ParamErr, "数据不在范围内");
+        }
     }
 
     @DeleteMapping("deleteOption")
@@ -162,7 +178,7 @@ public class OptionalEbomApi extends BaseApi {
         if (dto.getPartType() != OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue() && dto.getPartType() != OptionalBomConstant.PartTypeEnum.PART_TYPE_CHECBOX.getValue()) {
             return ResultVO.error("数据{partType}类型错误");
         }
-        if(dto.getRootRowId()==null || dto.getRootRowId()==0){
+        if(dto.getRootRowId()==null ){
             return ResultVO.error("rootRowId不能为空");
         }
 
@@ -183,10 +199,16 @@ public class OptionalEbomApi extends BaseApi {
     }
 
 
-    @GetMapping("ebomEditTree")
+    @PostMapping("ebomEditTree")
     @ApiOperation("编辑机型下选配")
-    public ResultVO<OptionalEbomConfigAggregVO> ebomEditTree(@ApiParam("机型设备id") @RequestParam("rowId") Long rowId) {
+    public ResultVO<OptionalEbomConfigAggregVO> ebomEditTree(@RequestBody OptionalEbomImportChildQuery query) {
-        return ResultVO.success(aggregOptionConfigService.ebomEditTree(rowId));
+
+        if(query.getRootRowId()==null ){
+            return ResultVO.error("rootRowId不能为空");
+        }
+
+
+        return ResultVO.success(aggregOptionConfigService.ebomEditTree(query));
     }
 
 
@@ -219,7 +241,7 @@ public class OptionalEbomApi extends BaseApi {
     @ApiOperation("删除暂存")
     public ResultVO<Boolean> deleteTmp(@RequestBody List<Long> rowIds) {
 
-        if(CollectionUtil.isNotEmpty(rowIds)){
+        if(CollectionUtil.isEmpty(rowIds)){
             return ResultVO.error("选择删除的数据");
         }
         try {
@@ -237,23 +259,34 @@ public class OptionalEbomApi extends BaseApi {
     }
 
     @PostMapping ("submitTmpOptionTree")
-    @ApiOperation("提交/变更暂存数据")
+    @ApiOperation("变更暂存数据")
-    public ResultVO<Boolean> submitTmpOptionTree(OptionalEbomConfigDTO   dto) {
+    public ResultVO<Boolean> submitTmpOptionTree(@RequestBody OptionalEbomConfigDTO   dto) {
+
+
+        return ResultVO.success(aggregOptionConfigService.submitTmpOptionTree(dto));
+
+
+
+    }
+
+
+    @PostMapping ("createTmpOptionTree")
+    @ApiOperation("提交暂存数据,rowId设备id")
+    public ResultVO<OptionalEbomConfigVO> createTmpOptionTree(@RequestBody OptionalEbomConfigDTO   dto) {
+
 
         if(dto.getRowId()==null){
+            return  ResultVO.error(STATE.ParamErr, "设备rowId不能空");
+        }
+        if(CollectionUtil.isEmpty(dto.getOptions())){
+            return  ResultVO.error(STATE.ParamErr, "options 空数据");
+        }
             try {
                 return ResultVO.success(optionalEbomConfigService.buildTmpWork(dto));
             } catch (NflgBusinessException e) {
                 return ResultVO.error(e.getState(), e.getMsg());
             }
 
-    }else{
-        return ResultVO.success(aggregOptionConfigService.submitTmpOptionTree(dto));
-    }
-
-
-
-
 
     }
 
@@ -280,7 +313,7 @@ public class OptionalEbomApi extends BaseApi {
      */
     @GetMapping("publish")
     @ApiOperation("发布生成")
-    public ResultVO<Boolean> publish(@ApiParam("暂存id") @RequestParam("rowId") Long rowId) {
+    public ResultVO<Boolean> publish(@RequestBody OptionalEbomPublishAddDTO dto) {
 
         return ResultVO.success(true);
     }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportChildMapper.java

@@ -7,6 +7,7 @@ package com.nflg.product.bomnew.mapper.master;
  import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
  import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity;
+ import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery;
  import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO;
  import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,6 +24,9 @@ public interface OptionalEbomImportChildMapper extends BaseMapper<OptionalEbomIm
 
  List<OptionalEbomImportChildVO> getByRootRowIdList(@Param("rootRowId") Long rootRowId);
 
+
+ public List<OptionalEbomImportChildVO> getByRootRowList(@Param("query") OptionalEbomImportChildQuery query) ;
+
 int insertOrUpdateBatch(@Param("entities") List<OptionalEbomImportChildEntity> entities);
 
  int openCloseStatus (OptionalEbomImportChildEntity entity);

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java

@@ -3,49 +3,50 @@ package com.nflg.product.bomnew.pojo.query;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 import java.util.Date;
+
 @Data
 @ApiModel("ebom选配件表")
 @Accessors(chain = true)
 public class OptionalEbomImportChildQuery implements Serializable {
-/**主键*/    @ApiModelProperty(value = "主键")
-    private Long rowId;
-/**选项id*/    @ApiModelProperty(value = "选项id")
-    private Long parentRowId;
-/**根节点id*/    @ApiModelProperty(value = "根节点id")
-    private Long rootRowId;
-/**物料编码*/    @ApiModelProperty(value = "物料编码")
-    private String materialNo;
-/**物料名*/    @ApiModelProperty(value = "物料名")
-    private String materialName;
-/**物料描述*/    @ApiModelProperty(value = "物料描述")
-    private String materialDesc;
-/**图号*/    @ApiModelProperty(value = "图号")
-    private String drawingNo;
-/**部件类型(1 单选 2 多选)*/    @ApiModelProperty(value = "部件类型(1 单选 2 多选)")
-    private Integer partType;
-/**是否显示(0不显示 1显示)*/    @ApiModelProperty(value = "是否显示(0不显示 1显示)")
-    private Integer isEnable;
-/**是否标配(0 否 1是)*/    @ApiModelProperty(value = "是否标配(0 否 1是)")
-    private Integer chooseStatus;
-/**备注*/    @ApiModelProperty(value = "备注")
-    private String remak;
-/**数据来源 (0 :excel 1:手动录入)*/    @ApiModelProperty(value = "数据来源 (0 :excel 1:手动录入)")
-    private Integer source;
-/**是否删除(0 :否 1：是)*/    @ApiModelProperty(value = "是否删除(0 :否 1：是)")
-    private Integer isDel;
-/**创建时间*/    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-/**操作人编码*/    @ApiModelProperty(value = "操作人编码")
-    private String createdBy;
 
 
+    /**
+     * 根节点id
+     */
+    @ApiModelProperty(value = "设备根节点id")
+    private Long rootRowId;
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialNo;
+    /**
+     * 图号
+     */
+    @ApiModelProperty(value = "图号")
+    private String drawingNo;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+    /**
+     * 变更时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java

@@ -71,6 +71,13 @@ public class OptionalEbomImportChildVO implements Serializable {
      */
     @ApiModelProperty(value = "是否标配(0 否 1是)")
     private Integer chooseStatus;
+
+
+    @ApiModelProperty(value = "当前选择状态(0 否 1是)")
+    private Integer optionStatus;
+
+
+
     /**
      * 备注
      */

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java

@@ -1,6 +1,9 @@
 package com.nflg.product.bomnew.service;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.TypeReference;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +18,7 @@ import com.nflg.product.bomnew.mapper.master.OptionalEbomConfigMapper;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomConfigDTO;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigREntity;
+import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomMainQuery;
@@ -28,6 +32,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 选配方案清单(OptionalEbomConfig)表服务实现类
@@ -75,11 +80,11 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
      * @return
      * @throws NflgBusinessException
      */
-    public Boolean buildTmpWork(OptionalEbomConfigDTO dto) throws NflgBusinessException {
+    public OptionalEbomConfigVO buildTmpWork(OptionalEbomConfigDTO dto) throws NflgBusinessException {
 
         OptionalEbomMainVO optionalEbomMainVO = optionalEbomMainService.getByRowId(dto.getRowId());
-        if (optionalEbomMainVO == null) {
+        if (optionalEbomMainVO == null || StrUtil.isEmpty(optionalEbomMainVO.getDeviceNo())) {
-            throw new NflgBusinessException(STATE.SystemErr, "查询数据不存在");
+            throw new NflgBusinessException(STATE.SystemErr, "查询设备数据不存在");
         }
 
         OptionalEbomConfigEntity optionalEbomConfigEntity = new OptionalEbomConfigEntity();
@@ -91,14 +96,24 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
         optionalEbomConfigEntity.setDeviceName(optionalEbomMainVO.getDeviceName());
         optionalEbomConfigEntity.setDeptName(SessionUtil.getDepartName());
         optionalEbomConfigEntity.setCreatedTime(new Date());
+        optionalEbomConfigEntity.setParentRowId(dto.getRowId());
         optionalEbomConfigEntity.setUpdatedTime(optionalEbomConfigEntity.getCreatedTime());
 
-        optionalEbomConfigEntity.setConfigNo(DateUtil.now());
+        optionalEbomConfigEntity.setConfigNo(UUID.randomUUID().toString());
         optionalEbomConfigEntity.setEditStatus(OptionalBomConstant.PublishEnum.TMP.getValue());
         this.saveOrUpdate(optionalEbomConfigEntity);
 
 
-    return insertConfigRelation(optionalEbomConfigEntity.getRowId(), dto.getOptions());
+      insertConfigRelation(optionalEbomConfigEntity.getRowId(), dto.getOptions());
+
+
+        OptionalEbomConfigVO optionalEbomConfigVO = Convert.convert(new TypeReference<OptionalEbomConfigVO>() {
+        }, optionalEbomConfigEntity);
+
+
+        return optionalEbomConfigVO;
+
+
     }
 
     public  Boolean insertConfigRelation(Long rowId,List<OptionalEbomConfigDTO.OptionInfoDTO> rList){

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java

@@ -15,6 +15,7 @@ import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildAddDTO;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildDTO;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDelDTO;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity;
+import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO;
 import org.apache.ibatis.annotations.Param;
@@ -37,6 +38,9 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
         return getBaseMapper().getByRootRowIdList(rootRowId);
     }
 
+    public List<OptionalEbomImportChildVO> getByRootRowList(OptionalEbomImportChildQuery query) {
+        return getBaseMapper().getByRootRowList(query);
+    }
 
 
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java

@@ -13,6 +13,7 @@ import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigREntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
+import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
 import com.nflg.product.bomnew.service.OptionalEbomConfigService;
 import com.nflg.product.bomnew.service.OptionalEbomImportChildService;
@@ -140,12 +141,12 @@ public class AggregOptionConfigService {
      * @param rowId
      * @return
      */
-    public OptionalEbomConfigAggregVO ebomEditTree(Long rowId) {
+    public OptionalEbomConfigAggregVO ebomEditTree(OptionalEbomImportChildQuery query) {
 
-        List<OptionalEbomImportVO> listParent = optionalEbomImportService.getByRootIdList(rowId);
+        List<OptionalEbomImportVO> listParent = optionalEbomImportService.getByRootIdList(query.getRootRowId());
-        List<OptionalEbomImportChildVO> listChild = optionalEbomImportChildService.getByRootRowIdList(rowId);
+        List<OptionalEbomImportChildVO> listChild = optionalEbomImportChildService.getByRootRowList(query);
 
-        OptionalEbomMainVO optionalEbomMainVO = optionalEbomMainService.getByRowId(rowId);
+        OptionalEbomMainVO optionalEbomMainVO = optionalEbomMainService.getByRowId(query.getRootRowId());
         OptionalEbomConfigAggregVO optionalEbomConfigAggregVO = filterTree(listParent, listChild);
 
         optionalEbomConfigAggregVO.setDeviceInfo(optionalEbomMainVO);

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java

@@ -182,9 +182,9 @@ public class OptionalExcelService {
                     //构建测试数据 无物料号 用图号代替
                     for (OptionalEbomImportChildDTO childDTO : listChild) {
                         if (!childDTO.getTag() && StringUtils.isEmpty(childDTO.getMaterialNo())) {
-                            childDTO.setMaterialNo(childDTO.getDrawingNo());
+                           // childDTO.setMaterialNo(childDTO.getDrawingNo());
-                            // childDTO.setError(childDTO.getError()|OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getValue());
+                             childDTO.setError(childDTO.getError()|OptionalBomConstant.ExcelErrorTagEnum.MATERIA_NO_UNKOWN.getValue());
-                            // item1.setError(true);
+                             item1.setError(true);
                         }
                     }
 
@@ -197,7 +197,7 @@ public class OptionalExcelService {
 
         //检查是否满足条件 除了‘无’  ，物料号不能为空
         String hintMsg=isValiData(optionalEbomInportExcelDTO.getOptionInfo());
-        if(!StrUtil.isEmpty(hintMsg)){
+        if( StrUtil.isNotEmpty(hintMsg)){
             throw new NflgBusinessException(STATE.Error,hintMsg);
         }
 

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml

@@ -70,7 +70,8 @@
                t1.created_time,
                t1.updated_time,
                t1.created_by,
-               t2.choose_status  from
+               t1.choose_status,
+               t2.choose_status  as option_status from
             t_optional_ebom_config_r as t2 LEFT JOIN  t_optional_ebom_import_child as t1 on t2.option_row_id=t1.row_id
                 where t1.is_enable=1 and t2.parent_row_id=#{rowId}
     </select>
@@ -92,7 +93,8 @@
                t1.created_time,
                t1.updated_time,
                t1.created_by,
-               t2.choose_status  from
+               t1.choose_status,
+               t2.choose_status as  option_status from
             t_optional_ebom_config_r as t2 LEFT JOIN  t_optional_ebom_import_child as t1 on t2.option_row_id=t1.row_id
         where t1.is_enable=1  and  t2.choose_status =1 and t2.parent_row_id=#{rowId} and (t1.material_no!=null or t1.material_no!='')
     </select>

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml

@@ -32,6 +32,29 @@ row_id,parent_row_id,root_row_id,material_no,material_name,material_desc,drawing
         where root_row_id = #{rootRowId}
     </select>
 
+    <select id="getByRootRowList" resultType="com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO">
+        select
+        <include refid="Base_Column_List" />
+        from t_optional_ebom_import_child
+        where root_row_id = #{query.rootRowId}
+
+        <if test="query.materialNo != null and query.materialNo != ''">
+            and  material_no    like concat('%', '${query.materialNo}', '%')
+        </if>
+
+
+        <if test="query.drawingNo != null and query.drawingNo != ''">
+            and drawing_no   like concat('%', '${query.drawingNo}', '%')
+        </if>
+
+        <if test="query.startTime != null and query.endTime != null">
+            <![CDATA[  and created_time >= #{query.startTime} and created_time < #{query.endTime}]]>
+        </if>
+
+
+
+    </select>
+
 
 
 

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml

@@ -48,7 +48,7 @@
 
 
             <if test="query.realName != null and query.realName != ''">
-                and a.real_name like concat('%', '${query.realName}', '%')
+                and real_name like concat('%', '${query.realName}', '%')
             </if>
 
         </where>