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/FlowCardMapper.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 0c6ed4d..77f5143 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -15,10 +16,10 @@
@Mapper
public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
- List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗛〉鏌ヨ
- Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
@@ -70,7 +71,7 @@
Boolean deleteReportingWork(String processId);
Boolean deleteReportingWorkByOrderId(String orderId);
- List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
@@ -89,6 +90,8 @@
Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
Boolean updateComposing(String processId);
+
+ Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);
List<Map<String, String>> getPrintLabel(String projectNo);
@@ -222,4 +225,22 @@
Integer selectProjectProcessPrintCount(String projectNo);
int flowCardToOptimizeCount(String orderId);
+
+ List<Map<String, Object>> getFlowCardDetail(String processId);
+
+ Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
+
+ List<OrderDetail> getOrderDetailByProductionId(String orderId, String productionId, String type, Float inLenMax, Float inLenMin, Float inShortMax, Float inShortMin, Float glassThickness);
+
+ Boolean revokeComposing(String processId);
+
+ Integer selectProjectNo(String processId);
+
+ List<Map<String, String>> selectPrintDetailsMp2(String orderId);
+
+ List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
+
+ Boolean updatePrintNumberMp(String processId, Integer orderNumber);
+
+ String getOrderIdByProcessId(String processId);
}
--
Gitblit v1.8.0