修改终止进出片方法

ZengTao

2023-12-21 df73c9042ce5bfc91f9d2a0472aa070fa22aa5df

修改终止进出片方法

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -22,6 +22,7 @@
import com.example.springboot.service.OutSliceServive;
import com.example.springboot.service.PermissionService;
import com.example.springboot.service.SpianService;
import com.example.springboot.service.StorageCageService;

import cn.hutool.core.util.StrUtil;

@@ -47,22 +48,23 @@
@RequestMapping("/home")
public class HomeController {
  @Autowired
  static
 
  HomeMapper homeMapper;

  @Autowired
  HomeService storageRackService;

  @Autowired
  static
  SpianService spianService;

  @Autowired
  SpianMapper spianMapper;

  @Autowired
  static
  OutSliceServive outSliceServive;

  @Autowired
  StorageCageService storageCageService;

  @Autowired
  North_Glass_Buffer1Service north_Glass_Buffer1Service;
@@ -142,44 +144,18 @@

  // 手动完成进/出片任务 终止进片/出片任务
  @GetMapping("/UpdateTask")
  public static Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
  public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
    storageCageService.UpdateTask(types, shelfrack, glassid);
    Map<String, Object> map = new HashMap<>();
    if (types == 0) {// 完成进片
      spianService.overtask(glassid);
    } else if (types == 1) {// 完成出片
      spianService.overtask(glassid);
    } else if (types == 2) {// 终止进片任务
      outSliceServive.StopTask(glassid, 0);
      // 发送终止进片任务信号
    } else {// 终止出片任务
      outSliceServive.StopTask(glassid, 1);
    }
    map.put("message3", "200");
    return Result.success(map);
  }

  //终止进片/出片任务
  @GetMapping("/EndTask")
  public static Result EndTask(int types) {
     if (types == 0) {// 终止进片任务
      List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
      for (StorageTask storageTask : cageList) {
        outSliceServive.StopTask(storageTask.getGlassId(), types);  
      }
      // 发送终止进片任务信号
    } else {// 终止出片任务
      List<StorageCage> storageCages =homeMapper.selectinout(types);
      for (StorageCage storageCage : storageCages) {
        List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
        for (StorageCage storageCagez : storageCagess) {
          if (storageCagez.getState().equals("2")) {//调拨进片
            outSliceServive.StopTask(storageCagez.getGlassId(), 0);
          }else{//出片
            outSliceServive.StopTask(storageCagez.getGlassId(), types);
          }
        }
      }
    }
  public Result EndTask(int types) {
    storageCageService.EndTask(types);
     
    Map<String, Object> map = new HashMap<>();
    map.put("message3", "200");
    return Result.success(map);

 springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java

New file
@@ -0,0 +1,52 @@
package com.example.springboot.service;

import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.mapper.HomeMapper;

public class StorageCageService {
    @Autowired
    private HomeMapper homeMapper;
    private OutSliceServive outSliceServive;
    private SpianService spianService;

    public void EndTask(int types) {
        if (types == 0) {// 终止进片任务
      List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
      for (StorageTask storageTask : cageList) {
        outSliceServive.StopTask(storageTask.getGlassId(), types);  
      }
      // 发送终止进片任务信号
    } else {// 终止出片任务
      List<StorageCage> storageCages =homeMapper.selectinout(types);
      for (StorageCage storageCage : storageCages) {
        List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
        for (StorageCage storageCagez : storageCagess) {
          if (storageCagez.getState().equals("2")) {//调拨进片
            outSliceServive.StopTask(storageCagez.getGlassId(), 0);
          }else{//出片
            outSliceServive.StopTask(storageCagez.getGlassId(), types);
          }
        }
      }
    }
    }

    public void UpdateTask(Integer types, Integer shelfrack, String glassid) {
        if (types == 0) {// 完成进片
            spianService.overtask(glassid);
          } else if (types == 1) {// 完成出片
            spianService.overtask(glassid);
          } else if (types == 2) {// 终止进片任务
            outSliceServive.StopTask(glassid, 0);
            // 发送终止进片任务信号
          } else {// 终止出片任务
            outSliceServive.StopTask(glassid, 1);
          }
    }

}