Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-03-10 c12e4a831b4210ec886b2537824a464d74b59ff5

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 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());

 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

 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