diff --git a/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java index a662ab8..acd1f36 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/WebOperateMatEnum.java @@ -49,7 +49,7 @@ public enum WebOperateMatEnum implements IEnum, IOperateMat, IOperateMat, IOperateMat, IOperateMat, IOperateMat, IOperateMat status = Lists.newArrayList(PlanStatusEnum.ONLINE.name()); CrmPdiPlanService planClient = BeanFactory.getBean(CrmPdiPlanService.class); CrmPdiPlanVO plan = planClient.getByCoilIdAndOperId(form.getEntryMatId()); - if (Objects.nonNull(plan) ) { + if (Objects.nonNull(plan)) { Assert.isTrue(!status.contains(plan.getStatus()), "当前状态[{}]不支持甩尾", plan.getStatus()); } MatmapUtil.clearMatmap(form.getPorIdx()); @@ -185,12 +190,13 @@ public enum WebOperateMatEnum implements IEnum, IOperateMat, IOperateMat wrapper = new QueryWrapper<>(); + wrapper.eq("coilid", build.getMatId()); + wrapper.eq("planid", build.getId()); + + CrmPdiPlan pdiPlan = baseMapper.selectOne(wrapper); if (pdiPlan == null) { log.error("未找到ID为{}的计划记录", build.getId()); @@ -160,7 +155,8 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl - - insert into track_ca1_romtb_matmap ( + + insert into pro_matmap ( pos_idx, mat_id, plan_no, plan_id ) values @@ -14,7 +14,9 @@ (#{item.posIdx}, #{item.matId}, #{item.planNo}, #{item.planId}) on duplicate key update - mat_id = VALUES(mat_id),plan_no = VALUES(plan_no),plan_id = VALUES(plan_id) - + mat_id = VALUES(mat_id), + plan_no = VALUES(plan_no), + plan_id = VALUES(plan_id) + \ No newline at end of file diff --git a/business/target/classes/mapper/ProMatmapMapper.xml b/business/target/classes/mapper/ProMatmapMapper.xml index 1237932..b29e436 100644 --- a/business/target/classes/mapper/ProMatmapMapper.xml +++ b/business/target/classes/mapper/ProMatmapMapper.xml @@ -5,8 +5,8 @@ - - insert into track_ca1_romtb_matmap ( + + insert into pro_matmap ( pos_idx, mat_id, plan_no, plan_id ) values @@ -14,7 +14,9 @@ (#{item.posIdx}, #{item.matId}, #{item.planNo}, #{item.planId}) on duplicate key update - mat_id = VALUES(mat_id),plan_no = VALUES(plan_no),plan_id = VALUES(plan_id) - + mat_id = VALUES(mat_id), + plan_no = VALUES(plan_no), + plan_id = VALUES(plan_id) + \ No newline at end of file