From df6bb7f982ca8a4ba57a87ef85aad58bfc4dd524 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 17:37:30 +0800
Subject: [PATCH] 焊缝统计相关
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
index 0bf560a..19e02b1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -40,7 +40,7 @@
@RequiresPermissions("partPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsPartPlan apsPartPlan) {
- startPage();
+// startPage();
List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
return getDataTable(list);
}
@@ -112,7 +112,7 @@
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class);
List<ApsPartPlanTemp> apsPartPlans = util.importExcel(file.getInputStream());
-
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
if (apsPartPlans.size() > 0) {
String batchNum= IdUtils.fastUUID();
List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
@@ -123,12 +123,29 @@
break;
}
}
+ //鎻掑叆鐗堟湰鍙�
apsPartPlans.get(i).setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
apsPartPlanTempService.insertApsPartPlanTemp(apsPartPlans.get(i));
}
- return AjaxResult.success(batchNum);
+
+ return AjaxResult.success("瀵煎叆鎴愬姛",batchNum);
} else {
return AjaxResult.error("妯℃澘鍐呭涓虹┖");
}
}
+ /***
+ * @Description: 纭涓婁紶
+ * @Param: [apsPartPlan]
+ * @return: com.aps.common.core.web.domain.AjaxResult
+ * @Author: wwj
+ * @Date: 2025/4/9
+ */
+ @GetMapping("/confirmPart")
+ public AjaxResult confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+ return toAjax(apsPartPlanService.confirmPart(apsPartPlanTemp));
+ }
+
+
+
}
--
Gitblit v1.9.3