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

wuyouming666

2024-05-17 6ba80f38f18375403bb7f92d8f38d2d8a7f69583

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

@@ -23,6 +23,7 @@
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_frame_buffer1_frames;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
@@ -106,14 +107,15 @@

  // 根据玻璃id手动上片
  @GetMapping("/Addglassid")
  public Result Addglassid(String glassid) {
  public Result Addglassid(String glassid) throws SQLException {
    Map<String, Object> map = new HashMap<>();
    short taskno = homeMapper.SelectInTask();
    if (taskno > 0) {
      map.put("message2", "500");
    } else {
      // 调用伍上片函数
      short results = spianService.selectAll(glassid);
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
      short results = spianService.selectAll(north_glass_buffer1);
      if (results == 200) {
        map.put("message2", "200");
      } else if (results == 300) {
@@ -177,10 +179,10 @@
    Map<String, Object> map = new HashMap<>();
    Out_slice result = homeMapper.SelectQueueByglassid(glassid);
    if (result == null) {
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdout(glassid, "", "");
      String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());

      if (flip != null) {
      if (flip != null&&flip != "") {
        String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
        if (position != null) {
          String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
@@ -273,25 +275,9 @@

  // 手动添加扫码位玻璃
  @PostMapping("/InsertQueueGlassId")
  public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
    Map<String, Object> map = new HashMap<>();
    Short zhi=200;
    short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
    if (result > 0) {
      map.put("message", "300");
    } else {
      
      if (id == 1) {
        // 调用伍存储过程
        zhi=spianService.selectAll(queue.getglassId());
        if(zhi==200){
          homeMapper.InsertQueueGlassId(queue, id);
        }
      }
      
      map.put("message",zhi);
    }
    return Result.success(map);
  public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) throws SQLException {
    return storageCageService.InsertQueueGlassId(id, queue);
    
  }

  // 确认扫码位玻璃信息
@@ -326,6 +312,7 @@
  public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
    String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
    List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
    Plchome.AluminumFrameInfo=jdbcConnections.SelectFrameBarcode(FrameBarcode);
    Map<String, Object> map = new HashMap<>();
    map.put("AluminumFrame", AluminumFrame);
    map.put("flip", flip);
@@ -344,6 +331,8 @@
    // public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
    // SQLException {
    north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
    Plchome.AluminumFrame = null;
    Plchome.AluminumFrameInfo = new north_frame_buffer1_frames();
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
@@ -378,7 +367,7 @@
    return Result.success(map);
  }

  // 修改出片队列状态与出片队列调序
  // 修是否需要确认
  @PostMapping("/isConfirmStates")
  public Result isConfirmStates(Boolean isConfirmStates) {
    Plchome.isConfirm = isConfirmStates;
@@ -419,6 +408,7 @@
  @PostMapping("/CloseForm7")
  public Result CloseForm7() {
    Plchome.AluminumFrame = null;
    Plchome.AluminumFrameInfo = new north_frame_buffer1_frames();
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);