From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数

---
 north-glass-erp/src/main/resources/mapper/sd/Delivery.xml |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml b/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
index a62652e..bdeccd8 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Delivery.xml
@@ -28,6 +28,10 @@
         <result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
     </resultMap>
 
+
+    <delete id="deleteDelivery">
+        delete from sd.delivery where delivery_id=#{deliveryId}
+    </delete>
     <update id="updateDeliveryToExamine">
         update sd.delivery set delivery_state=#{deliveryState} where delivery_id=#{deliveryId}
     </update>
@@ -36,8 +40,13 @@
         update sd.delivery set area=#{area},quantity=#{quantity},money=#{money} where delivery_id=#{oddNumber}
     </update>
 
+
     <select id="getmaximum" >
         select count(*) from sd.delivery where  date(create_time)=CURDATE()
+    </select>
+
+    <select id="getDeliveryConut" >
+        select count(*) from sd.delivery where  delivery_id=#{deliveryId}
     </select>
 
 
@@ -117,12 +126,13 @@
                 and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
             </if>
         </where>
-        group by o.order_id
+        group by o.order_id order by o.id desc
         limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectOrderInventoryPageTotal" >
-        select CEILING(count(zu.order_id)/#{pageSize}) from
+        select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
+        count(zu.order_id) as 'total' from
         (select o.create_order,o.process_review,o.order_review,o.production_order,
         o.processing_card,o.warehousing,o.delivery,o.order_id,o.customer_id,
         o.customer_name,o.quantity,sum(fgi.quantity_available),o.project,o.batch,
@@ -170,15 +180,14 @@
                 and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
             </if>
         </where>
-        group by o.order_id) as zu
-        limit #{offset},#{pageSize};
+        group by o.order_id limit #{offset},#{pageSize}) as zu;
 
 
 
 
     </select>
 
-    <select id="getseletShippingOrderDetaildelivery" >
+    <select id="getSelectShippingOrderDetailDelivery" >
         select
         d.delivery_state,d.stock_state,d.payment_terms,
         d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
@@ -194,8 +203,8 @@
     </select>
 
 
-    <select id="getseletShippingOrderDetaildeliverys" >
-        select customer_id,customer_name,project,salesman,salesman_id from sd.`order`
+    <select id="getSelectShippingOrderDetailDeliverys" >
+        select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
         <where>
             <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
                 and order_id regexp #{orderDetail.orderId}
@@ -205,7 +214,7 @@
         limit 0,1
     </select>
 
-    <select id="getseletShippingOrder">
+    <select id="getSelectShippingOrder">
         select * from sd.delivery d
         <where>
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
@@ -245,9 +254,10 @@
         limit #{offset},#{pageSize};
     </select>
 
-    <select id="getseletShippingOrderPageTotal">
+    <select id="getSelectShippingOrderPageTotal">
         select
-            CEILING(count(id)/#{pageSize})
+            CEILING(count(id)/#{pageSize}) as 'pageTotal',
+            count(id) as 'total'
         from sd.delivery d
         <where>
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}

--
Gitblit v1.8.0