From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 ce115c8..95666d2 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,26 +1,33 @@
package com.example.erp.mapper.pp;
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.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.github.yulichang.base.MPJBaseMapper;
+import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@Mapper
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);
@@ -35,9 +42,9 @@
List<PatchLogAddDTO> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,@Param("patchLogAddDTO") PatchLogAddDTO patchLogAddDTO);
- Boolean deleteReplenishMp(String patchId);
+ Boolean deleteReplenishMp(Long Id);
- Boolean updatePatchDdMp(String reportingWorkId, String orderSort, Integer technologyNumber, Integer qualityInspector);
+ Boolean updatePatchDdMp(String reportingWorkId, String orderSort, Integer technologyNumber, Integer qualityInspector, String patchReason);
Boolean updatePatchBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);
@@ -45,5 +52,11 @@
Boolean updateOrderProcessDetailCancel(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork);
Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);
+
+ Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
+
+ List<exportReplenishDTO> exportReplenishMp(List<LocalDate> dates);
+
+ Boolean updatePrintNumMp(Integer id);
}
--
Gitblit v1.8.0