From c27a685ed122e3f2934eba2c3d77bc2e1312a4cf Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期五, 09 八月 2024 11:19:41 +0800
Subject: [PATCH] 修改当传入数据为空时，该=改null  为0

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 05224c5..307a200 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -2,11 +2,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.BasicDataProduce;
 import com.example.erp.entity.pp.ReportingWork;
-import com.example.erp.entity.pp.ReportingWorkDetail;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDate;
+import java.sql.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -14,17 +12,17 @@
 public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {
 
 
-    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr,String previousProcess,String nextProcess,String process);
+    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);
 
     List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);
 
     List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
 
-    String SelectTechnologicalProcess(String processIdStr);
+    String SelectTechnologicalProcess(String processIdStr, String technologyStr);
 
     String SelectWorkTechnologyMp(String processIdStr);
 
-    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);
+    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);
 
     List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
 
@@ -47,4 +45,39 @@
     int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
 
     List<Map<String,Object>> selectByReportingWorkId(String reportingWorkId,String nextProcess);
+    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+
+    String selectNextProcess(String reportingWorkId);
+
+    Integer selectCountByProcessId(String processId, String nextProcess);
+
+    List<Map<String, Object>> reportingWorkDate(String reportingWorkId);
+
+    Boolean updateWorkProcess(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity, Object breakageQuantity, String thisProcess);
+
+    Boolean deleteWork(String reportingWorkId);
+
+    String selectLastProcess(String processId);
+
+    Map<String, Object> selectReceiptQuantity(String processId);
+
+    Integer selectCompletedQuantity(String reportingWorkId);
+
+    Boolean updateInventoryQuantity(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity);
+
+    List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+
+    List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
+
+    Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
+
+    Boolean updateQualityStatusMp(String reportingWorkId,String username);
+
+    List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);
+
+    Integer selectLayerByReportingWorkId(String reportingWorkId);
+
+    Boolean ReviewReportingWorkMp(String substring, String process, String result);
+
+    String getPatchConditionMp(String reportingWorkId);
 }

--
Gitblit v1.8.0