|
|
|
@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldRespVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldRespVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldMapper;
|
|
|
|
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO;
|
|
|
|
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO;
|
|
|
|
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO;
|
|
|
|
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
|
|
|
|
@ -72,7 +74,7 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
|
|
|
|
private ErpProductMapper productMapper;
|
|
|
|
private ErpProductMapper productMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private MesMoldMapper mesMoldMapper;
|
|
|
|
private MoldMapper moldMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ErpProductUnitService productUnitService;
|
|
|
|
private ErpProductUnitService productUnitService;
|
|
|
|
@ -194,7 +196,7 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//模具列表
|
|
|
|
//模具列表
|
|
|
|
List<MesMoldDO> moldList = new ArrayList<>();
|
|
|
|
List<MoldDO> moldList = new ArrayList<>();
|
|
|
|
if (StringUtils.isNotBlank(deviceLedgerDO.getMoldId())) {
|
|
|
|
if (StringUtils.isNotBlank(deviceLedgerDO.getMoldId())) {
|
|
|
|
// 将逗号分隔的字符串转换为Long类型的List
|
|
|
|
// 将逗号分隔的字符串转换为Long类型的List
|
|
|
|
List<Long> idList = Arrays.stream(deviceLedgerDO.getMoldId().split(","))
|
|
|
|
List<Long> idList = Arrays.stream(deviceLedgerDO.getMoldId().split(","))
|
|
|
|
@ -202,7 +204,7 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
|
|
|
|
.map(Long::valueOf)
|
|
|
|
.map(Long::valueOf)
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
for (Long moldId : idList) {
|
|
|
|
for (Long moldId : idList) {
|
|
|
|
MesMoldDO moldDO = mesMoldMapper.selectById(moldId);
|
|
|
|
MoldDO moldDO = moldMapper.selectById(moldId);
|
|
|
|
if(moldDO!=null){
|
|
|
|
if(moldDO!=null){
|
|
|
|
moldList.add(moldDO);
|
|
|
|
moldList.add(moldDO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|