From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index 293f6c9..e6cae01 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -1,8 +1,10 @@
package com.example.erp.mapper.pp;
+import com.example.erp.dto.pp.PatchLogAddDTO;
+import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
-import com.example.erp.entity.pp.Rework;
+import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -10,27 +12,43 @@
import java.util.Map;
@Mapper
-public interface PatchLogMapper {
+public interface PatchLogMapper extends MPJBaseMapper<PatchLog> {
- List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
+ List<PatchLogDTO> SelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
+ String startDate, String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);
- Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
+ Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,
+ String startDate,String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);
- Integer getMaximum();
+ String getMaximum();
Boolean insertReplenish(@Param("patchLog") PatchLog patchLog , @Param("oddNumber") String oddNumber);
Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);
+ Boolean updateReportingWorkDetail(@Param("reportingWorkId") String reportingWorkId,@Param("orderSort") Integer orderSort,@Param("technologyNumber") Integer technologyNumber);
+
Boolean updateReplenish(@Param("patchLog") PatchLog patchLog , @Param("userName") String userName);
Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork );
- List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);
+ List<PatchLogAddDTO> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,@Param("patchLogAddDTO") PatchLogAddDTO patchLogAddDTO);
+ Boolean deleteReplenishMp(Long Id);
+
+ Boolean updatePatchDdMp(String reportingWorkId, String orderSort, Integer technologyNumber, Integer qualityInspector, String patchReason);
+
+ Boolean updatePatchBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);
+
+
+ Boolean updateOrderProcessDetailCancel(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork);
+
+ Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);
+
+ Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
}
--
Gitblit v1.8.0