From 14857a20b20a636a952375e064cf72f88296911d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 01 三月 2024 15:20:44 +0800
Subject: [PATCH] 返工修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 139 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 132 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index d0e4168..125530d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -1,14 +1,23 @@
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.Rework;
+import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.userInfo.SysError;
+import com.example.erp.mapper.pp.BasicDateProduceMapper;
import com.example.erp.mapper.pp.ReworkMapper;
+import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
@Service
@@ -16,14 +25,130 @@
public class ReworkService {
@Autowired
ReworkMapper reworkMapper;
+ @Autowired
+ BasicDateProduceMapper basicDateProduceMapper;
+ @Autowired
+ SysErrorService sysErrorService;
- /*鏌ヨ杩斿伐鏁版嵁*/
- public Map<String,Object> queryRework(Integer pageNum, Integer pageSize,String startTime,String endTime,Rework rework) {
+
+ public List<Map<String, Object>> getSelectRework(Integer pageNum, Integer pageSize) {
+ Integer offset = (pageNum - 1) * pageSize;
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> listMap = new ArrayList<>();
+
+
+ List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);
+ List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams();
+
+ for (Map<String, Object> item:ReworkMap){
+ item.put("reworkTeam","");
+ List<BasicDataProduce> basicCategory=new ArrayList<>();
+ for (BasicDataProduce basicDataProduce:basicDataProduceList){
+ if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){
+ basicCategory.add(basicDataProduce);
+ }
+ }
+ item.put("basicCategory",basicCategory);
+ listMap.add(item);
+ System.out.println(listMap);
+ }
+ return listMap;
+ }
+
+ public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize,List<String> selectDate,Rework rework) {
Integer offset = (pageNum-1)*pageSize;
-
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
Map<String,Object> map = new HashMap<>();
- map.put("data",reworkMapper.queryRework(offset,pageSize,startTime,endTime,rework));
+ map.put("data",reworkMapper.SelectRework(offset,pageSize,startDate,endDate,rework));
+ map.put("total",reworkMapper.SelectReworkPageTotal(offset,pageSize,startDate,endDate,rework));
+
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
+
+ public Boolean saveRework(Map<String,Object> object) {
+ boolean saveState = true;
+
+
+ String userName = "";
+ String userId = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
+ if (!reworklist.isEmpty()){
+ for (Rework rework : reworklist) {
+ System.out.println(rework);
+ //鑾峰彇鍗曞彿
+ String oddNumber= orderNumberSetting("杩斿伐");
+ //娣诲姞鍑哄叆搴撹褰�
+ reworkMapper.insertRework(rework,oddNumber);
+ reworkMapper.updateReportingWorkDetail(rework);
+ }
+ }
+
+
+ return saveState;
+
+ }
+
+ public Boolean updateRework(Map<String,Object> object) {
+ boolean saveState = true;
+
+ String userName = "";
+ String userId = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
+ if (!reworklist.isEmpty()){
+ for (Rework rework : reworklist) {
+ //瀹℃牳
+ reworkMapper.updateRework(rework,userName);
+ }
+ }
+
+
+ return saveState;
+
+ }
+
+ public String orderNumberSetting(String type) {
+ //鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
+ String alias="";
+ if(Objects.equals(type, "杩斿伐")){
+ alias="FG";
+ }
+ //鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
+ Integer maximum=reworkMapper.getMaximum();
+ //璁剧疆涓や綅涓嶅琛�0
+ String formattedNumber = String.format("%02d", maximum+1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ String oddNumbers = alias+formattedDate+formattedNumber;
+ return oddNumbers;
+ }
}
--
Gitblit v1.8.0