修复excel导入缺材料，序号问题

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java

@@ -79,6 +79,7 @@ public class BomNewOriginalExcelDTO extends BaseImportExcelDTO {
     @ApiModelProperty("物料列表")
     private String materialCategoryCode;
 
+
     public String getCreatedBy() {
         return SessionUtil.getUserCode();
     }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java

@@ -117,10 +117,15 @@ public class BomNewOriginalChildEntity implements Serializable {
     @ApiModelProperty(value = "处理状态：1=待处理、2=已处理")
     private Integer editStatus;
 
-
+    @TableField(value = "status")
     @ApiModelProperty("状态 1=待转换、2=已转")
     private Integer status;
 
+
+    @TableField(value = "material_texture")
+    @ApiModelProperty("材料/材质")
+    private String materialTexture;
+
     public BigDecimal getTotalWeight() {
         return NumberUtil.mul(this.getUnitWeight(), this.num);
     }

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

@@ -401,6 +401,11 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
             PlmBomToOriginalConvert convert = new PlmBomToOriginalConvert();
             List<BomNewOriginalExcelDTO> chileds = excelContext.stream().filter(u -> u.getParentKey().equals(data.getLevelNo() + "-" + data.getRowNum())).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(chileds)) {
+                int i=1;
+                for (BomNewOriginalExcelDTO ch : chileds) {
+                    ch.setOrderNo(i);
+                    i++;
+                }
                 convert.convertOriginalBomFromExcel(Convert.convert(BomOriginalPlmBomVO.class, data), Convert.toList(BomOriginalPlmBomVO.class, chileds));
 
                 if (CollUtil.isNotEmpty(convert.getResultParent())) {
@@ -416,7 +421,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
 
     public static void handlerExcelRow(BomNewOriginalExcelDTO data) {
         data.setRowNum(rowNum.get());
-        data.setOrderNo(data.getLevelNo());
+       // data.setOrderNo(data.getLevelNo());
         data.setChartNo(StrUtil.trim(data.getChartNo()).replace("（","(").replace("）",")").replace(" ",""));
         rowNum.set(rowNum.get() + 1);
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java

@@ -117,7 +117,7 @@ public abstract class BaseConvert {
         parentEntity.setLastVersionIs(1);
         parentEntity.setMaterialTexture(material.getMaterial());
         parentEntity.setUnitWeight(material.getWeight());
-        parentEntity.setDeviseUserCode(material.getDesignBy());
+        parentEntity.setDeviseUserCode(SessionUtil.getUserCode());
         parentEntity.setDeviseName(SessionUtil.getRealName());
         parentEntity.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
         parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
@@ -150,6 +150,7 @@ public abstract class BaseConvert {
         childEntity.setMaterialNo(material.getMaterialNo());
         childEntity.setMaterialName(material.getMaterialName());
         childEntity.setMaterialDesc(material.getMaterialDesc());
+        childEntity.setMaterialTexture(material.getMaterial());
         childEntity.setUnitWeight(material.getWeight());
         childEntity.setNum(Convert.toBigDecimal(material.getQty()) );
         childEntity.setCreatedBy(SessionUtil.getUserCode());
@@ -173,6 +174,7 @@ public abstract class BaseConvert {
         childEntity.setMaterialNo(material.getMaterialNo());
         childEntity.setMaterialName(material.getMaterialName());
         childEntity.setMaterialDesc(material.getMaterialDesc());
+        childEntity.setMaterialTexture(material.getMaterial());
         childEntity.setUnitWeight(parent.getUnitWeight());
         childEntity.setNum(parent.getUnitWeight());
         childEntity.setCreatedBy(SessionUtil.getUserCode());

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

@@ -20,11 +20,12 @@
             <result column="edit_status" property="editStatus" jdbcType="INTEGER"/>
             <result column="created_time" property="createdTime"  jdbcType="TIMESTAMP"/>
             <result column="status" property="status" jdbcType="INTEGER"/>
+            <result column="material_texture" property="materialTexture" jdbcType="VARCHAR"/>
         </resultMap>
 
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status  </sql>
+        row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status ,material_texture </sql>
 
 
     <delete id="delOriginalChildNotInRowIds">