From 22b6b5d0a3ceac65e6f30522806c968c30f1f1a4 Mon Sep 17 00:00:00 2001 From: Allenxy <13762749+chaosallen@user.noreply.gitee.com> Date: Sun, 13 Oct 2024 14:54:00 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=B7=9F=E8=B8=AA=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=8B=E5=8F=91=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E6=97=B6=E5=90=8C=E6=AD=A5=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E7=BB=99=E9=80=9A=E8=AE=AF=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E9=92=A2=E5=8D=B7=E6=93=8D=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=B8=A6=E4=B8=8A=E9=92=A2=E5=8D=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/enums/WebMatOperateEnum.java | 13 +++++---- .../controller/ModSetupResultController.java | 6 +++++ .../business/form/ChangePlanStatusForm.java | 7 ++++- .../service/ModSetupResultService.java | 2 ++ .../service/impl/CrmPdiPlanServiceImpl.java | 11 +++++++- .../service/impl/CrmPdoExcoilServiceImpl.java | 27 ++++++++++++++----- .../impl/ModSetupResultServiceImpl.java | 5 ++++ 7 files changed, 58 insertions(+), 13 deletions(-) diff --git a/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java index 211d84e..fda72a6 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java @@ -25,18 +25,19 @@ public enum WebMatOperateEnum implements IEnum { @Override public void operate(WebOperateMatForm form) { - CrmPdiPlanVO crmPdiPlanVO = ONLINE.syncPlanStatus(form.getId()); + CrmPdiPlanVO crmPdiPlanVO = ONLINE.syncPlanStatus(form.getId(), form.getEntryMatId()); WebSocketUtil.sendMatmapMsg(crmPdiPlanVO); } }, - READY("回退") { + NEW("回退") { @Override public void operate(WebOperateMatForm form) { - + CrmPdiPlanVO crmPdiPlanVO = NEW.syncPlanStatus(form.getId(), form.getEntryMatId()); + WebSocketUtil.sendMatmapMsg(crmPdiPlanVO); } }, - PRODUCT("卸卷并封闭") { + PRODUCT("生产完成") { @Override public void operate(WebOperateMatForm form) { super.operate(form); @@ -70,6 +71,7 @@ public enum WebMatOperateEnum implements IEnum { planClient.changeStatus(ChangePlanStatusForm.builder() .operation(this.name()) .id(form.getId()) + .coilId(form.getEntryMatId()) .build()); } @@ -78,12 +80,13 @@ public enum WebMatOperateEnum implements IEnum { * * @param planId 计划id */ - private CrmPdiPlanVO syncPlanStatus(Long planId) { + private CrmPdiPlanVO syncPlanStatus(Long planId, String coilid) { PdiPlanClient planClient = BeanFactory.getBean(PdiPlanClient.class); return planClient.changeStatus(ChangePlanStatusForm.builder() .operation(this.name()) .id(planId) + .coilId(coilid) .build()); } diff --git a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java index 322a326..7ef2ded 100644 --- a/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java +++ b/business/src/main/java/com/fizz/business/controller/ModSetupResultController.java @@ -34,4 +34,10 @@ public class ModSetupResultController { return R.ok(modSetupResultService.calcSetup(form)); } + @GetMapping("/retry") + @ApiOperation("手动下发设定值") + public R retrySetup(@RequestParam String coilid) { + return R.ok(modSetupResultService.retrySetup(coilid)); + } + } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java index 9a6ce83..950ecac 100644 --- a/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java +++ b/business/src/main/java/com/fizz/business/form/ChangePlanStatusForm.java @@ -24,7 +24,12 @@ public class ChangePlanStatusForm implements Serializable { private String operation; @NotNull(message = "计划id不能为空") - @ApiModelProperty("计划id集合") + @ApiModelProperty("主键id") private Long id; + @NotNull(message = "钢卷号不能为空") + @ApiModelProperty("钢卷号") + private String coilId; + + } diff --git a/business/src/main/java/com/fizz/business/service/ModSetupResultService.java b/business/src/main/java/com/fizz/business/service/ModSetupResultService.java index 13d739b..7c2c499 100644 --- a/business/src/main/java/com/fizz/business/service/ModSetupResultService.java +++ b/business/src/main/java/com/fizz/business/service/ModSetupResultService.java @@ -11,5 +11,7 @@ public interface ModSetupResultService extends IService { List list(ModSetupResultForm form); String calcSetup(ModSetupResultForm form); + + String retrySetup(String coilid); // 可在此处添加自定义业务方法 } diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index 42f7e8c..b86a4bd 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -9,9 +9,12 @@ import com.fizz.business.form.ChangePlanStatusForm; import com.fizz.business.form.PlanQueryForm; import com.fizz.business.mapper.CrmPdiPlanMapper; import com.fizz.business.service.CrmPdiPlanService; +import com.fizz.business.service.ModSetupResultService; import com.fizz.business.vo.CrmPdiPlanVO; +import com.ruoyi.common.utils.StringUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; @@ -19,6 +22,9 @@ import java.util.List; public class CrmPdiPlanServiceImpl extends ServiceImpl implements CrmPdiPlanService { + @Resource + ModSetupResultService modSetupResultService; + /** * 根据卷ID和操作员ID查询单个记录 * @param coilid 卷ID @@ -27,7 +33,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if (coilid.equals("online")){ + if (coilid.equals("ONLINE")){ queryWrapper.eq("STATUS", coilid); CrmPdiPlan one = this.getOne(queryWrapper); return BeanUtil.copyProperties(one, CrmPdiPlanVO.class); @@ -83,6 +89,9 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl listAll(CrmPdoExcoilForm form) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (!StringUtils.isEmpty(form.getEncoilid())){ - queryWrapper.eq("exit_coilid", form.getEncoilid()).eq("encoilid", form.getEncoilid()); + + // 根据 exit_coilid 和 encoilid 进行查询 + if (!StringUtils.isEmpty(form.getEncoilid())) { + queryWrapper.eq("exit_coilid", form.getEncoilid()).eq("encoilid", form.getEncoilid()); } - queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); - queryWrapper.le("start_date", form.getStartDate() + " 23:59:59"); + // 设置开始日期和结束日期 + if (form.getStartDate().equals(form.getEndDate())) { + // 如果开始日期和结束日期相同 + queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); + queryWrapper.le("start_date", form.getStartDate() + " 23:59:59"); + } else { + // 如果开始日期和结束日期不相同 + queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); + queryWrapper.le("start_date", form.getEndDate() + " 23:59:59"); + } return baseMapper.selectList(queryWrapper); } diff --git a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java index 265349f..901a22c 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java @@ -54,4 +54,9 @@ public class ModSetupResultServiceImpl extends ServiceImpl