From 6170908b69269ee14eae05787eafe682fda00eef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 八月 2023 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 production-server/src/main/java/com/yuanchu/mom/service/impl/ProductionPlanServiceImpl.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ProductionPlanServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ProductionPlanServiceImpl.java
new file mode 100644
index 0000000..9b01d35
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ProductionPlanServiceImpl.java
@@ -0,0 +1,32 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.mapper.ManualTechnologyMapper;
+import com.yuanchu.mom.mapper.ManufactureOrderMapper;
+import com.yuanchu.mom.service.ProductionPlanService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ProductionPlanServiceImpl implements ProductionPlanService {
+
+    @Resource
+    ManufactureOrderMapper manufactureOrderMapper;
+
+    @Resource
+    ManualTechnologyMapper manualTechnologyMapper;
+
+    //鏌ヨ璁惧鍒楄〃
+    @Override
+    public List<Map<String, Object>> selectAllDev() {
+        return manualTechnologyMapper.selectAllDev();
+    }
+
+    //鏌ヨ鐢熶骇璁″垝鍒楄〃
+    @Override
+    public List<Map<String, Object>> selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime) {
+        return manufactureOrderMapper.selectAllPlan(deviceId,orderCode,name,startTime,endTime);
+    }
+}

--
Gitblit v1.9.3