From b864a88a6d34cbed2cfaad7f5e843ea1330c9c91 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 10:31:33 +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/ReplenishService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 1c5e613..13c704b 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
@@ -8,6 +8,7 @@
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.userInfo.SysError;
+import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.pp.PatchLogMapper;
import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.service.userInfo.SysErrorService;
@@ -33,10 +34,14 @@
final
ReportingWorkMapper reportingWorkMapper;
- public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper) {
+ final
+ FlowCardMapper flowCardMapper;
+
+ public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper,FlowCardMapper flowCardMapper) {
this.patchMapper = patchMapper;
this.sysErrorService = sysErrorService;
this.reportingWorkMapper = reportingWorkMapper;
+ this.flowCardMapper = flowCardMapper;
}
@@ -89,6 +94,7 @@
//娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
patchMapper.insertReplenish(patchLog,oddNumber);
patchMapper.updateDamageDetails(patchLog);
+ patchMapper.updateReportingWorkDetail(patchLog.getReportingWorkId(), Integer.valueOf(patchLog.getOrderSort()),patchLog.getTechnologyNumber());
}
}
@@ -164,5 +170,31 @@
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.selectReplenishPrintMp(selectTime1,selectTime2,flowCard));
+ map.put("type", flowCardMapper.selectType());
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelSv(String type, Map<String, Object> object) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+
+
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
}
--
Gitblit v1.8.0