From dbec8a881baf27254a13f1f9c7b0167b9f064ab5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 15 三月 2024 15:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/WordOrder.xml | 181 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 181 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/WordOrder.xml b/north-glass-erp/target/classes/mapper/pp/WordOrder.xml
new file mode 100644
index 0000000..471389d
--- /dev/null
+++ b/north-glass-erp/target/classes/mapper/pp/WordOrder.xml
@@ -0,0 +1,181 @@
+<?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.pp.WorkOrderMapper">
+ <resultMap id="wordOrderMap" type="com.example.erp.entity.sd.OrderGlassDetail">
+
+ <result column="order_id" property="orderId"/>
+ <result column="production_id" property="productionId"/>
+ <result column="splitting_status" property="splittingStatus"/>
+ <result column="create_time" property="createTime"/>
+ <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="batch" property="batch"/>
+ </association>
+ <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
+ <result column="product_id" property="productId"/>
+ <result column="product_name" property="productName"/>
+ <result column="compute_area" property="computeArea"/>
+ <result column="quantity" property="quantity"/>
+ <result column="compute_gross_area" property="computeGrossArea"/>
+ <result column="perimeter" property="perimeter"/>
+ <result column="bend_radius" property="bendRadius"/>
+ <result column="processing_note" property="processingNote"/>
+ </association>
+
+ <!--<result column="g_typeId" property="glassTypes.typeId"/>
+ <result column="g_type" property="glassTypes.type"/>-->
+
+ </resultMap>
+ <select id="selectWordOrder" resultMap="wordOrderMap">
+ select
+ o.order_id,
+ ogd.production_id,
+ o.batch,
+ od.product_name,
+ od.compute_area,
+ od.quantity,
+ od.compute_gross_area,
+ od.perimeter,
+ od.bend_radius,
+ od.processing_note
+
+ from `order` as o left join order_detail as od on o.order_id=od.order_id
+ left join order_glass_detail as ogd on o.order_id=ogd.order_id and ogd.order_number=od.order_number
+ where isnull(ogd.production_id) and o.order_review=2 and o.production_order!=2
+ <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
+ and o.order_id regexp #{orderGlassDetail.orderId}
+ </if>
+ <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
+ and ogd.production_id regexp #{orderGlassDetail.productionId}
+ </if>
+ <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
+ and o.batch regexp #{orderGlassDetail.order.batch}
+ </if>
+ <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
+ and od.product_name regexp #{orderGlassDetail.orderDetail.productName}
+ </if>
+
+ <if test="orderGlassDetail.createTime != ''">
+ and DATE_FORMAT((ogd.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+ </if>
+
+ group by o.order_id
+ order by o.id desc
+
+
+ ;
+ </select>
+
+ <select id="selectWordOrderNo" resultMap="wordOrderMap">
+ select
+ o.order_id,
+ ogd.production_id,
+ o.batch,
+ od.product_name,
+ od.compute_area,
+ od.quantity,
+ od.compute_gross_area,
+ od.perimeter,
+ od.bend_radius,
+ od.processing_note
+
+ from `order` as o left join order_detail as od on o.order_id=od.order_id
+ left join order_glass_detail as ogd on o.order_id=ogd.order_id and ogd.order_number=od.order_number
+ where ogd.production_id IS NOT NULL
+ <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
+ and ogd.order_id regexp #{orderGlassDetail.orderId}
+ </if>
+ <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
+ and ogd.production_id regexp #{orderGlassDetail.productionId}
+ </if>
+ <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
+ and o.batch regexp #{orderGlassDetail.order.batch}
+ </if>
+ <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
+ and od.product_name regexp #{orderGlassDetail.orderDetail.productName}
+ </if>
+
+ <if test="orderGlassDetail.createTime != ''">
+ and DATE_FORMAT((ogd.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+ </if>
+
+ group by ogd.production_id,ogd.order_number
+ order by ogd.id desc
+
+
+ ;
+ </select>
+
+ <select id="addWordOrder" >
+ select od.order_id,
+ od.product_id,
+ od.product_name,
+ sum( od.quantity) as quantity,
+ od.compute_gross_area,
+ od.perimeter
+ from sd.order_detail as od
+ left join sd.order as o
+ on od.order_id =o.order_id
+ where od.order_id = #{orderId} and o.production_order!=2
+ <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+ and od.order_id regexp #{orderDetail.orderId}
+ </if>
+ <if test="orderDetail.productId != null and orderDetail.productId != ''">
+ and od.product_id regexp #{orderDetail.productId}
+ </if>
+ <if test="orderDetail.productName != null and orderDetail.productName != ''">
+ and od.product_name regexp #{orderDetail.productName}
+ </if>
+ group by od.order_id, od.product_id, od.product_name
+ ;
+ </select>
+
+ <select id="selectOrderNumber" >
+ select ifnull(count(ogd.production_id),0)
+ from sd.order_glass_detail as ogd
+ where ogd.production_id = #{productIdVl}
+ </select>
+
+ <update id="addOrderWorkMp" >
+ update sd.order_detail as od left join sd.order_glass_detail as ogd
+ on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+
+ set ogd.production_id=#{productIdVl},
+ ogd.production_time=NOW(),
+ ogd.founder=#{userName}
+
+ where od.order_id = #{orderId}
+ and od.product_id =#{productId}
+ and od.product_name = #{productName}
+ </update>
+
+<!-- 鍒犻櫎宸ュ崟-->
+ <update id="deleteOrderWorkMp">
+ update sd.order_detail as od left join sd.order_glass_detail as ogd
+ on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ set ogd.production_id=null,
+ ogd.production_time=null,
+ ogd.founder=null
+ where od.order_id = #{orderId}
+ and od.product_name = #{productName}
+ </update>
+
+ <select id="selectWorkCount">
+ select COUNT(distinct order_number)
+ from order_glass_detail
+ where ISNULL(production_id)
+ and order_id = #{orderId}
+ </select>
+
+ <select id="selectYesWorkCount">
+ select COUNT(distinct order_number)
+ from order_glass_detail
+ where order_id = #{orderId}
+ </select>
+
+ <update id="updateWorkType">
+ update sd.order as o set o.production_order=#{state} where o.order_id=#{orderId}
+ </update>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0