From b3d242b9b03258f51a147244d856c020d374ef6b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 19 十二月 2025 11:14:56 +0800
Subject: [PATCH] 提交上传图片文件设置
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 6b82402..7ebcb56 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
@@ -59,7 +60,6 @@
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"))) {
@@ -72,7 +72,7 @@
return listMap;
}
- public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, Rework rework) {
+ public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, ReworkDTO rework) {
Integer offset = (pageNum - 1) * pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
@@ -201,7 +201,6 @@
boolean saveState = true;
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
- System.out.println(111111);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
if (!reworklist.isEmpty()){
@@ -209,7 +208,7 @@
//鍒犻櫎杩斿伐琛ㄥ搴旇ˉ鐗噄d鏁版嵁
reworkMapper.deleteReworkMp(rework.getReworkId());
//淇敼娆＄牬鏄庣粏琛ㄨˉ鐗囨暟閲忓拰鐘舵��
- reworkMapper.updateReworkDdMp(rework.getReportingWorkId(),rework.getOrderSort(),rework.getTechnologyNumber(),rework.getReworkNum());
+ reworkMapper.updateReworkDdMp(rework.getReportingWorkId(),rework.getOrderSort(),rework.getTechnologyNumber(),rework.getReworkNum(),rework.getReworkType(),rework.getReworkReason());
//淇敼鎶ュ伐鏄庣粏琛ㄧ姸鎬�
reworkMapper.updateReworkBgMp(rework.getReportingWorkId(),rework.getOrderSort(),rework.getTechnologyNumber());
@@ -229,5 +228,33 @@
return saveState;
}
+
+ public Map<String, Object> getSelectReworkPrintCustomLabel(String type, Integer lableType, 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) {
+ if (lableType != 2){//鎴愬搧鏍囩
+ Map<String, Object> itemmap = new HashMap<>();
+ System.out.println(flowCard.getProcessId());
+ System.out.println("==============");
+ itemmap.put("data", flowCardMapper.getReworkPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+ list.add(itemmap);
+ }
+ else{//灏忕墖鏍囩
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getReworkPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+ list.add(itemmap);
+ }
+
+
+
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
}
--
Gitblit v1.8.0