|
|
|
|
@ -209,12 +209,12 @@ public class ChanjetSchedule {
|
|
|
|
|
insertList.forEach(xo -> {
|
|
|
|
|
//
|
|
|
|
|
TplusLastestBomDO existTplusLastestBomDO = tplusLastestBomMapper.selectOne(new LambdaUpdateWrapper<TplusLastestBomDO>(){{
|
|
|
|
|
eq(TplusLastestBomDO::getTopCode,xo.getTopCode())
|
|
|
|
|
eq(TplusLastestBomDO::getTopCode,so.getProjectSubCode())
|
|
|
|
|
.eq(TplusLastestBomDO::getProjectSubCode,xo.getProjectSubCode()).last("limit 1");
|
|
|
|
|
}});
|
|
|
|
|
|
|
|
|
|
if(procedureDOS.stream().filter(po->po.getName().equals(xo.getProcedureName()) && po.getCode().equals(xo.getProcedureCode())).count()>0){
|
|
|
|
|
ProcedureDO procedureDO = procedureDOS.stream().filter(po->po.getName().equals(xo.getProcedureName()) && po.getCode().equals(xo.getProcedureCode())).collect(Collectors.toList()).get(0);
|
|
|
|
|
if(procedureDOS.stream().filter(po->po.getCode().equals(xo.getProcedureCode())).count()>0){
|
|
|
|
|
ProcedureDO procedureDO = procedureDOS.stream().filter(po->po.getCode().equals(xo.getProcedureCode())).collect(Collectors.toList()).get(0);
|
|
|
|
|
|
|
|
|
|
xo.setProcedureId(procedureDO.getId()).setProcedureCode(procedureDO.getCode()).setProcedureName(procedureDO.getName());
|
|
|
|
|
|
|
|
|
|
@ -335,7 +335,7 @@ public class ChanjetSchedule {
|
|
|
|
|
throw exception(CALL_API_ERROR);
|
|
|
|
|
}
|
|
|
|
|
if(CollUtil.isNotEmpty(result.getData())){
|
|
|
|
|
QueryBomResVO topLayer = result.getData().get(0);
|
|
|
|
|
QueryBomResVO topLayer = result.getData().stream().filter(ko->!ko.isDisabled()).collect(Collectors.toList()).get(0);
|
|
|
|
|
resultData = topLayer.getBOMChildDTOs();
|
|
|
|
|
if(CollUtil.isNotEmpty(resultData)){
|
|
|
|
|
for (BOMChildDTOs dto : resultData) {
|
|
|
|
|
@ -416,7 +416,9 @@ public class ChanjetSchedule {
|
|
|
|
|
public List<QueryCurrentStockResVO> queryStock(List<String> materialCodeList, Long warehouseId) throws ChanjetApiException {
|
|
|
|
|
List<QueryCurrentStockResVO> dataList = new ArrayList<>(16);
|
|
|
|
|
|
|
|
|
|
List<MaterialDO> materialDOList = materialMapper.selectList(MaterialDO::getCode, materialCodeList);
|
|
|
|
|
List<MaterialDO> materialDOList = materialMapper.selectList(new LambdaUpdateWrapper<MaterialDO>(){{
|
|
|
|
|
in(MaterialDO::getCode,materialCodeList);
|
|
|
|
|
}});
|
|
|
|
|
|
|
|
|
|
// 无存货信息，物料信息从物料表取
|
|
|
|
|
for (MaterialDO aDo : materialDOList) {
|
|
|
|
|
|
