From 1ae5f2198b70aba54c49f1752e02dfe7b9d5a2e9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 04 八月 2024 17:35:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 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 9d4b983..aa23a10 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
@@ -6,8 +6,10 @@
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Rework;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.*;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,8 +38,12 @@
final
FlowCardMapper flowCardMapper;
- public ReworkService(FlowCardMapper flowCardMapper) {
+ final LogService logService;
+
+ public ReworkService(FlowCardMapper flowCardMapper,LogService logService) {
+
this.flowCardMapper = flowCardMapper;
+ this.logService = logService;
}
public List<Map<String, Object>> getSelectRework(Integer pageNum, Integer pageSize) {
@@ -46,49 +52,49 @@
List<Map<String, Object>> listMap = new ArrayList<>();
- List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);
+ List<Map<String, Object>> ReworkMap = reworkMapper.getSelectRework(offset, pageSize);
- for (Map<String, Object> item:ReworkMap){
- item.put("reworkTeam","");
- List<BasicDataProduce> basicCategory=new ArrayList<>();
+ for (Map<String, Object> item : ReworkMap) {
+ item.put("reworkTeam", "");
+ List<BasicDataProduce> basicCategory = new ArrayList<>();
- List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
- for (BasicDataProduce basicDataProduce:basicDataProduceList){
- if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){
+ List<BasicDataProduce> basicDataProduceList = basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
+ for (BasicDataProduce basicDataProduce : basicDataProduceList) {
+ if (Objects.equals(basicDataProduce.getBasicData().getBasicName(), item.get("reworkProcesses"))) {
basicCategory.add(basicDataProduce);
}
}
- item.put("basicCategory",basicCategory);
+ item.put("basicCategory", basicCategory);
listMap.add(item);
}
return listMap;
}
- public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize,List<String> selectDate,Rework rework) {
- Integer offset = (pageNum-1)*pageSize;
+ 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()){
+ if (selectDate != null && selectDate.size() == 2) {
+ if (!selectDate.get(0).isEmpty()) {
startDate = selectDate.get(0);
}
- if(!selectDate.get(1).isEmpty()){
+ if (!selectDate.get(1).isEmpty()) {
endDate = selectDate.get(1);
}
}
- Map<String,Object> map = new HashMap<>();
- map.put("data",reworkMapper.SelectRework(offset,pageSize,startDate,endDate,rework));
- map.put("total",reworkMapper.SelectReworkPageTotal(offset,pageSize,startDate,endDate,rework));
+ Map<String, Object> map = new HashMap<>();
+ 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);
+ map.put("selectDate", list);
return map;
}
- public Boolean saveRework(Map<String,Object> object) {
+ public Boolean saveRework(Map<String, Object> object) {
boolean saveState = true;
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
@@ -101,15 +107,15 @@
userId = object.get("userId").toString();
}
//鑾峰彇鍗曞彿
- String oddNumber= orderNumberSetting("杩斿伐");
+ String oddNumber = orderNumberSetting("杩斿伐");
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
- if (!reworklist.isEmpty()){
+ if (!reworklist.isEmpty()) {
for (Rework rework : reworklist) {
//娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
- reworkMapper.insertRework(rework,oddNumber);
+ reworkMapper.insertRework(rework, oddNumber);
reworkMapper.updateDamageDetails(rework);
- patchMapper.updateReportingWorkDetail(rework.getReportingWorkId(), Integer.valueOf(rework.getOrderSort()),rework.getTechnologyNumber());
+ patchMapper.updateReportingWorkDetail(rework.getReportingWorkId(), Integer.valueOf(rework.getOrderSort()), rework.getTechnologyNumber());
}
}
@@ -123,12 +129,18 @@
saveState = false;
}
-
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("saveRework杩斿伐鏂板");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
return saveState;
}
- public Boolean updateRework(Map<String,Object> object) {
+ public Boolean updateRework(Map<String, Object> object) {
boolean saveState = true;
String userName = "";
@@ -141,10 +153,10 @@
}
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
- if (!reworklist.isEmpty()){
+ if (!reworklist.isEmpty()) {
for (Rework rework : reworklist) {
//瀹℃牳
- reworkMapper.updateRework(rework,userName);
+ reworkMapper.updateRework(rework, userName);
}
}
@@ -155,25 +167,25 @@
public String orderNumberSetting(String type) {
//鏍规嵁绫诲瀷鑷姩鐢熸垚涓嶅悓鐨勬搷浣滃崟鍙�
- String alias="";
- if(Objects.equals(type, "杩斿伐")){
- alias="FG";
+ String alias = "";
+ if (Objects.equals(type, "杩斿伐")) {
+ alias = "FG";
}
//鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
- Integer maximum=reworkMapper.getMaximum();
+ Integer maximum = reworkMapper.getMaximum();
//璁剧疆涓や綅涓嶅琛�0
- String formattedNumber = String.format("%02d", maximum+1);
+ 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;
+ String oddNumbers = alias + formattedDate + formattedNumber;
return oddNumbers;
}
public Object selectPrintSv(java.sql.Date selectTime1, java.sql.Date selectTime2, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectReworkPrintMp(selectTime1,selectTime2,flowCard));
+ map.put("data", flowCardMapper.selectReworkPrintMp(selectTime1, selectTime2, flowCard));
map.put("type", flowCardMapper.selectType());
return map;
}
--
Gitblit v1.8.0