Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

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

@@ -205,4 +205,13 @@ public class OriginalBomApi extends BaseApi {
     }
 
 
+    @ApiOperation("导出-bom异常物料")
+    @PostMapping("downLoadErrorMaterial")
+    public void downLoadErrorMaterial(HttpServletResponse response){
+
+    }
+
+
+
+
 }

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

@@ -58,6 +58,7 @@ public class BaseMaterialVO {
     @ApiModelProperty("物料分类编码名称")
     private  String categoryName;
 
-
+    @ApiModelProperty("单位")
+    private String materialUnit;
 
 }

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

@@ -47,11 +47,7 @@ public class BomNewEbomChildVO extends BaseMaterialVO implements Serializable {
 
 
 
-    /**
+
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String materialUnit;
 
 
     /**

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

@@ -55,11 +55,6 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
 
 
 
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String materialUnit;
 
     /**
      * 单重

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

@@ -245,7 +245,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
                         child.setCurrentVersion(parentEntity.getCurrentVersion());
                         child.setStatus(parentEntity.getStatus());
-
                         child.setDeviseName(parentEntity.getDeviseName());
                         child.setDeviseUserCode(parentEntity.getDeviseUserCode());
 
@@ -269,7 +268,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         child.setDeviseUserCode(parent.getDeviseUserCode());
                         child.setDeviseName(parent.getDeviseName());
                         child.setDeptName(parent.getDeptName());
-
+                        child.setStatus(parent.getStatus());
+                        child.setEditStatus(parent.getEditStatus());
                         if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
                             child.setStatus(parent.getStatus());

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

@@ -186,7 +186,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                         try {
                             if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                                 child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
-                                child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
+                                //child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
                                 // child.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
                             }
                         }catch (Exception e){

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

@@ -280,7 +280,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         childEntity.setMaterialDesc(material.getMaterialDesc());
         childEntity.setMaterialTexture(material.getMaterial());
         childEntity.setUnitWeight(parent.getUnitWeight());
-        childEntity.setNum(parent.getUnitWeight());
+        childEntity.setNum(new BigDecimal(parent.getNum()) );
         childEntity.setCreatedBy(SessionUtil.getUserCode());
         // this.eBomChildResult.add(childEntity);
         return childEntity;

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

@@ -75,7 +75,7 @@
             and devise_name=#{query.deviseName}
         </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>
 

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

@@ -71,7 +71,7 @@
 
     <select id="getMaterialBaseInfo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
         select a.row_id as materialRowId,  material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,a.material_category_code ,material_get_type,drawing_no
-        ,material_texture as material ,material_texture , b.rel_category_code,b.category_name
+        ,material_texture as material ,material_texture , b.rel_category_code,b.category_name,material_unit
         from t_material_main a join t_material_category b on a.material_category_code=b.category_code
         where material_no in
         <foreach collection="materialNos" item="item" open="(" close=")" separator=",">