From ff195859283806241f3cb40e33170dd77a7eed61 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 09 七月 2025 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 090c13d..82da3f5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1203,10 +1203,12 @@
 
     }
 
+		public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
+		       return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
+		    }
 
-    public String saveWorkStorage(Map<String, Object> object) {
-        //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
-        //finishedGoodsInventoryService.addSelectWarehousing(object);
-        return null;
-    }
-}
+		public String saveWorkStorage(Map<String, Object> object) {
+		        //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
+		        //finishedGoodsInventoryService.addSelectWarehousing(object);
+		        return null;
+		    }}

--
Gitblit v1.8.0