加拿大MES项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuyouming666
2023-12-21 fa4d27ab5d5c9ae3a1ce84854ac318d6c03b9dae 
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java


@@ -5,47 +5,34 @@


import java.util.List;


import java.util.Map;




import javax.servlet.http.Cookie;


import javax.servlet.http.HttpServletRequest;




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


import org.springframework.context.annotation.Bean;




import com.example.springboot.mapper.HomeMapper;


import com.example.springboot.mapper.SpianMapper;


import com.example.springboot.security.constant.SystemConstant;


import com.example.springboot.security.util.JwtUtil;


import com.example.springboot.security.util.SecurityUtil;


import com.example.springboot.service.HomeService;


import com.example.springboot.service.JdbcConnections;


import com.example.springboot.service.North_Glass_Buffer1Service;


import com.example.springboot.service.OutSliceServive;


import com.example.springboot.service.PermissionService;


import com.example.springboot.service.SpianService;




import cn.hutool.core.util.StrUtil;


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.User;


import com.example.springboot.entity.alarmmg;


import com.example.springboot.entity.north_glass_buffer1;


import com.example.springboot.entity.Out_slice;


import com.example.springboot.entity.Permission;


import com.example.springboot.entity.Queue;


import com.example.springboot.entity.RolePermission;




import org.springframework.web.bind.annotation.*;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




@RestController


@RequestMapping("/home")


public class HomeController {


  @Autowired


 


  HomeMapper homeMapper;




  @Autowired


@@ -61,6 +48,9 @@


  OutSliceServive outSliceServive;




  @Autowired


  StorageCageService StorageCageService;




  @Autowired


  North_Glass_Buffer1Service north_Glass_Buffer1Service;




  @Autowired


@@ -68,7 +58,7 @@




  // 获取当前登录用户权限


  @GetMapping("/SelectPermissionByUserName")


  public Result SelectPermissionByUserName(String username) {


  public Result SelectPermissionByUserName(String username) throws SQLException {


    Map<String, Object> map = new HashMap<>();


    List<RolePermission> permission = homeMapper.SelectPermissionByUserName(username);


    map.put("permission", permission);


@@ -136,20 +126,21 @@


    return Result.success(map);


  }




  // 手动完成进/出片任务


  // 手动完成进/出片任务 终止进片/出片任务


  @GetMapping("/UpdateTask")


  public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {


    StorageCageService.UpdateTask(types, shelfrack, glassid);


    Map<String, Object> map = new HashMap<>();


    homeMapper.UpdateTask(types, glassid);


    StorageCage glass = homeMapper.SelectGlassInfo(glassid);


    if (types == 0) {


      homeMapper.UpdateCageTask1(glassid);


      S7control.getinstance().WriteWord("DB105.14", (short) 0);


    } else {


      spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());


      homeMapper.UpdateCageTask2(glassid);


      S7control.getinstance().WriteWord("DB105.12", (short) 0);


    }


    map.put("message3", "200");


    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);


  }


@@ -175,9 +166,7 @@


  // 手动删除理片笼玻璃


  @GetMapping("/DeleteByGlassID")


  public Result DeleteByGlassID(String glassid) {


    StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);


    spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());


    homeMapper.DeleteByGlassID(glassid);


    outSliceServive.DeleteByGlassID(glassid);


    Map<String, Object> map = new HashMap<>();


    map.put("message3", "200");


    return Result.success(map);


@@ -195,14 +184,17 @@


        String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());


        if (position != null) {


          int sequence = homeMapper.SelectMaxSquence();




          homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),


              north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),


              sequence, position);


              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());




          map.put("message2", "200");


        } else {


          map.put("message2", "300");


        }




      } else {


        map.put("message2", "400");


      }


@@ -268,7 +260,7 @@


        map.put("message", "200");


      }


    }


    return Result.success(map); 


    return Result.success(map);


  }




  // 查询玻璃信息


@@ -340,6 +332,7 @@


  @PostMapping("/DeleteProductionQueueGlass")


  public Result DeleteProductionQueueGlass(String FrameNo) {


    homeMapper.CompleteQueueByFrameNo(FrameNo);




    Map<String, Object> map = new HashMap<>();


    map.put("message", "200");


    return Result.success(map);


@@ -381,7 +374,6 @@


  @PostMapping("/CompleteQueue")


  public Result CompleteQueue(String id, String frameid, String glassid) {


    return outSliceServive.CompleteQueue(id, frameid, glassid);




  }




}