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

ZengTao

2023-12-04 1479f77b88e355ce2c7c073458d919c8e06baa18

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

@@ -6,11 +6,14 @@
import java.util.Map;

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.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.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
@@ -38,6 +41,12 @@

  @Autowired
  SpianMapper spianMapper;

  @Autowired
  OutSliceServive outSliceServive;

  @Autowired
  North_Glass_Buffer1Service north_Glass_Buffer1Service;

  @Autowired
  private JdbcConnections jdbcConnections;
@@ -157,8 +166,10 @@
    if (result == null) {
      north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
      String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
      String position = jdbcConnections.SelectPositionByFrameBarcode(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());
          north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),sequence,position);
      map.put("message2", "200");
    } else {
      map.put("message2", "500");
@@ -273,12 +284,8 @@
  // 根据铝框id获取对应玻璃信息
  @PostMapping("/SelectAluminumFrameInfoById")
  public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
    List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
    String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
    for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
      north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
      north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
    }
    List<north_glass_buffer1> listAluminumFrame=north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
    Map<String, Object> map = new HashMap<>();
    map.put("listAluminumFrame", listAluminumFrame);
    map.put("flip", flip);
@@ -303,21 +310,17 @@

  // 根据玻璃id删除出片队列玻璃
  @PostMapping("/DeleteProductionQueueGlass")
  public Result DeleteProductionQueueGlass(Short id) {
    homeMapper.DeleteProductionQueueGlass(id);
  public Result DeleteProductionQueueGlass(String FrameNo) {
    homeMapper.DeleteProductionQueueGlass(FrameNo);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 添加出片
  // 添加铝框id对应玻璃到出片队列
  @PostMapping("/AddOutSliceS")
  public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) {
    for (String[] item : AluminumFrames) {
      if (item[1] == "true") {
        homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5]);
      }
    }
    outSliceServive.AddOutSliceS(AluminumFrames);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
@@ -326,14 +329,21 @@
  // 修改出片队列状态与出片队列调序
  @PostMapping("/isAllowQueues")
  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());
      }
    }
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 修改出片队列状态与出片队列调序
  @PostMapping("/isConfirmStates")
  public Result isConfirmStates(Boolean isConfirmStates) {
    Plchome.isConfirm = isConfirmStates;
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);