From cd959593e255f8900f38fb51eb50ff6fdf0022aa Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 四月 2024 09:27:59 +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/BasicDateProduceService.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
index 8e98baf..451f221 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/BasicDateProduceService.java
@@ -1,11 +1,14 @@
package com.example.erp.service.pp;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.pp.BasicDataProduce;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.mapper.pp.BasicDateProduceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -16,11 +19,91 @@
@Autowired
private BasicDateProduceMapper basicDateProduceMapper;
+ //鏌ヨ宸ュ簭
+ public Map<String, Object> selectProcessSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", basicDateProduceMapper.selectProcessMp());
+ return map;
+ }
-// public Object SelectWorkBasicSv(String process) {
-// Map<String, Object> map = new HashMap<>();
-// map.put("device", basicDateProduceMapper.SelectWorkBasicDeviceMp(process));
-// map.put("teams", basicDateProduceMapper.SelectWorkBasicTeamsMp(process));
-// return map;
-// }
+
+ //鏌ヨ鎵�鏈夊熀纭�鏁版嵁
+ public Map<String, Object> selectBasicSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", basicDateProduceMapper.selectBasicMp());
+ map.put("process", basicDateProduceMapper.selectProcessMp());
+ return map;
+ }
+
+ //鏍规嵁Id鏌ヨ瀵瑰簲鍩虹鏁版嵁
+ public Map<String, Object> openSelectIdSv(String id) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", basicDateProduceMapper.openSelectIdMp(id));
+ return map;
+ }
+
+ //鍒犻櫎鍩虹鏁版嵁
+ public Boolean deleteBasicSv(String id) {
+ if (!id.isEmpty()) {
+
+ return basicDateProduceMapper.deleteBasicMp(id);
+ } else {
+
+ return false;
+ }
+ }
+
+ //updateBasicSv
+ public Boolean updateBasicSv(String id, String process, String name, String type) {
+ if (!id.isEmpty()) {
+ String BasicId = basicDateProduceMapper.getBasicData(process);
+ basicDateProduceMapper.updateBasicMp(id,BasicId,name,type);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ //鐝粍鍩虹鏁版嵁娣诲姞
+ public Boolean saveTeamGroupSv(Map<String, Object> object) {
+ List<BasicDataProduce> basicDataProduceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("basicDataProduce")), BasicDataProduce.class);
+ if (!basicDataProduceList.isEmpty()) {
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ //鏌ヨ宸ュ簭瀵瑰簲鐨勫伐搴廼d
+ String BasicId = basicDateProduceMapper.getBasicData(basicDataProduce.getBasicCategory());
+ basicDateProduceMapper.addTeamGroupMp(BasicId,basicDataProduce.getBasicName());
+ }
+ return true;
+ }else{
+ return false;
+ }
+
+ }
+
+ //娆＄牬绫诲瀷鍩虹鏁版嵁娣诲姞
+ public Boolean saveBreakageTypeSv(Map<String, Object> object) {
+ List<BasicDataProduce> basicDataProduceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("basicDataProduce")), BasicDataProduce.class);
+ if (!basicDataProduceList.isEmpty()) {
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ basicDateProduceMapper.saveBreakageTypeMp(basicDataProduce.getBasicName());
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+
+ //娆＄牬鍘熷洜鍩虹鏁版嵁娣诲姞
+ public boolean saveBreakageReasonSv(Map<String, Object> object) {
+ List<BasicDataProduce> basicDataProduceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("basicDataProduce")), BasicDataProduce.class);
+ if (!basicDataProduceList.isEmpty()) {
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ basicDateProduceMapper.saveBreakageReasonMp(basicDataProduce.getBasicName());
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0