| | |
|---|
| | | baseMapper.updateById(bigStorageCageDetails); |
|---|
| | | bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot()); |
|---|
| | | damage.setGlassId(bigStorageCageDetails.getGlassId()); |
|---|
| | | damage.setWorkingProcedure("冷加工"); |
|---|
| | | damage.setLine(3001); |
|---|
| | | damage.setRemark("大理片笼破损"); |
|---|
| | | damage.setStatus(2); |
|---|
| | | damage.setWorkingProcedure("钢化"); |
|---|
| | | damage.setLine(4001); |
|---|
| | | damage.setRemark("大理片笼"); |
|---|
| | | damage.setStatus(1); |
|---|
| | | damageService.insertDamage(damage); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight())) |
|---|
| | | .last("limit 1"); |
|---|
| | | if (glassInfo.getTemperingLayoutId() == 0) { |
|---|
| | | //todo:同流程进同一格 |
|---|
| | | // wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId()) |
|---|
| | | // .eq(BigStorageCageDetails::get) |
|---|
| | | wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight()); |
|---|
| | | wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId()) |
|---|
| | | .eq(BigStorageCageDetails::getLayer,glassInfo.getLayer()); |
|---|
| | | // wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight()); |
|---|
| | | } else { |
|---|
| | | wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1); |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Map<String, Object>> selectTemperingGlass() { |
|---|
| | | QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>(); |
|---|
| | | wrapper.select("engineer_id,tempering_layout_id,count(*) as count") |
|---|
| | | .in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL) |
|---|
| | | .groupBy("engineer_id,tempering_layout_id") |
|---|
| | | .orderByAsc("engineer_id") |
|---|
| | | .orderByAsc("tempering_layout_id"); |
|---|
| | | List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper); |
|---|
| | | return TemperingGlass; |
|---|
| | | List<Map<String, Object>> temperingGlass = baseMapper.selectTemperingGlassCount(); |
|---|
| | | return temperingGlass; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | |
|---|
| | | redisUtil.setCacheObject("temperingSwitch", flag); |
|---|
| | | return "success"; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void appointEngineerId(String engineerId){ |
|---|
| | | redisUtil.setCacheObject("temperingengineerId", engineerId); |
|---|
| | | } |
|---|
| | | } |
|---|
