From 731ab1ab578873d0374823fe0ca6f6928b50bd32 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 15 七月 2024 13:14:37 +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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 7054938..9e95501 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;
@@ -33,6 +31,12 @@
@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;
@@ -163,5 +167,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