From 2c296fe96659899097f650a89a56a415424c34a5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 15:55:31 +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 | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 1dd2231..9d4b983 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
@@ -4,18 +4,16 @@
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.PatchLog;
+import com.example.erp.entity.pp.FlowCard;
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.mapper.pp.*;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import com.example.erp.mapper.pp.FlowCardMapper;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -27,12 +25,20 @@
@Transactional(rollbackFor = Exception.class)
public class ReworkService {
@Autowired
+ PatchLogMapper patchMapper;
+ @Autowired
ReworkMapper reworkMapper;
@Autowired
BasicDateProduceMapper basicDateProduceMapper;
@Autowired
SysErrorService sysErrorService;
+ final
+ FlowCardMapper flowCardMapper;
+
+ public ReworkService(FlowCardMapper flowCardMapper) {
+ this.flowCardMapper = flowCardMapper;
+ }
public List<Map<String, Object>> getSelectRework(Integer pageNum, Integer pageSize) {
Integer offset = (pageNum - 1) * pageSize;
@@ -41,11 +47,13 @@
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<>();
+
+ 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);
@@ -101,6 +109,7 @@
//娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
reworkMapper.insertRework(rework,oddNumber);
reworkMapper.updateDamageDetails(rework);
+ patchMapper.updateReportingWorkDetail(rework.getReportingWorkId(), Integer.valueOf(rework.getOrderSort()),rework.getTechnologyNumber());
}
}
@@ -161,5 +170,12 @@
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("type", flowCardMapper.selectType());
+ return map;
+ }
}
--
Gitblit v1.8.0