diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java
index b8697cbb..7d65549d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java
+++ b/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();
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
index b87c9a09..5fee5768 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
@@ -117,6 +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);
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 3b48f4ca..884a33d9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -155,8 +155,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                         child.setStatus(parentEntity.getStatus());
                         child.setDeviseName(parentEntity.getDeviseName());
                         child.setDeviseUserCode(parentEntity.getDeviseUserCode());
-                        child.setCreatedBy(parentEntity.getCreatedBy());
-                        child.setCreatedTime(parentEntity.getCreatedTime());
+                       // child.setCreatedBy(parentEntity.getCreatedBy());
+                       // child.setCreatedTime(parentEntity.getCreatedTime());
                         child.setBomRowId(parentEntity.getRowId());
                         child.setLevelNum(parentEntity.getLevelNum());
                         child.setDeptName(parentEntity.getDeptName());
@@ -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);
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
index 0f80d0a5..138490ba 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
+++ b/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());
@@ -125,7 +125,7 @@ public abstract class BaseConvert {
         parentEntity.setDeptName(SessionUtil.getDepartName());
 
         parentEntity.setSource(originalSourceEnum.getValue());
-        parentEntity.setCreatedBy(material.getCreatedBy());
+        parentEntity.setCreatedBy(SessionUtil.getUserCode());
         parentEntity.setCreatedTime(LocalDateTime.now());
 
         if  (StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&(material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) || material.getMaterialCategoryCode().startsWith("30") ||
@@ -150,9 +150,10 @@ 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(parent.getCreatedBy());
+        childEntity.setCreatedBy(SessionUtil.getUserCode());
         this.resultChild.add(childEntity);
         return childEntity;
 
@@ -173,9 +174,10 @@ 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());
         this.resultChild.add(childEntity);
         return childEntity;
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
index 6799a0f5..7c2921ec 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
@@ -16,6 +16,7 @@ import lombok.Setter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.RecursiveTask;
 import java.util.stream.Collectors;
 
@@ -92,7 +93,7 @@ public class OriginalBomDetailTask extends RecursiveTask<List<BomOriginalListVO>
         result.addAll(bomDetail);
 
         if (CollUtil.isNotEmpty(bomDetail)) {
-            List<BomOriginalListVO> collect = bomDetail.stream().filter(u -> u.getStatus().equals(1)).collect(Collectors.toList());
+            List<BomOriginalListVO> collect = bomDetail.stream().filter(u -> Objects.isNull(u.getStatus())|| u.getStatus().equals(1)).collect(Collectors.toList());
             levelNumAdd(collect.size());
             List<Long> childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList());
             if(CollUtil.isNotEmpty(childBowIds)) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
index 11bc5722..7662e7d6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
@@ -18,12 +18,14 @@
             <result column="remark" property="remark"  jdbcType="VARCHAR"/>
             <result column="created_by" property="createdBy"  jdbcType="VARCHAR"/>
             <result column="edit_status" property="editStatus" jdbcType="INTEGER"/>
-          <result column="created_time" property="createdTime"  jdbcType="TIMESTAMP"/>
+            <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">
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index d6111330..433adcbe 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -61,7 +61,7 @@
             </foreach>
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
-            and created_time between #{query.startDate} and #{query.endDate}
+            and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
         </if>
     </sql>
 
@@ -69,7 +69,7 @@
     <select id="getOriginalBomListPage" resultType="com.nflg.product.bomnew.pojo.vo.BomOriginalListVO">
         select * , 0 as parentRowId , row_id as bomRowId
         from t_bom_new_original_parent
-        where (root_is =1 or ( user_root_is=1 and created_by=#{userCode}) )
+        where (root_is | user_root_is=1   )
         <include refid="whr"/>
         order by user_root_is desc , created_time desc
     </select>