From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 456 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
new file mode 100644
index 0000000..029c7ca
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.sd.OrderMapper">
+
+ <select id="selectOrder">
+ select
+ *
+ from
+ sd.`order` as o
+ where
+ o.quantity=#{order.quantity} and o.area=#{order.area} and trim(o.project)=trim(#{order.project}) and o.customer_id=#{order.customerId}
+ </select>
+
+ <select id="selectMaxOrderId">
+ select
+ ifnull(SUBSTR(max(right(order_id,8)) from 7),0)
+ from
+ `order` as a
+ where
+ date(a.create_time) = curdate()
+ /*order by order_id desc,order_id desc limit 1*/
+ </select>
+
+ <select id="selectMaxOrderIdByMonth">
+ select
+ ifnull(SUBSTR(max(right(order_id,8)) from 5),0)
+ from
+ `order` as a
+ where
+ date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
+ </select>
+
+ <select id="selectMaxOrderIdByYear">
+ select
+ ifnull(SUBSTR(max(right(order_id,8)) from 3),0)
+ from
+ `order` as a
+ where
+ year(a.create_time) = year(now())
+ </select>
+
+ <select id="selectOrderIdMin">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)>#{substringInt}
+ </select>
+
+ <select id="selectOrderIdIs">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)=#{substringInt}
+ </select>
+
+ <select id="selectOrderIdDay">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},9,2)=01
+ </select>
+
+ <select id="selectOrderIdMonth">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},7,4)=0001
+ </select>
+
+ <select id="selectOrderIdYear">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
+ </select>
+
+ <select id="selectOrderId">
+ select * from sd.`order` where order_id=#{orderId}
+ </select>
+
+ <update id="updateOrderId">
+ update sd.`order` set order_id=#{newOrderId} where order_id=#{oldOrderId}
+ </update>
+
+ <update id="updateOrderParameter">
+ update `order` o
+ left join
+ (select a.order_id,
+ round(sum(a.perimeter),2) as aa,
+ sum(a.quantity) as b,
+ sum(a.compute_gross_area) as c,
+ sum(a.gross_amount) as 'detailAmount'
+ from sd.order_detail as a group by a.order_id
+ ) as od
+ on o.order_id = od.order_id
+ left join (select oom.order_id,
+ sum(oom.money) as 'money'
+ from order_other_money as oom
+ where
+ oom.order_id = #{orderId}
+ group by oom.order_id
+ ) as c
+ on c.order_id = o.order_id
+ set
+ o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
+ o.quantity = od.b,
+ o.area = od.c,
+ o.perimeter= od.aa,
+ o.other_money = ifnull(c.money,0),
+ o.other_remarks = (select GROUP_CONCAT(DISTINCT edging_type)
+ from order_detail where order_id = #{orderId} and edging_type is not null)
+ where
+ o.order_id = #{orderId}
+
+ </update>
+
+ <select id="getOrderList">
+ select * from (select
+ o.*,
+ ifnull(sum(fgi.quantity_available),0) as goodsQuantity,
+ if(DATEDIFF(o.delivery_date, CURDATE()) < 3 and o.delivery < 2, 'timeOut','' ) as timeOut
+ from
+ sd.`order` as o
+ left join mm.finished_goods_inventory as fgi
+ on o.order_id = fgi.order_id
+ where date(o.create_time) between #{startDate} and #{endDate}
+
+ <if test="orderType!= null and orderType != ''">
+ and o.create_order = #{orderType}
+ </if>
+
+ <if test="order.orderId != null and order.orderId != ''">
+ and o.order_id REGEXP #{order.orderId}
+ </if>
+
+ <if test="order.customerId != null and order.customerId != ''">
+ and o.customer_id REGEXP #{order.customerId}
+ </if>
+ <if test="order.customerName != null and order.customerName != ''">
+ and o.customer_name REGEXP #{order.customerName}
+ </if>
+ <if test="order.project != null and order.project != ''">
+ and o.project REGEXP #{order.project}
+ </if>
+ <if test="order.batch != null and order.batch != ''">
+ and o.batch REGEXP #{order.batch}
+ </if>
+ <if test="order.quantity != null and order.quantity != ''">
+ and o.quantity REGEXP #{order.quantity}
+ </if>
+
+ <if test="order.area != null and order.area != ''">
+ and o.area REGEXP REGEXP_REPLACE(#{order.area}, '\\.0+$', '')
+ </if>
+ <if test="order.createTime != null and order.createTime != ''">
+ and date(o.create_time) = #{order.createTime}
+ </if>
+ <if test="order.packType != null and order.packType != ''">
+ and o.pack_type REGEXP #{order.packType}
+ </if>
+ <if test="order.orderType != null and order.orderType != ''">
+ and o.order_type REGEXP #{order.orderType}
+ </if>
+ <if test="order.salesman != null and order.salesman != ''">
+ and o.salesman REGEXP #{order.salesman}
+ </if>
+
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
+
+ <if test="order.perimeter != null and order.perimeter != ''">
+ and o.perimeter REGEXP #{order.perimeter}
+ </if>
+ <if test="order.deliveryDate != null and order.deliveryDate != ''">
+ and o.delivery_date REGEXP #{order.deliveryDate}
+ </if>
+ <if test="order.customerBatch != null and order.customerBatch != ''">
+ and o.customer_batch REGEXP #{order.customerBatch}
+ </if>
+ <if test="order.otherRemarks != null and order.otherRemarks != ''">
+ and o.other_remarks REGEXP #{order.otherRemarks}
+ </if>
+ <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
+ and o.delivery_address REGEXP #{order.deliveryAddress}
+ </if>
+ <if test="order.delivery != null ">
+ and o.delivery = #{order.delivery}
+ </if>
+ <if test="order.processReview != null ">
+ and o.process_review = #{order.processReview}
+ </if>
+ <if test="order.orderReview != null ">
+ and o.order_review = #{order.orderReview}
+ </if>
+ <if test="order.productionOrder != null ">
+ and o.production_order = #{order.productionOrder}
+ </if>
+ <if test="order.processingCard != null ">
+ and o.processing_card = #{order.processingCard}
+ </if>
+ <if test="order.warehousing != null ">
+ and o.warehousing = #{order.warehousing}
+ </if>
+ <if test="order.processingNote != null and order.processingNote != ''">
+ and o.processing_note REGEXP #{order.processingNote}
+ </if>
+ group by o.id
+ ) as acc
+ order by
+ <if test="orderBy == null ">
+ order_id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ ${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ ${field}
+ </if>
+ limit #{offset},#{pageSize}
+ </select>
+
+ <select id="getPageTotal">
+ select
+ CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
+ count(o.id) as 'dataTotal',
+ sum(o.quantity) as quantity,
+ sum(o.area) as area,
+ sum(o.money) as money,
+ ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
+ ROUND(sum(perimeter),2) as perimeter,
+ #{pageSize} as pageSize
+ from
+ `order` as o
+ left join(
+ select order_id,
+ ifnull(sum(quantity_available),0) as goodsQuantity
+ from mm.finished_goods_inventory group by order_id
+ ) as fgi
+ on o.order_id = fgi.order_id
+ where date (o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
+ <if test="orderType!= null and orderType != 0">
+ and o.create_order = #{orderType}
+ </if>
+
+ <if test="order.orderId != null and order.orderId != ''">
+ and o.order_id REGEXP #{order.orderId}
+ </if>
+
+ <if test="order.customerId != null and order.customerId != ''">
+ and o.customer_id REGEXP #{order.customerId}
+ </if>
+ <if test="order.customerName != null and order.customerName != ''">
+ and o.customer_name REGEXP #{order.customerName}
+ </if>
+ <if test="order.project != null and order.project != ''">
+ and o.project REGEXP #{order.project}
+ </if>
+ <if test="order.batch != null and order.batch != ''">
+ and o.batch REGEXP #{order.batch}
+ </if>
+ <if test="order.quantity != null and order.quantity != ''">
+ and o.quantity REGEXP #{order.quantity}
+ </if>
+
+ <if test="order.area != null and order.area != ''">
+ and o.area REGEXP #{order.area}
+ </if>
+ <if test="order.createTime != null and order.createTime != ''">
+ and date(o.create_time) = #{order.createTime}
+ </if>
+ <if test="order.packType != null and order.packType != ''">
+ and o.pack_type REGEXP #{order.packType}
+ </if>
+ <if test="order.orderType != null and order.orderType != ''">
+ and o.order_type REGEXP #{order.orderType}
+ </if>
+ <if test="order.salesman != null and order.salesman != ''">
+ and o.salesman REGEXP #{order.salesman}
+ </if>
+
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
+
+ <if test="order.perimeter != null and order.perimeter != ''">
+ and o.perimeter REGEXP #{order.perimeter}
+ </if>
+ <if test="order.deliveryDate != null and order.deliveryDate != ''">
+ and o.delivery_date REGEXP #{order.deliveryDate}
+ </if>
+ <if test="order.customerBatch != null and order.customerBatch != ''">
+ and o.customer_batch REGEXP #{order.customerBatch}
+ </if>
+ <if test="order.otherRemarks != null and order.otherRemarks != ''">
+ and o.other_remarks REGEXP #{order.otherRemarks}
+ </if>
+ <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
+ and o.delivery_address REGEXP #{order.deliveryAddress}
+ </if>
+ <if test="order.delivery != null ">
+ and o.delivery = #{order.delivery}
+ </if>
+ <if test="order.processReview != null ">
+ and o.process_review = #{order.processReview}
+ </if>
+ <if test="order.orderReview != null ">
+ and o.order_review = #{order.orderReview}
+ </if>
+ <if test="order.productionOrder != null ">
+ and o.production_order = #{order.productionOrder}
+ </if>
+ <if test="order.processingCard != null ">
+ and o.processing_card = #{order.processingCard}
+ </if>
+ <if test="order.warehousing != null ">
+ and o.warehousing = #{order.warehousing}
+ </if>
+ <if test="order.processingNote != null and order.processingNote != ''">
+ and o.processing_note REGEXP #{order.processingNote}
+ </if>
+ order by o.id desc
+ </select>
+
+ <update id="reviewOrderById">
+ update `order` set order_review = #{status},
+ verifier_id = #{userId},
+ verifier = #{userName},
+ update_time=now()
+ where order_id = #{id}
+ </update>
+ <update id="reviewOrderByIds">
+ update `order` set order_review = #{status},process_review = #{status},
+ verifier_id = null,
+ verifier = null
+ where order_id = #{id}
+ </update>
+
+ <update id="backReviewOrderById">
+ update `order` set order_review = 0,
+ verifier_id = null,
+ verifier = null
+ where order_id = #{id}
+ </update>
+
+ <update id="reviewProcessById">
+ update `order` set process_review = #{status} where order_id = #{id}
+ </update>
+
+ <update id="updateMoney">
+ update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
+ </update>
+
+ <update id="cancelOrder">
+ update `order` as a set
+ a.create_order = - a.create_order,
+ a.process_review = - a.process_review,
+ a.order_review = - a.order_review,
+ a.production_order = - a.production_order,
+ a.processing_card = - a.processing_card,
+ a.warehousing = - a.warehousing,
+ a.delivery = - a.delivery
+ where order_id = #{order.orderId}
+ </update>
+
+ <update id="updateOrderPrintNumber">
+ update sd.`order` o
+ set o.printing_number=o.printing_number+1
+ where
+ o.order_id = #{orderId}
+
+ </update>
+
+ <select id="selectDifferentSize">
+ select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
+ from sd.order_glass_detail ogd
+ where ogd.order_id = #{orderId}
+ group by ogd.order_number,ogd.child_height,child_width)
+ as a
+ group by a.order_number
+ having count(a.order_number) > 1
+ </select>
+
+ <select id="searchOrderWarehousing">
+ select warehousing from `order`
+ where order_id = #{orderId}
+ </select>
+
+ <select id="getProcessIdByOptimizeHeatDetail">
+ select process_id from pp.optimize_heat_detail as a
+ where a.project_no = #{projectId}
+ and a.layout_id = #{layoutId}
+ and a.sort = #{sort}
+ </select>
+
+ <select id="scannerGlassInfo">
+ select c.order_id as orderId,
+ b.order_number as orderNumber,
+ b.technology_number as technologyNumber,
+ a.process_id as processId,
+ c.customer_name as customerName,
+ concat(a.width," * " , a.height) as size,
+ b.area,
+ b.glass_child as glassChild,
+ d.product_name as productName,
+ d.building_number as buildingNumber,
+ d.remarks as remarks,
+ d.processing_note as processingNote
+ from pp.optimize_heat_detail as a
+ left join sd.order_glass_detail as b
+ on b.order_number = a.order_sort
+ and b.technology_number = a. layer
+ and b.order_id = #{orderId}
+ left join sd.order as c
+ on c.order_id = b.order_id
+ left join sd.order_detail as d
+ on c.order_id = d.order_id
+ and d.order_number = a.order_sort
+ where a.project_no = #{projectNo}
+ and a.layout_id = #{layoutId}
+ and a.sort = #{sort}
+ </select>
+
+
+ <insert id="saveOrderFile">
+ insert into sd.order_file (order_id,order_number,file_name,file_data,file_json,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},#{fileJson},now())
+ </insert>
+
+ <select id="selectOrderFile">
+ select * from sd.order_file
+ where order_id = #{orderId} and order_number = #{orderNumber}
+
+ </select>
+
+ <select id="selectOrderFileList">
+ select * from sd.order_file
+ where order_id = #{orderId}
+
+ </select>
+
+ <update id="updateOrderFile">
+ update sd.order_file set file_name=#{fileName},file_data=#{dxfData},file_json=#{fileJson},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
+ </update>
+
+
+ <select id="selectProcessAttributeConfigOne">
+ select * from sd.process_attribute_config
+ where level=1
+
+ </select>
+
+ <select id="selectProcessAttributeConfigTow">
+ select * from sd.process_attribute_config
+ where level=2 and belong=#{belong}
+
+ </select>
+
+ <select id="selectDeliveryStateConut">
+ select count(*) from sd.delivery_detail dd left join sd.delivery d on dd.delivery_id=d.delivery_id where dd.order_id= #{orderId} and d.delivery_state=0
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0