From 53df0151e8f2363d4a110a5f9d6dcbc4229e4f7f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 四月 2024 09:26:50 +0800
Subject: [PATCH] 整合文件
---
/dev/null | 103 ---------------------------------------------------
1 files changed, 0 insertions(+), 103 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
deleted file mode 100644
index 43b3c62..0000000
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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.ReportMapper">
- <resultMap id="flowCardMap" type="com.example.erp.entity.pp.FlowCard">
- <result column="order_id" property="orderId"/>
- <result column="process_Id" property="processId"/>
- <result column="quantity" property="quantity"/>
- <result column="founder" property="founder"/>
- <result column="create_time" property="createTime"/>
- <result column="layout_status" property="layoutStatus"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="project" property="project"/>
- <result column="order_id" property="orderId"/>
- <result column="customer_name" property="customerName"/>
- <result column="batch" property="batch"/>
- <result column="other_remarks" property="otherRemarks"/>
- <result column="icon" property="icon"/>
- <result column="order_type" property="orderType"/>
- <result column="salesman" property="salesman"/>
- <result column="processing_note" property="processingNote"/>
- <result column="delivery_address" property="deliveryAddress"/>
- </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_gross_area" property="computeGrossArea"/>
- <result column="processing_note" property="processingNote"/>
- <result column="quantity" property="quantity"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="perimeter" property="perimeter"/>
- <result column="order_number" property="orderNumber"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="shape" property="shape"/>
- <result column="weight" property="weight"/>
- </association>
- <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
- <result column="production_id" property="productionId"/>
- </association>
- <association property="product" javaType="com.example.erp.entity.sd.Product">
- <result column="total_thickness" property="totalThickness"/>
- <result column="thickness" property="thickness"/>
- </association>
-
- <!--<result column="g_typeId" property="glassTypes.typeId"/>
- <result column="g_type" property="glassTypes.type"/>-->
-
- </resultMap>
-
-<!-- 娴佺▼鍗¤繘搴�-->
- <select id="processCardProgressMp">
- select
- a.product_name,
- b.glass_child,
- d.order_type,
- concat(c.process_id,'/',c.technology_number) as process_id,
- c.technology_number,
- c.quantity,
- e.reportWorkQuantity,
- e.reportWorkQuantityCount,
- e.broken_num,
- round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
- from
- flow_card as c
- left join
- sd.order_detail as a
- on c.order_id = a.order_id
- and c.order_number = a.order_number
- left join sd.order_glass_detail as b
- on c.order_id = b.order_id
- and b.order_number = c.order_number
- and c.technology_number = b.technology_number
- left join sd.`order` as d
- on c.order_id = d.order_id
- left join mm.finished_goods_inventory as f
- on c.order_id = f.order_id and f.order_number = c.order_number
- left join (
- SELECT process_id,
- technology_number,
- sum(a.broken_num) as broken_num,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num,"\"")),
- '}'
- ) as reportWorkQuantity,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num_count,"\"")),
- '}'
- ) as reportWorkQuantityCount
- FROM sd.order_process_detail as a
- where a.order_id=#{orderId}
- GROUP BY process_id,a.technology_number
- ) as e
- on e.process_id = c.process_id
- and e.technology_number = c.technology_number
-
- where a.order_id = #{orderId}
-
- </select>
-</mapper>
\ No newline at end of file
--
Gitblit v1.8.0