From e54885f442dbfc3364f2be919af667d9225c65fc Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 20 三月 2025 10:22:25 +0800
Subject: [PATCH] 修改case条件面积计算方式
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index e559b99..668634d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -14,12 +14,14 @@
boolean updateOrderParameter(@Param("orderId") String orderId);
- List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
- Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
+ List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType, String field, String orderBy);
+ Map<String,Float> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
boolean reviewOrderById(String id, Integer status, String userId, String userName);
boolean reviewOrderByIds(String id, Integer status, String userId, String userName);
+
+ boolean backReviewOrderById(String id);
boolean reviewProcessById(String id, Integer status);
@@ -50,4 +52,11 @@
Order selectOrderId(String orderId);
List<Map<String,String>> selectDifferentSize(String orderId);
+
+ //鏌ヨ璁㈠崟鍏ュ簱鐘舵��
+ Integer searchOrderWarehousing( String orderId);
+
+ Map<String,String> scannerGlassInfo(String projectNo, Integer layoutId, Integer sort, String orderId);
+
+ String getProcessIdByOptimizeHeatDetail(String projectId, Integer layoutId, Integer sort);
}
--
Gitblit v1.8.0