rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原始BOM列表

This commit is contained in:
大米 2023-11-27 19:37:57 +08:00
parent 2b6cb45fcd
commit f95a3de394
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,13 @@ public class BomNewOriginalChildEntity implements Serializable {
@ApiModelProperty("创建人")
private String createdBy;
/**
* 处理状态：1=待处理、2=已处理
*/
@TableField(value = "edit_status")
@ApiModelProperty(value = "处理状态：1=待处理、2=已处理")
private Integer editStatus;
public BigDecimal getTotalWeight() {
return NumberUtil.mul(this.getUnitWeight(), this.num);
}

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

@ -3,6 +3,8 @@ package com.nflg.product.bomnew.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
*
* @author 大米
@ -11,6 +13,10 @@ import lombok.Data;
@Data
public class BaseMaterialVO {
@ApiModelProperty("物料主数据行ID")
private List materialRowId;
@ApiModelProperty("物料编码")
private String materialNo;

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java
View File

@ -1,6 +1,7 @@
package com.nflg.product.bomnew.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -170,5 +171,7 @@ public class BomOriginalListVO extends BaseMaterialVO {
private static final long serialVersionUID = 1L;
}

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

@ -76,7 +76,10 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
* @return 原始BOM列表
*/
public Page<BomOriginalListVO> getOriginalBomListPage(OriginalBomQuery query) {
return this.getBaseMapper().getOriginalBomListPage(new Page<>(query.getPage(), query.getPageSize()), query,SessionUtil.getUserCode());
Page<BomOriginalListVO> result = this.getBaseMapper().getOriginalBomListPage(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode());
materialMainService.intiMaterialInfo(result.getRecords());
return result;
}
@ -124,6 +127,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
* @return
*/
public List<BomOriginalListVO> getChild(Long rowId) {
BomOriginalPlmParentEntity parent = originalPlmParentService.getBaseMapper().selectById(rowId);
List<BomOriginalListVO> parentChild = this.getBaseMapper().getParentChild(rowId);
materialMainService.intiMaterialInfo(parentChild);
if (CollUtil.isNotEmpty(parentChild)) {
@ -136,7 +140,6 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
BomNewOriginalParentEntity parentEntity = bomListMap.get(child.getDrawingNo());
child.setCurrentVersion(parentEntity.getCurrentVersion());
child.setStatus(parentEntity.getStatus());
child.setEditStatus(parentEntity.getEditStatus());
child.setDeviseName(parentEntity.getDeviseName());
child.setDeviseUserCode(parentEntity.getDeviseUserCode());
child.setCreatedBy(parentEntity.getCreatedBy());
@ -149,10 +152,11 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
}
}
else { //无BOM-版本时 确定版本号
child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
if( MaterialshouldBomExistUtil.checkShouldBomExist(child)){
child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
child.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
// child.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
}
}
}

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

@ -17,11 +17,12 @@
<result column="total_weight" property="totalWeight" jdbcType="DECIMAL"/>
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="created_by" property="createdBy" jdbcType="VARCHAR"/>
<result column="edit_status" property="editStatus" jdbcType="INTEGER"/>
</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 </sql>
row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by ,edit_status </sql>
</mapper>

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

@ -70,7 +70,7 @@
<select id="getMaterialBaseInfo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
select material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,material_category_code ,material_get_type,drawing_no
select row_id as materialRowId, material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,material_category_code ,material_get_type,drawing_no
from t_material_main
where material_no in
<foreach collection="materialNos" item="item" open="(" close=")" separator=",">