| | |
| | | /** |
| | | * 查询焊缝列表 |
| | | */ |
| | | @RequiresPermissions("weldSeam:weldSeam:list") |
| | | // @RequiresPermissions("weldSeam:weldSeam:list") |
| | | @GetMapping("/list") |
| | | public TableDataInfo list(ApsWeldSeam apsWeldSeam) { |
| | | // startPage(); |
| | |
| | | //分类 |
| | | List<SysDictData> list = DictUtils.getDictCache("aps_weld_classification"); |
| | | for (int i = 0; i < apsWeldSeamTemps.size(); i++) { |
| | | ApsWeldSeamTemp apsWeldSeamTemp = apsWeldSeamTemps.get(i); |
| | | //分类 |
| | | for (int j = 0; j < list.size(); j++) { |
| | | if (apsWeldSeamTemps.get(i).getClassificationTxt().equals(list.get(j).getDictLabel())) { |
| | | apsWeldSeamTemps.get(i).setClassification(list.get(j).getDictValue()); |
| | | if (apsWeldSeamTemp.getClassificationTxt().equals(list.get(j).getDictLabel())) { |
| | | apsWeldSeamTemp.setClassification(list.get(j).getDictValue()); |
| | | } |
| | | } |
| | | //工单类型 |
| | | for (int j = 0; j < listTypes.size(); j++) { |
| | | if (apsWeldSeamTemps.get(i).getWorkOrderTypeTxt().equals(listTypes.get(j).getDictLabel())) { |
| | | apsWeldSeamTemps.get(i).setWorkOrderType(listTypes.get(j).getDictValue()); |
| | | if (apsWeldSeamTemp.getWorkOrderTypeTxt().equals(listTypes.get(j).getDictLabel())) { |
| | | apsWeldSeamTemp.setWorkOrderType(listTypes.get(j).getDictValue()); |
| | | } |
| | | } |
| | | //插入版本号 |
| | | apsWeldSeamTemps.get(i).setBatchNumber(batchNum); |
| | | apsWeldSeamTemp.setBatchNumber(batchNum); |
| | | //插入临时表 |
| | | apsWeldSeamTemps.get(i).setTotalWeldSeam(apsWeldSeamTemps.get(i).getSingleWeldSeam().longValue()*apsWeldSeamTemps.get(i).getProductionQuantity().longValue()); |
| | | apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemps.get(i)); |
| | | apsWeldSeamTemp.setTotalWeldSeam(apsWeldSeamTemp.getSingleWeldSeam().longValue()* apsWeldSeamTemp.getProductionQuantity().longValue()); |
| | | |
| | | apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemp); |
| | | } |
| | | |
| | | return AjaxResult.success("导入成功", batchNum); |
| | |
| | | public AjaxResult confirmWeldSeam(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp) { |
| | | return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp)); |
| | | } |
| | | |
| | | /** |
| | | * 查询焊缝图表 |
| | | */ |
| | | @RequiresPermissions("weldSeam:weldSeam:weldSeamEchartsList") |
| | | @GetMapping("/weldSeamEchartsList") |
| | | public AjaxResult weldSeamEchartsList(ApsWeldSeam apsWeldSeam) { |
| | | List<List<String>> list = apsWeldSeamService.weldSeamEchartsList(apsWeldSeam); |
| | | return AjaxResult.success(list); |
| | | } |
| | | } |