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


@@ -5,44 +5,30 @@


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 com.example.springboot.service.StorageCageService;




import cn.hutool.core.util.StrUtil;




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


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


@@ -95,7 +81,6 @@


  // 查询理片笼玻璃情况


  @GetMapping("/loads")


  public Result selectRack() {




    List<StorageCage> storageCagelist1 = homeMapper.selectRack1();


    List<StorageCage> storageCagelist2 = homeMapper.selectRack2();


    List<StorageCage> storageCagelist3 = homeMapper.selectRack3();


@@ -193,7 +178,6 @@


  // 根据玻璃id手动出片


  @GetMapping("/OutByGlassID")


  public Result OutByGlassID(String glassid) throws SQLException {




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


    Out_slice result = homeMapper.SelectQueueByglassid(glassid);


    if (result == null) {


@@ -208,7 +192,6 @@


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


@@ -357,18 +340,33 @@




  // 添加铝框id对应玻璃到出片队列


  @PostMapping("/AddOutSliceS")


  public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws SQLException {


    outSliceServive.AddOutSliceS(AluminumFrames);


  public Result AddOutSliceS(String FrameNo) 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");


    return Result.success(map);


  }




  // 修改出片队列状态与出片队列调序


  // 修改出片队列出片状态


  @PostMapping("/isAllowQueues")


  public Result isAllowQueues(Boolean isAllowQueue, @RequestBody List<Out_slice> out_slice) {


    Plchome.isAllowQueue = isAllowQueue;


    if (isAllowQueue == true) {


    // if (isAllowQueue == true) {


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


    return Result.success(map);


  }




  // 修改出片队列调序状态与出片队列调序


  @PostMapping("/isAllowReorderings")


  public Result isAllowReorderings(Boolean isAllowReordering, @RequestBody List<Out_slice> out_slice) {


    Plchome.isAllowReordering = isAllowReordering;


    if (isAllowReordering == true) {


      for (Out_slice out_slice2 : out_slice) {


        homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(), out_slice2.getSequence());


      }