Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2024-01-26 90b7450b05c3a26767727b12fc08f9667ebb1868

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

@@ -4,7 +4,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import java.util.concurrent.TimeUnit;

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

@@ -17,9 +17,9 @@
import com.example.springboot.service.SpianService;
import com.example.springboot.service.StorageCageService;


import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -34,11 +34,7 @@
@RequestMapping("/home")
public class HomeController {
  @Autowired
 
  HomeMapper homeMapper;

  @Autowired
  HomeService storageRackService;

  @Autowired
  SpianService spianService;
@@ -138,11 +134,11 @@
    return Result.success(map);
  }

  //终止进片/出片任务
  // 终止进片/出片任务
  @GetMapping("/EndTask")
  public Result EndTask(int types) {
    storageCageService.EndTask(types);
     

    Map<String, Object> map = new HashMap<>();
    map.put("message3", "200");
    return Result.success(map);
@@ -183,15 +179,18 @@
    if (result == null) {
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
      String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());

      if (flip != null) {
        String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
        if (position != null) {
          String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
          String frameheight = jdbcConnections.SelectFrameHeightByFrameBarcode(north_glass_buffer1.getFrameBarcode());
          int sequence = homeMapper.SelectMaxSquence();
          homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
              north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
              sequence, position, (short) 0, north_glass_buffer1.getordernumber(), north_glass_buffer1.getlistnumber(),
              north_glass_buffer1.getboxnumber(), north_glass_buffer1.getglasslength().toString(),
              north_glass_buffer1.getglassheight().toString());
              north_glass_buffer1.getglassheight().toString(), framelength, frameheight);
          map.put("message2", "200");
        } else {
          map.put("message2", "300");
@@ -275,19 +274,8 @@
  // 手动添加扫码位玻璃
  @PostMapping("/InsertQueueGlassId")
  public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
    Map<String, Object> map = new HashMap<>();
    short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
    if (result > 0) {
      map.put("message", "300");
    } else {
      homeMapper.InsertQueueGlassId(queue, id);
      if (id == 1) {
        // 调用伍存储过程
        spianService.selectAll(queue.getglassId());
      }
      map.put("message", "200");
    }
    return Result.success(map);
    return storageCageService.InsertQueueGlassId(id, queue);
    
  }

  // 确认扫码位玻璃信息
@@ -321,9 +309,9 @@
  @PostMapping("/SelectAluminumFrameInfoById")
  public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
    String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
    List<north_glass_buffer1> listAluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
    List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
    Map<String, Object> map = new HashMap<>();
    map.put("listAluminumFrame", listAluminumFrame);
    map.put("AluminumFrame", AluminumFrame);
    map.put("flip", flip);
    return Result.success(map);
  }
@@ -331,17 +319,14 @@
  // 根据铝框id删除出片队列玻璃
  @PostMapping("/DeleteProductionQueueGlass")
  public Result DeleteProductionQueueGlass(String FrameNo) {
    homeMapper.CompleteQueueByFrameNo(FrameNo);

    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
    return outSliceServive.CompleteQueueByFrameNo(FrameNo);
  }

  // 添加铝框id对应玻璃到出片队列
  @PostMapping("/AddOutSliceS")
  public Result AddOutSliceS(String FrameNo) throws SQLException {
    //public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws SQLException {
    // public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
    // SQLException {
    north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
@@ -353,9 +338,10 @@
  public Result isAllowQueues(Boolean isAllowQueue, @RequestBody List<Out_slice> out_slice) {
    Plchome.isAllowQueue = isAllowQueue;
    // if (isAllowQueue == true) {
    //   for (Out_slice out_slice2 : out_slice) {
    //     homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(), out_slice2.getSequence());
    //   }
    // for (Out_slice out_slice2 : out_slice) {
    // homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(),
    // out_slice2.getSequence());
    // }
    // }
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
@@ -391,4 +377,73 @@
    return outSliceServive.CompleteQueue(id, frameid, glassid);
  }

  // 手动完成任务
  @PostMapping("/FrameStateUpdate")
  public Result FrameStateUpdate(String frameno) {
    return outSliceServive.FrameStateUpdate(frameno);
  }

  // 手动写入plc扫码位玻璃id
  @PostMapping("/WriteGlassID")
  public Result WriteGlassID(String glassid) {
    // 扫码位写入玻璃id
    spianService.outmesid(glassid, "DB103.286");
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 清除指定位置id
  @PostMapping("/ClearGlassId")
  public Result ClearGlassId(String position, String glassid) {
    return storageCageService.ClearGlassId(position, glassid);
  }

  // 清除待确认铝框信息
  @PostMapping("/CloseForm7")
  public Result CloseForm7() {
    Plchome.AluminumFrame = null;
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 终止进/出片任务
  @PostMapping("/TaskStop")
  public Result TaskStop(Short num) {
    storageCageService.EndTask(num);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 软急停
  @PostMapping("/SoftEmergencyStop")
  public Result SoftEmergencyStop(Short num) {
    String position = "DB101.11.3";
    Map<String, Object> map = new HashMap<>();
    if (S7control.getinstance().CheckConnected() == true) {
      S7control.getinstance().WriteBit(position, false);
      try {
        TimeUnit.MILLISECONDS.sleep(300);
      } catch (InterruptedException e) {
        e.printStackTrace();
      }
      S7control.getinstance().WriteBit(position, true);
      map.put("message", "200");
    } else {
      map.put("message", "300");
    }
    return Result.success(map);
  }

  // 切换PLC获取二维码方式
  @PostMapping("/SwitchScanMethod")
  public Result SwitchScanMethod(Boolean scansmethod) {
    S7control.getinstance().WriteBit("DB101.11.4", scansmethod);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

}