From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 155 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
new file mode 100644
index 0000000..037e499
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -0,0 +1,155 @@
+<?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
+ a.order_id,
+ a.production_id,
+ c.batch,
+ b.product_name,
+ b.compute_area,
+ b.quantity,
+ b.compute_gross_area,
+ b.perimeter,
+ b.bend_radius,
+ b.processing_note
+ from order_glass_detail as a
+ LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
+ `order` as c on a.order_id=c.order_id
+ where isnull(a.production_id)
+ <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
+ and a.order_id regexp #{orderGlassDetail.orderId}
+ </if>
+ <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
+ and a.production_id regexp #{orderGlassDetail.productionId}
+ </if>
+ <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
+ and c.batch regexp #{orderGlassDetail.order.batch}
+ </if>
+ <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
+ and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
+ </if>
+
+ <if test="orderGlassDetail.createTime != ''">
+ and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+ </if>
+
+ group by a.production_id,a.order_number
+ order by a.id desc
+
+
+ ;
+ </select>
+
+ <select id="selectWordOrderNo" resultMap="wordOrderMap">
+ select
+ a.order_id,
+ a.production_id,
+ c.batch,
+ b.product_name,
+ b.compute_area,
+ b.quantity,
+ b.compute_gross_area,
+ b.perimeter,
+ b.bend_radius,
+ b.processing_note
+ from order_glass_detail as a
+ LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
+ `order` as c on a.order_id=c.order_id
+ where a.production_id IS NOT NULL
+ <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
+ and a.order_id regexp #{orderGlassDetail.orderId}
+ </if>
+ <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
+ and a.production_id regexp #{orderGlassDetail.productionId}
+ </if>
+ <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
+ and c.batch regexp #{orderGlassDetail.order.batch}
+ </if>
+ <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
+ and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
+ </if>
+
+ <if test="orderGlassDetail.createTime != ''">
+ and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+ </if>
+
+ group by a.production_id,a.order_number
+ order by a.id desc
+
+
+ ;
+ </select>
+
+ <select id="addWordOrder">
+ select od.order_id,
+ od.product_id,
+ od.product_name,
+ od.quantity,
+ od.compute_gross_area,
+ od.perimeter
+ from 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
+ where od.order_id = #{orderId}
+ and ISNULL(ogd.production_id)
+ group by od.order_id, od.product_id, od.product_name
+ ;
+ </select>
+
+ <select id="SelectOrderNumber">
+ select count(ogd.production_id)
+ 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>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0