From 184e9d1d4ce1c33a47e5cc66478b10539a2cc4e7 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 20 五月 2025 15:32:08 +0800
Subject: [PATCH] 完善钣金计划大表
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
index cef6175..ccaa95c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
@@ -38,7 +38,7 @@
/**
* 鏌ヨ鐒婄紳鍒楄〃
*/
- @RequiresPermissions("weldSeam:weldSeam:list")
+// @RequiresPermissions("weldSeam:weldSeam:list")
@GetMapping("/list")
public TableDataInfo list(ApsWeldSeam apsWeldSeam) {
// startPage();
@@ -131,23 +131,25 @@
//鍒嗙被
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);
@@ -164,8 +166,18 @@
* @Date: 2025/4/9
*/
@RequiresPermissions("weldSeam:weldSeam:confirmWeldSeam")
- @GetMapping("/confirmWeldSeam")
- public AjaxResult confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
+ @PostMapping("/confirmWeldSeam")
+ 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);
+ }
}
--
Gitblit v1.9.3