From b1b5cf4b00ddc12f624f299174a6366d2cdb2617 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:20:31 +0800
Subject: [PATCH] 提交相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index a0099f2..8f78102 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -7,6 +7,8 @@
import com.example.erp.common.AsyncQueryExecutor;
import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
+import com.example.erp.dto.pp.exportReplenishDTO;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
@@ -95,9 +97,9 @@
Integer offset = (pageNum - 1) * pageSize;
- // 榛樿鏃堕棿鑼冨洿锛氳繃鍘�15澶�
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘�7澶�
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(7).toString();
// 鐢ㄦ埛鑷畾涔夋椂闂存
if (selectDate != null && selectDate.size() == 2) {
@@ -268,9 +270,27 @@
return oddNumbers;
}
- public Object selectPrintSv(java.sql.Date selectTime1, java.sql.Date selectTime2, FlowCard flowCard) {
+ public Object selectPrintSv(List<String> selectDate, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectReplenishPrintMp(selectTime1,selectTime2,flowCard));
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘�7澶�
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(7).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);
+ }
+ }
+ // 杩斿洖鏃堕棿娈�
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate", list);
+ map.put("data", flowCardMapper.selectReplenishPrintMp(startDate,endDate,flowCard));
map.put("type", flowCardMapper.selectType());
return map;
}
@@ -340,6 +360,13 @@
reportingWorkMapper.updateRWDPatchNum(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum());
//鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
reportingWorkMapper.updateReplenishWorkProcess(patchLog1.getProcessId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchProcesses());
+
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteReplenishSv琛ョ墖鍒犻櫎");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
}
else{
saveState = false;
@@ -417,5 +444,24 @@
return saveState;
}
+
+// public List exportReplenishSv(Map<String, Object> dates) {
+// }
+ public List<exportReplenishDTO> exportReplenishSv(List<LocalDate> dates) {
+ return patchMapper.exportReplenishMp(dates);
+ }
+
+ public Boolean updatePrintNumSv(List<Map<String, Object>> list) {
+ if (!list.isEmpty()){
+ for (Map<String, Object> item : list) {
+ Integer id = (Integer) item.get("id");
+ patchMapper.updatePrintNumMp(id);
+ }
+ return true;
+ }else {
+ return false;
+ }
+
+ }
}
--
Gitblit v1.8.0