From 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 15 三月 2024 09:09:10 +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/ReportingWorkMapper.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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..aefe9f3 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;
@@ -47,4 +46,25 @@
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);
}
--
Gitblit v1.8.0