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 | 20 ++++++++++++++++++--
1 files changed, 18 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 6a16701..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,6 +1,7 @@
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,8 +15,8 @@
boolean updateOrderParameter(@Param("orderId") String orderId);
- 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);
+ 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, String userId, String userName);
@@ -55,4 +56,19 @@
//鏌ヨ璁㈠崟鍏ュ簱鐘舵��
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