| | |
|---|
| | | |
|---|
| | | // 根据玻璃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) { |
|---|
| | |
|---|
| | | north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(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()); |
|---|
| | |
|---|
| | | // 手动添加扫码位玻璃 |
|---|
| | | @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); |
|---|
| | | return storageCageService.InsertQueueGlassId(id, queue); |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 确认扫码位玻璃信息 |
|---|
| | |
|---|
| | | // 根据铝框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对应玻璃到出片队列 |
|---|
| | |
|---|
| | | return Result.success(map); |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 修改出片队列状态与出片队列调序 |
|---|
| | | // 修是否需要确认 |
|---|
| | | @PostMapping("/isConfirmStates") |
|---|
| | | public Result isConfirmStates(Boolean isConfirmStates) { |
|---|
| | | Plchome.isConfirm = isConfirmStates; |
|---|
