Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
This commit is contained in:
commit
5d0142fee1
|
|
@ -40,7 +40,6 @@ import java.util.ArrayList;
|
|||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
@ -301,7 +300,9 @@ public class EbomApi extends BaseApi {
|
|||
@GetMapping("editDetail")
|
||||
@ApiOperation("编辑物料列表")
|
||||
public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId
|
||||
, @RequestParam("projectType") String projectType, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) {
|
||||
, @RequestParam("projectType") String projectType
|
||||
, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage
|
||||
, @RequestParam("parentBomRowId") Long parentBomRowId) {
|
||||
if (Objects.isNull(rowId)) {
|
||||
VUtils.isTure(true).throwMessage("rowId 不能为空");
|
||||
}
|
||||
|
|
@ -309,7 +310,7 @@ public class EbomApi extends BaseApi {
|
|||
VUtils.isTure(true).throwMessage("bomRowId不能为空");
|
||||
}
|
||||
|
||||
return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage));
|
||||
return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage, parentBomRowId));
|
||||
}
|
||||
|
||||
@PostMapping("updateProjectType")
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ public class EBomConstant {
|
|||
|
||||
public static final String PROJECT_TYPE_T="T";
|
||||
|
||||
public static final String KG="KG";
|
||||
|
||||
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
|
|
|
|||
|
|
@ -6,19 +6,29 @@ import lombok.Data;
|
|||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value = "com-nflg-product-bomnew-pojo-new-vo-BomNewEbomEditDetailVO")
|
||||
public class BomNewEbomEditDetailVO implements Serializable {
|
||||
public class BomNewEbomEditDetailVO implements Serializable {
|
||||
|
||||
/*
|
||||
* 当前节点
|
||||
*/
|
||||
@ApiModelProperty("当前节点")
|
||||
private BomNewEbomParentVO parent;
|
||||
|
||||
/*
|
||||
* 当前节点的子级
|
||||
*/
|
||||
@ApiModelProperty("当前节点的子级")
|
||||
private List<BomNewEbomParentVO> datas;
|
||||
|
||||
/*
|
||||
* 当前节点的上级节点
|
||||
*/
|
||||
@ApiModelProperty("当前节点的上级节点")
|
||||
private BomNewEbomParentVO parentParent;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1580,7 +1580,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
|||
return true;
|
||||
}
|
||||
|
||||
public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage) {
|
||||
public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage, Long parentBomRowId) {
|
||||
|
||||
BomNewEbomEditDetailVO vo = new BomNewEbomEditDetailVO();
|
||||
BomNewEbomParentVO parentVO;
|
||||
|
|
@ -1632,6 +1632,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
|||
|
||||
|
||||
vo.setParent(parentVO);
|
||||
vo.setParentParent(Convert.convert(BomNewEbomParentVO.class, this.getBaseMapper().selectById(parentBomRowId)));
|
||||
return vo;
|
||||
|
||||
}
|
||||
|
|
@ -2217,13 +2218,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
|||
query.setPage(1L);
|
||||
query.setPageSize(20L);
|
||||
}
|
||||
Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
|
||||
, query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
|
||||
Page<BomNewEbomParentVO> result;
|
||||
if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) {
|
||||
result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
|
||||
, query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
|
||||
//列表搜索
|
||||
materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
|
||||
return result;
|
||||
}
|
||||
query.setShowMySelfOnly(0);
|
||||
result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
|
||||
, query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
|
||||
//根据编号或图号搜索
|
||||
//从顶级开始查找
|
||||
List<BomNewEbomParentVO> roots = result.getRecords().stream()
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import com.nflg.product.bomnew.util.ListCommonUtil;
|
|||
import com.nflg.product.bomnew.util.VUtils;
|
||||
import com.nflg.product.bomnew.util.VersionUtil;
|
||||
import lombok.Getter;
|
||||
import org.aspectj.weaver.ast.ITestVisitor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
|
@ -116,7 +117,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
|
|||
BigDecimal totalWeightResult = BigDecimal.ZERO;
|
||||
List<Long> rowIds=new ArrayList<>();
|
||||
for (BomOriginalListVO item : list1) {
|
||||
numResult = NumberUtil.add(numResult, Objects.nonNull(item.getNum()) ? item.getNum() : BigDecimal.ZERO);
|
||||
BigDecimal numNew=BigDecimal.ZERO;
|
||||
if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
|
||||
numNew= item.getTotalWeight();
|
||||
}else {
|
||||
numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
|
||||
}
|
||||
// numResult = NumberUtil.add(numResult, Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
|
||||
numResult = NumberUtil.add(numResult, numNew);
|
||||
totalWeightResult = NumberUtil.add(totalWeightResult, item.getTotalWeight());
|
||||
rowIds.add(item.getRowId());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -473,12 +473,14 @@
|
|||
, b.*
|
||||
FROM t_bom_new_ebom_child b
|
||||
LEFT JOIN t_bom_new_ebom_parent a ON a.material_no = b.material_no
|
||||
<if test="materialNo!=null and materialNo!=''">
|
||||
WHERE b.material_no = #{materialNo}
|
||||
</if>
|
||||
<if test="drawingNo!=null and drawingNo!=''">
|
||||
WHERE b.drawingNo = #{drawingNo}
|
||||
</if>
|
||||
<where>
|
||||
<if test="materialNo!=null and materialNo!=''">
|
||||
AND b.material_no = #{materialNo}
|
||||
</if>
|
||||
<if test="drawingNo!=null and drawingNo!=''">
|
||||
AND b.drawing_no = #{drawingNo}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY b.order_number
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue