|
@@ -2273,9 +2273,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
if (!(r.getCode().equals("200"))) {
|
|
|
return R.error(r.getMsg());
|
|
|
}
|
|
|
- //赋值坯料计划冗余字段 是否待领料
|
|
|
- String isWaitGetMaterial = this.baseMapper.selectIsWaitGetMaterialById(apsBlankOrderDo.getId());
|
|
|
- apsBlankOrderDo.setIswaitgetmaterial(isWaitGetMaterial);
|
|
|
}
|
|
|
|
|
|
//更新或保存坯料计划和输出成品
|
|
@@ -2356,6 +2353,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
} else {
|
|
|
this.save(apsBlankOrderDo);
|
|
|
}
|
|
|
+ ApsBlankOrderDo needUpdateBlank = new ApsBlankOrderDo();
|
|
|
+ //赋值坯料计划冗余字段 是否待领料
|
|
|
+ String isWaitGetMaterial = this.baseMapper.selectIsWaitGetMaterialById(apsBlankOrderDo.getId());
|
|
|
+ needUpdateBlank.setId(apsBlankOrderDo.getId());
|
|
|
+ needUpdateBlank.setIswaitgetmaterial(isWaitGetMaterial);
|
|
|
+ this.updateById(needUpdateBlank);
|
|
|
//根据坯料计划更新订单的 计划排产车间字段
|
|
|
String planEndProductionWorkshops = this.baseMapper.selectPlanEndProductionWorkshopsById(apsBlankOrderDo.getProductionorderid());
|
|
|
if (ObjectUtil.isNotEmpty(planEndProductionWorkshops)) {
|