From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 0a23ee7..287f654 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;
@@ -71,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();
@@ -200,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()){
@@ -208,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());
--
Gitblit v1.8.0