|
|
@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.rongwei.bscommon.sys.dao.*;
|
|
|
@@ -2029,6 +2030,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
//物理删除相关的作业明细备份
|
|
|
this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
|
|
|
|
|
|
+ //如果是否备料=是，备料对应在制品的备料计划ID=(空)，在制品状态=备料中
|
|
|
+ if (apsBlankOrderDo.getPreparematerial().equals("是")) {
|
|
|
+ apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
|
|
|
+ .set(ApsWorkInProgressInventoryDo::getBlankid, "")
|
|
|
+ .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, SaveConstans.WorkInProgressStatus.WAITING)
|
|
|
+ .eq(ApsWorkInProgressInventoryDo::getBlankid, req.getId()));
|
|
|
+ }
|
|
|
+
|
|
|
//查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
|
|
|
CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
|
|
|
List<ApsBlankOrderDo> list = this.list(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, apsBlankOrderDo.getProductionorderid()));
|
sucheng