|
|
|
@ -107,7 +107,8 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
if(!PlanStatusEnum.NEW.getCode().equals(deliverPlanMainDO.getStatus())) { |
|
|
|
throw exception(DELIVER_PLAN_STATUS_NOT_NEW); |
|
|
|
} |
|
|
|
deliverPlanMainMapper.updateById(deliverPlanMainDO); |
|
|
|
DeliverPlanMainDO mainDO = DeliverPlanMainConvert.INSTANCE.convert(updateReqVO); |
|
|
|
deliverPlanMainMapper.updateById(mainDO); |
|
|
|
trendsApi.createTrends(updateReqVO.getId(), "DeliverPlanMain", deliverPlanMainDO.toString(), TrendsTypeEnum.UPDATE); |
|
|
|
} |
|
|
|
|
|
|
|
@ -300,6 +301,19 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
return deliverPlanMainMapper.updateById(mainDO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public DeliverPlanMainDO selectDeliverPlanExist(String code) { |
|
|
|
QueryWrapper<DeliverPlanMainDO> deliverPlanMainDOQueryWrapper = new QueryWrapper<>(); |
|
|
|
deliverPlanMainDOQueryWrapper.eq("number",code); |
|
|
|
deliverPlanMainDOQueryWrapper.eq("available","TRUE"); |
|
|
|
DeliverPlanMainDO deliverPlanMainDO = deliverPlanMainMapper.selectOne(deliverPlanMainDOQueryWrapper); |
|
|
|
if(deliverPlanMainDO != null){ |
|
|
|
return deliverPlanMainDO; |
|
|
|
}else { |
|
|
|
throw exception(DELIVER_PLAN_MAIN_NOT_EXISTS); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public DeliverPlanMainDO getDeliverPlanMain(Long id) { |
|
|
|
return deliverPlanMainMapper.selectById(id); |
|
|
|
@ -346,7 +360,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
// 是否有错误数据
|
|
|
|
boolean flag = true; |
|
|
|
for (DeliverPlanDetailDO detailDO : subDOList) { |
|
|
|
String messageDetail = validateDeliverPlanDetailImport(detailDO, mainDo, businesstypeDO); |
|
|
|
String messageDetail = validateDeliverPlanDetailImport(detailDO, mainDo); |
|
|
|
if (!messageMain.isEmpty() || !messageDetail.isEmpty()) { |
|
|
|
DeliverPlanMainImportErrorVO importErrorVO = DeliverPlanMainConvert.INSTANCE.convert(createReqVO, detailDO); |
|
|
|
importErrorVO.setImportStatus("失败"); |
|
|
|
@ -417,7 +431,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
* @param detailDo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private String validateDeliverPlanDetailImport(DeliverPlanDetailDO detailDo, DeliverPlanMainDO mainDo, BusinesstypeDO businesstypeDO) { |
|
|
|
private String validateDeliverPlanDetailImport(DeliverPlanDetailDO detailDo, DeliverPlanMainDO mainDo) { |
|
|
|
String messageDetail = ""; |
|
|
|
// 校验物品基础信息
|
|
|
|
try { |
|
|
|
@ -428,6 +442,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
} catch (ServiceException ex) { |
|
|
|
messageDetail += ex.getMessage() + ","; |
|
|
|
} |
|
|
|
detailDo.setAvailable("TRUE"); |
|
|
|
//TODO 滞后
|
|
|
|
// 校验物品标包信息
|
|
|
|
// try {
|
|
|
|
@ -461,6 +476,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
deliverPlanDetailDO.setNumber(deliverPlanMainDO.getNumber()); |
|
|
|
deliverPlanDetailDO.setMasterId(deliverPlanMainDO.getId()); |
|
|
|
deliverPlanDetailDO.setCustomerDockCode(null); |
|
|
|
deliverPlanDetailDO.setAvailable("TRUE"); |
|
|
|
} |
|
|
|
deliverPlanDetailMapper.insertBatch(subDOList); |
|
|
|
return deliverPlanMainDO; |
|
|
|
@ -492,7 +508,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { |
|
|
|
private ItembasicDO validatorItembasic(String itemCode) { |
|
|
|
return itembasicService.selectItembasic(itemCode); |
|
|
|
} |
|
|
|
//子表校验客户代码
|
|
|
|
//子表校验销售订单明细
|
|
|
|
private void validatorDetailExist(String soNumber, String soLine, String itemCode) { |
|
|
|
deliverJobMainService.saleDetailExist(soNumber, soLine, itemCode); |
|
|
|
} |
|
|
|
|
chenfang
2 years ago