From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 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 a893ed4..783f769 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,10 @@
 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 com.example.erp.entity.sd.OrderGlassDetail;
 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;
 
@@ -26,7 +25,7 @@
 
     List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);
 
-    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String previousProcess);
+    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
 
     List<Map<String,String>> SelectProcessMp();
 
@@ -41,4 +40,39 @@
     List<Map<String,BasicDataProduce>>  selectBasicNameByType(String type);
 
     Integer selectMaxReportingWorkId();
+
+    int selectGlassProcessNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
+
+    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);
 }

--
Gitblit v1.8.0