From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/DeviceMaintenanceService.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
new file mode 100644
index 0000000..35b1ee8
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
@@ -0,0 +1,112 @@
+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.DeviceMaintenance;
+import com.example.erp.entity.pp.ReportingWork;
+import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("pp")
+public class DeviceMaintenanceService {
+ @Autowired
+ private DeviceMaintenanceMapper deviceMaintenanceMapper;
+
+
+ public Boolean saveMachineSv(Map<String, Object> object) {
+ List<BasicDataProduce> basicDataProduceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("machine")), BasicDataProduce.class);
+ if (!basicDataProduceList.isEmpty()) {
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ //鏌ヨ宸ュ簭瀵瑰簲鐨勫伐搴廼d
+ String BasicId = deviceMaintenanceMapper.getBasicData(basicDataProduce.getBasicCategory());
+ deviceMaintenanceMapper.addMachineMp(BasicId,basicDataProduce.getBasicName());
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectDataSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", deviceMaintenanceMapper.selectProcessMp());
+ map.put("device", deviceMaintenanceMapper.selectDeviceMp());
+ return map;
+ }
+
+ public Boolean saveMaintenanceAndRepairSv(Map<String, Object> object) {
+ List<DeviceMaintenance> deviceMaintenanceList = JSONArray.parseArray(JSONObject.toJSONString(object.get("machine")), DeviceMaintenance.class);
+ if (!deviceMaintenanceList.isEmpty()) {
+ for (DeviceMaintenance deviceMaintenance : deviceMaintenanceList) {
+ //鏌ヨ璁惧瀵瑰簲鐨勮澶嘔d
+ String deviceId = deviceMaintenanceMapper.getDeviceData(deviceMaintenance.getDeviceName());
+ //娣诲姞
+ deviceMaintenanceMapper.saveMaintenanceAndRepairMp(deviceId,deviceMaintenance.getDeviceName(),
+ deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
+ deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
+ deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
+ deviceMaintenance.getPersonnel(),
+ deviceMaintenance.getCost()
+ );
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectMaintenanceSv(Date selectTime1, Date selectTime2) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.selectMaintenanceMp(selectTime1,selectTime2));
+ map.put("process", deviceMaintenanceMapper.selectProcessMp());
+ return map;
+ }
+
+ public Boolean deleteMaintenanceSv(String id) {
+ if (!id.isEmpty()) {
+
+ return deviceMaintenanceMapper.deleteMaintenanceMp(id);
+ } else {
+
+ return false;
+ }
+ }
+
+ public Map<String, Object> selectMachineSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.selectMachineMp());
+ return map;
+ }
+
+ public Map<String, Object> openSelectIdSv(String id) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.openSelectIdMp(id));
+ return map;
+ }
+
+ public Boolean updateMaintenance(Map<String, Object> object) {
+ JSONObject dataJson = new JSONObject(object);
+ DeviceMaintenance deviceMaintenance = JSONObject.parseObject(JSONObject.toJSONString(dataJson.get("machine")), DeviceMaintenance.class);
+ if (!dataJson.isEmpty()) {
+ deviceMaintenanceMapper.updateMaintenanceMp(deviceMaintenance.getId(),deviceMaintenance.getDeviceName(),
+ deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
+ deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
+ deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
+ deviceMaintenance.getPersonnel(),
+ deviceMaintenance.getCost()
+ );
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
--
Gitblit v1.8.0