diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomFactorySplitRuleEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomFactorySplitRuleEntity.java
index 93436bee..94ee743c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomFactorySplitRuleEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomFactorySplitRuleEntity.java
@@ -185,6 +185,13 @@ public class BomFactorySplitRuleEntity implements Serializable {
@TableField(value = "updated_time")
@ApiModelProperty(value = "更新时间")
private LocalDateTime updatedTime;
+
+ /**
+ * 项目类别
+ */
+ @TableField(value = "project_type")
+ @ApiModelProperty(value = "项目类别")
+ private String projectType;
private static final long serialVersionUID = -87704764754587418L;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleExcelVO.java
index f92bcd20..883677ed 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleExcelVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleExcelVO.java
@@ -27,6 +27,9 @@ public class BomFactorySplitRuleExcelVO {
@ExcelColumn("规则名称")
private String ruleName;
+ @ExcelColumn("项目类别")
+ private String projectType;
+
@ExcelColumn("物料分类代码")
private String materialCategoryCode;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleVO.java
index e0f69419..8f684a1f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomFactorySplitRuleVO.java
@@ -82,5 +82,7 @@ public class BomFactorySplitRuleVO {
private Date updatedTime;
private Boolean checked = false;
+
+ private String projectType;
}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalPlmBomVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalPlmBomVO.java
index fac40d79..99b60977 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalPlmBomVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalPlmBomVO.java
@@ -41,6 +41,13 @@ public class BomOriginalPlmBomVO extends BaseMaterialVO implements Serializable
*/
@ApiModelProperty(value = "图号")
private String chartNo;
+
+ public String getChartNo(){
+ if(chartNo.equals("无")){
+ return "";
+ }
+ return chartNo;
+ }
/**
* 修改版
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 f1f78b0a..995dc2c5 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
@@ -545,6 +545,9 @@ public class BomNewOriginalParentService extends ServiceImpl
+
- row_id, rule_group_depth, rule_group_code, rule_group_name, rule_name, material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix, material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code, next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time
-
+ row_id, rule_group_depth, rule_group_code, rule_group_name, rule_name, material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix, material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code, next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time ,project_type
+
+
+
+
+ insert into t_bom_factory_split_rule(rule_group_depth, rule_group_code, rule_group_name, rule_name,
+ material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix,
+ material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code,
+ next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time,project_type)
+ values
+
+ (#{entity.ruleGroupDepth}, #{entity.ruleGroupCode}, #{entity.ruleGroupName}, #{entity.ruleName},
+ #{entity.materialCategoryCode}, #{entity.materialCategoryName}, #{entity.drawingPrefix},
+ #{entity.drawingContain}, #{entity.drawingSuffix}, #{entity.materialNameContain}, #{entity.materialTexture},
+ #{entity.deptRowId}, #{entity.deptName}, #{entity.nextMaterialCategoryCode},
+ #{entity.nextMaterialCategoryName}, #{entity.factoryCode}, #{entity.status}, #{entity.remark},
+ #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy}, #{entity.updatedTime},#{entity.projectType})
+
+
+
+
+ insert into t_bom_factory_split_rule(rule_group_depth, rule_group_code, rule_group_name, rule_name,
+ material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix,
+ material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code,
+ next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time,project_type)
+ values
+
+ (#{entity.ruleGroupDepth}, #{entity.ruleGroupCode}, #{entity.ruleGroupName}, #{entity.ruleName},
+ #{entity.materialCategoryCode}, #{entity.materialCategoryName}, #{entity.drawingPrefix},
+ #{entity.drawingContain}, #{entity.drawingSuffix}, #{entity.materialNameContain}, #{entity.materialTexture},
+ #{entity.deptRowId}, #{entity.deptName}, #{entity.nextMaterialCategoryCode},
+ #{entity.nextMaterialCategoryName}, #{entity.factoryCode}, #{entity.status}, #{entity.remark},
+ #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy}, #{entity.updatedTime},#{entity.projectType})
+
+ on duplicate key update
+ rule_group_depth = values(rule_group_depth) , rule_group_code = values(rule_group_code) , rule_group_name =
+ values(rule_group_name) , rule_name = values(rule_name) , material_category_code =
+ values(material_category_code) , material_category_name = values(material_category_name) , drawing_prefix =
+ values(drawing_prefix) , drawing_contain = values(drawing_contain) , drawing_suffix = values(drawing_suffix) ,
+ material_name_contain = values(material_name_contain) , material_texture = values(material_texture) ,
+ dept_row_id = values(dept_row_id) , dept_name = values(dept_name) , next_material_category_code =
+ values(next_material_category_code) , next_material_category_name = values(next_material_category_name) ,
+ factory_code = values(factory_code) , status = values(status) , remark = values(remark) , created_by =
+ values(created_by) , created_time = values(created_time) , updated_by = values(updated_by) , updated_time =
+ values(updated_time),project_type=values(project_type)
+
+
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/material/BomFactorySplitRuleDao.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/material/BomFactorySplitRuleDao.xml
deleted file mode 100644
index d9f5a3dc..00000000
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/material/BomFactorySplitRuleDao.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into t_bom_factory_split_rule(rule_group_depth, rule_group_code, rule_group_name, rule_name,
- material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix,
- material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code,
- next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time)
- values
-
- (#{entity.ruleGroupDepth}, #{entity.ruleGroupCode}, #{entity.ruleGroupName}, #{entity.ruleName},
- #{entity.materialCategoryCode}, #{entity.materialCategoryName}, #{entity.drawingPrefix},
- #{entity.drawingContain}, #{entity.drawingSuffix}, #{entity.materialNameContain}, #{entity.materialTexture},
- #{entity.deptRowId}, #{entity.deptName}, #{entity.nextMaterialCategoryCode},
- #{entity.nextMaterialCategoryName}, #{entity.factoryCode}, #{entity.status}, #{entity.remark},
- #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy}, #{entity.updatedTime})
-
-
-
-
- insert into t_bom_factory_split_rule(rule_group_depth, rule_group_code, rule_group_name, rule_name,
- material_category_code, material_category_name, drawing_prefix, drawing_contain, drawing_suffix,
- material_name_contain, material_texture, dept_row_id, dept_name, next_material_category_code,
- next_material_category_name, factory_code, status, remark, created_by, created_time, updated_by, updated_time)
- values
-
- (#{entity.ruleGroupDepth}, #{entity.ruleGroupCode}, #{entity.ruleGroupName}, #{entity.ruleName},
- #{entity.materialCategoryCode}, #{entity.materialCategoryName}, #{entity.drawingPrefix},
- #{entity.drawingContain}, #{entity.drawingSuffix}, #{entity.materialNameContain}, #{entity.materialTexture},
- #{entity.deptRowId}, #{entity.deptName}, #{entity.nextMaterialCategoryCode},
- #{entity.nextMaterialCategoryName}, #{entity.factoryCode}, #{entity.status}, #{entity.remark},
- #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy}, #{entity.updatedTime})
-
- on duplicate key update
- rule_group_depth = values(rule_group_depth) , rule_group_code = values(rule_group_code) , rule_group_name =
- values(rule_group_name) , rule_name = values(rule_name) , material_category_code =
- values(material_category_code) , material_category_name = values(material_category_name) , drawing_prefix =
- values(drawing_prefix) , drawing_contain = values(drawing_contain) , drawing_suffix = values(drawing_suffix) ,
- material_name_contain = values(material_name_contain) , material_texture = values(material_texture) ,
- dept_row_id = values(dept_row_id) , dept_name = values(dept_name) , next_material_category_code =
- values(next_material_category_code) , next_material_category_name = values(next_material_category_name) ,
- factory_code = values(factory_code) , status = values(status) , remark = values(remark) , created_by =
- values(created_by) , created_time = values(created_time) , updated_by = values(updated_by) , updated_time =
- values(updated_time)
-
-
-
-
-
-
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
index 35f8145a..8dd3caff 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
@@ -29,7 +29,7 @@ public class SessionUtil {
* @return
*/
public static String getUserCode() {
- return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse(null);
+ return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QMB07072700");
}
/**