From 1e56bd5cc3be7f7957788f2606c7f56cb4d27f50 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 十二月 2025 11:41:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 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 08778b3..4e19bf2 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
@@ -1,12 +1,11 @@
package com.example.erp.mapper.sd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.Product;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -16,12 +15,60 @@
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, OrderSearchDTO order, Integer orderType, String field, String orderBy);
+ Map<String,Float> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderSearchDTO order , Integer orderType);
- boolean reviewOrderById(String id,Integer status);
+ 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);
boolean updateMoney(@Param("order") Order order);
+
+ Integer cancelOrder(String id);
+
+ List<Order> selectOrder(@Param("order") Order order);
+
+ Integer selectMaxOrderIdByMonth();
+
+ boolean updateOrderPrintNumber(@Param("orderId") String orderId);
+
+ Integer selectMaxOrderIdByYear();
+
+ Integer selectOrderIdMin(Integer substringInt);
+
+ Integer selectOrderIdIs(Integer substringInt);
+
+ Integer selectOrderIdDay(String oldOrderId);
+
+ Integer selectOrderIdMonth(String oldOrderId);
+
+ Integer selectOrderIdYear(String oldOrderId);
+
+ Boolean updateOrderId(String oldOrderId,String newOrderId);
+
+ 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);
+
+ Boolean saveOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
+
+ Boolean updateOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
+
+ Map<String,String> selectOrderFile( String orderId,Integer orderNumber);
+
+ List<Map<String,String>> selectOrderFileList( String orderId);
+
+ List<Map<String,Object>> selectProcessAttributeConfigOne();
+ List<Map<String,Object>> selectProcessAttributeConfigTow(String belong);
}
--
Gitblit v1.8.0