From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 2 +-
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 2 +-
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index b28f9c7..0a9cc5e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -123,7 +123,15 @@
log.setFunction("saveOrderTitle淇濆瓨琛ㄥご:"+order.getOrderId());
Order order1 = orderMapper.selectOrderId(order.getOrderId());
+ //浣跨敤璁㈠崟鍘熸湰鐨勭姸鎬佸拰璁＄畻鏂瑰紡
order.setCalculateType(order1.getCalculateType());
+ order.setCreateOrder(order1.getCreateOrder());
+ order.setProcessReview(order1.getProcessReview());
+ order.setOrderReview(order1.getOrderReview());
+ order.setProductionOrder(order1.getProductionOrder());
+ order.setProcessingCard(order1.getProcessingCard());
+ order.setWarehousing(order1.getWarehousing());
+ order.setDelivery(order1.getDelivery());
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 1e9753c..3ed5884 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -167,7 +167,7 @@
</update>
<select id="getDifferentSizeNumber">
- select if(count(id)>1,1,0) from (select
+ select if(count(id)>0,1,0) from (select
a.id,a.child_width,b.width
from order_glass_detail as a
left join order_detail as b
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 8fdd80e..a5ae3ad 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -199,7 +199,7 @@
) as acc
order by
<if test="orderBy == null ">
- id desc
+ order_id desc
</if>
<if test="orderBy == 'desc'">
${field} desc
--
Gitblit v1.8.0