From 37931d04e87cbae60cf833890c2c8432b389fa1a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 08:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 97 insertions(+), 0 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
new file mode 100644
index 0000000..bf346f5
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -0,0 +1,97 @@
+package com.example.erp.service.pp;
+
+import com.example.erp.entity.pp.ReportingWork;
+import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.mapper.pp.BasicDateProduceMapper;
+import com.example.erp.mapper.pp.ReportingWorkMapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@DS("pp")
+public class ReportingWorkService {
+ @Autowired
+ ReportingWorkMapper reportingWorkMapper;
+
+ BasicDateProduceMapper basicDateProduceMapper;
+
+ public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
+ Map<String, Object> map = new HashMap<>();
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
+
+ int index = technologicalProcess.indexOf("-");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = technologicalProcess.substring(0, index);
+ String[] processList = technologicalProcess.split("->");
+ int length = processList.length;
+
+ //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
+ String previousProcess = "";
+ String nextProcess = "";
+
+ //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
+ for (int i = 0; i < length; i++) {
+ //褰撳埌褰撳墠宸ュ簭鏃�
+ if (processList[i].equals(process)) {
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
+ if (i - 1 < 0) {
+ previousProcess = "";
+ } else {
+ previousProcess = processList[i - 1];
+ }
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
+ if (i + 1 > length - 1) {
+ nextProcess = "";
+ } else {
+ nextProcess = processList[i + 1];
+ }
+ //System.out.println("褰撳墠宸ュ簭锛�" + process + " 涓婁竴閬撳伐搴忥細" + previousProcess + " 涓嬩竴閬撳伐搴忥細" + nextProcess);
+ //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
+ map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr,previousProcess,nextProcess,process));
+ map.put("thisProcess", processList);
+ break;
+ }
+ }
+
+
+ //璁惧涓嬫媺妗�
+ map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
+ //鐝粍涓嬫媺妗�
+ map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
+
+
+ //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
+ String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
+
+
+ //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
+ if (interceptProcess.equals(process)) {
+ //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
+ map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr,technologyStr));
+
+ }
+ else {
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+
+ map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr,technologyStr,previousProcess));
+ }
+
+ // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
+
+ // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
+
+ return map;
+
+ }
+
+ public Map<String, Object> SelectProcessSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", reportingWorkMapper.SelectProcessMp());
+ return map;
+ }
+}
--
Gitblit v1.8.0