feat():跟踪界面保留下发按钮，上线时同步通知钢卷号给通讯程序，钢卷操作时需要带上钢卷号

business/src/main/java/com/fizz/business/constants/enums/WebMatOperateEnum.java

@@ -25,18 +25,19 @@ public enum WebMatOperateEnum implements IEnum<String> {
         @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<String> {
         planClient.changeStatus(ChangePlanStatusForm.builder()
                 .operation(this.name())
                 .id(form.getId())
+                .coilId(form.getEntryMatId())
                 .build());
     }
 
@@ -78,12 +80,13 @@ public enum WebMatOperateEnum implements IEnum<String> {
      *
      * @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());
 
     }

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<String> retrySetup(@RequestParam  String coilid) {
+        return R.ok(modSetupResultService.retrySetup(coilid));
+    }
+
 }

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;
+
+
 }

business/src/main/java/com/fizz/business/service/ModSetupResultService.java

@@ -11,5 +11,7 @@ public interface ModSetupResultService extends IService<ModSetupResult> {
     List<ModSetupResultVO> list(ModSetupResultForm form);
 
     String calcSetup(ModSetupResultForm form);
+
+    String retrySetup(String coilid);
     // 可在此处添加自定义业务方法
 }

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<CrmPdiPlanMapper, CrmPdiPlan> implements CrmPdiPlanService {
 
 
+    @Resource
+    ModSetupResultService modSetupResultService;
+
     /**
      * 根据卷ID和操作员ID查询单个记录
      * @param coilid 卷ID
@@ -27,7 +33,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
     public CrmPdiPlanVO getByCoilIdAndOperId(String coilid) {
 
         QueryWrapper<CrmPdiPlan> 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<CrmPdiPlanMapper, CrmPdiP
     @Override
     public CrmPdiPlanVO updateCrmPdiPlanById(ChangePlanStatusForm form) {
 
+        if (StringUtils.compare(form.getOperation(),"ONLINE") == 0){
+            modSetupResultService.retrySetup(form.getCoilId());
+        }
 
         CrmPdiPlan crmPdiPlan = this.getById(form.getId());
 

business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java

@@ -16,8 +16,9 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
     /**
      * 根据退出卷ID和操作员ID查询记录
+     *
      * @param excoilid 退出卷ID
-     * @param operid 操作员ID
+     * @param operid   操作员ID
      * @return 查询到的CrmPdoExcoil对象
      */
     public CrmPdoExcoil getByExcoilIdAndOperId(String excoilid, Integer operid) {
@@ -28,6 +29,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
     /**
      * 添加新记录
+     *
      * @param crmPdoExcoil 要添加的CrmPdoExcoil对象
      * @return 是否添加成功
      */
@@ -37,6 +39,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
     /**
      * 更新已有记录
+     *
      * @param crmPdoExcoil 要更新的CrmPdoExcoil对象
      * @return 是否更新成功
      */
@@ -46,8 +49,9 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
     /**
      * 根据退出卷ID和操作员ID删除记录
+     *
      * @param excoilid 退出卷ID
-     * @param operid 操作员ID
+     * @param operid   操作员ID
      * @return 是否删除成功
      */
     public boolean deleteCrmPdoExcoil(String excoilid, Integer operid) {
@@ -58,17 +62,28 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
     /**
      * 查询所有记录
+     *
      * @return CrmPdoExcoil对象的列表
      */
     public List<CrmPdoExcoil> listAll(CrmPdoExcoilForm form) {
 
         QueryWrapper<CrmPdoExcoil> 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);
     }

business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java

@@ -54,4 +54,9 @@ public class ModSetupResultServiceImpl extends ServiceImpl<ModSetupResultMapper,
     public String calcSetup(ModSetupResultForm form) {
         return null;
     }
+
+    @Override
+    public String retrySetup(String coilid) {
+        return null;
+    }
 }