From c7b7deaf184ca5bc1f12c94ce2214ff2e5b58fa3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 24 一月 2024 13:50:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 999b8e7..19831e2 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -3,7 +3,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.jcdm.common.core.domain.R;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,6 +50,24 @@
return getDataTable(list);
}
+ @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
+ @GetMapping("/getProduceNumToday")
+ public R getProduceNumToday(String fieldName)
+ {
+ Integer num = daPassingStationCollectionService.getProduceNumToday(fieldName);
+ return R.ok(num);
+ }
+
+ /**
+ * 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
+ */
+ @GetMapping("/insertRepairRecordByIds")
+ public AjaxResult insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection)
+ {
+ daPassingStationCollectionService.insertRepairRecordByIds(daPassingStationCollection);
+ return AjaxResult.success();
+ }
+
/**
* 瀵煎嚭浜у搧杩囩珯閲囬泦鍒楄〃
*/
--
Gitblit v1.9.3