From f0d2b70d4f7ad47f01579e913b728ded8ff9c28f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 13 五月 2024 10:52:32 +0800
Subject: [PATCH] 删除target文件夹
---
/dev/null | 5 -----
north-glass-erp/src/main/resources/application.yml | 8 ++++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index 5441601..8c37623 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -11,22 +11,22 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
+ url: jdbc:mysql://localhost:3306/erp_user_info?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
+ url: jdbc:mysql://localhost:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
mm:
- url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
+ url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/north-glass-erp/target/classes/application.yml b/north-glass-erp/target/classes/application.yml
deleted file mode 100644
index 5441601..0000000
--- a/north-glass-erp/target/classes/application.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-server:
- port: 8086
-
-
-
-spring:
- datasource:
- dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- mm:
- url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
-#mybatis-plus:
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml b/north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml
deleted file mode 100644
index f1ddbd1..0000000
--- a/north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml
+++ /dev/null
@@ -1,46 +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.mm.BasicWarehouseTypeMapper">
-
- <select id="getBasicWarehouseTypeTakeOut" >
- select * from mm.basic_warehouse_type where type='棰嗗嚭';
- </select>
-
- <select id="getBasicWarehouseTypeRework" >
- select * from mm.basic_warehouse_type where type='杩斿伐';
- </select>
-
- <select id="getBasicWarehouseType" >
- select * from mm.basic_warehouse_type where type regexp #{type} group by operate_type_name;
- </select>
-
- <select id="getBasicWarehouse" >
- select operate_type from mm.basic_warehouse_type where type regexp #{type};
- </select>
-
- <select id="getBasicWarehouseTypeAll" >
- select * from mm.basic_warehouse_type where type!='鍘熺墖' and type!='杈呮枡' order by id desc;
- </select>
-
- <insert id="insertBasicWarehouse" useGeneratedKeys="true" >
- insert into mm.basic_warehouse_type (operate_type_name, operate_type, type, create_time
- )
- values (
- #{operateTypeName} ,#{operateType},#{type},now()
- )
- </insert>
-
- <delete id="deleteBasicWarehouse" >
- delete from mm.basic_warehouse_type where id=#{id}
- </delete>
-
- <update id="updateBasicWarehouse" >
- update mm.basic_warehouse_type set operate_type_name=#{operateTypeName},create_time=now() where id=#{id}
- </update>
-
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
deleted file mode 100644
index 7448fbc..0000000
--- a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
+++ /dev/null
@@ -1,840 +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.mm.FinishedGoodsInventoryMapper">
- <!--鏄犲皠鎴愬搧搴撳瓨-->
- <resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">
- <id column="fid" property="id"/>
- <result column="inventory" property="inventory"/>
- <result column="area" property="area"/>
- <result column="actual_signal_area" property="actualSignalArea"/>
- <result column="quantity_available" property="quantityAvailable"/>
- <result column="warehouse_number" property="warehouseNumber"/>
- <result column="storage_region" property="storageRegion"/>
- <result column="status" property="status"/>
- <result column="enter_storage_time" property="enterStorageTime"/>
- <result column="remark" property="remark"/>
- <result column="update_time" property="updateTime"/>
- <result column="end_time" property="endTime"/>
-
- <result column="order_id" property="order.orderId"/>
- <result column="project" property="order.project"/>
- <result column="order_type" property="order.orderType"/>
-
-
- <result column="order_number" property="orderDetail.orderNumber"/>
- <result column="width" property="orderDetail.width"/>
- <result column="height" property="orderDetail.height"/>
- <result column="product_name" property="orderDetail.productName"/>
- <result column="product_id" property="orderDetail.productId"/>
-
- </resultMap>
- <!--鏄犲皠鎴愬搧鍏ュ簱-->
- <resultMap id="selectFlowCard" type="com.example.erp.entity.pp.FlowCard">
- <id column="id" property="id"/>
- <result column="order_number" property="orderNumber"/>
- <result column="inventory_quantity" property="inventoryQuantity"/>
- <result column="process_id" property="processId"/>
- <result column="received_quantity" property="receivedQuantity"/>
-
-
- <result column="order_id" property="order.orderId"/>
- <result column="project" property="order.project"/>
- <result column="creator" property="order.creator"/>
- <result column="area" property="order.area"/>
- <result column="batch" property="order.batch"/>
- <result column="order_quantity" property="order.quantity"/>
-
- <result column="building_number" property="orderDetail.buildingNumber"/>
- <result column="width" property="orderDetail.width"/>
- <result column="height" property="orderDetail.height"/>
- <result column="product_name" property="orderDetail.productName"/>
- <result column="product_id" property="orderDetail.productId"/>
- <result column="quantity" property="orderDetail.quantity"/>
- </resultMap>
-
- <!--鏄犲皠鎴愬搧鍑哄簱-->
- <resultMap id="selectDelivery" type="com.example.erp.entity.sd.OrderDetail">
- <id column="id" property="id"/>
- <result column="building_number" property="buildingNumber"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="product_name" property="productName"/>
- <result column="product_id" property="productId"/>
- <result column="warehouse_num" property="warehouseNum"/>
- <result column="delivery_num" property="deliveryNum"/>
-
- <result column="order_number" property="deliveryDetail.orderNumber"/>
- <result column="delivery_id" property="deliveryDetail.deliveryId"/>
- <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
- <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
- <result column="order_id" property="deliveryDetail.orderId"/>
- <result column="create_time" property="deliveryDetail.createTime"/>
- <result column="dd_quantity" property="deliveryDetail.quantity"/>
-
- <result column="project" property="order.project"/>
-
- <result column="creator" property="delivery.creator"/>
- <result column="customer_name" property="delivery.customerName"/>
- <result column="d_quantity" property="delivery.quantity"/>
- <result column="area" property="delivery.area"/>
-
-
- </resultMap>
-
- <!--鏄犲皠璁㈠崟璋冩嫧-->
- <resultMap id="selectDeliveryFinishedGoodsInventory" type="com.example.erp.entity.sd.OrderDetail">
-
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="product_name" property="productName"/>
- <result column="product_id" property="productId"/>
-
- <result column="order_id" property="finishedGoodsInventory.orderId"/>
- <result column="order_number" property="finishedGoodsInventory.orderNumber"/>
- <result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
- <result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
- <result column="area" property="finishedGoodsInventory.area"/>
- <result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
-
- <result column="project" property="order.project"/>
- <result column="customer_id" property="order.customerId"/>
- <result column="customer_name" property="order.customerName"/>
-
-
- </resultMap>
- <update id="updateInventoryquantityAllocateInt">
- update mm.finished_goods_inventory
- set inventory=inventory+#{quantity},quantity_available=quantity_available+#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateInventoryquantityAllocateOut">
- update mm.finished_goods_inventory
- set inventory=inventory-#{quantity},quantity_available=quantity_available-#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateInventoryquantityInt">
- update mm.finished_goods_inventory
- set quantity_available=quantity_available+#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateInventoryquantityOut">
- update mm.finished_goods_inventory
- set quantity_available=quantity_available-#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateInventoryInventoryInt">
- update mm.finished_goods_inventory
- set inventory=inventory+#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateInventoryInventoryOut">
- update mm.finished_goods_inventory
- set inventory=inventory-#{quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
- select fgi.order_id,
- o.project,
- fgi.order_number,
- fgi.quantity_available,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- o.customer_id,
- o.customer_name,
- fgi.actual_signal_area,
- fgi.area,
- fgi.storage_region
- from mm.finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
- left join sd.`order` o on fgi.order_id = o.order_id
- <where>
- and fgi.status = 0 and fgi.quantity_available>0
- <if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
- and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </if>
- <if test="orderDetail.finishedGoodsInventory.orderNumber != null and orderDetail.finishedGoodsInventory.orderNumber != ''">
- and fgi.order_number regexp #{orderDetail.finishedGoodsInventory.orderNumber}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </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>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and o.customer_id regexp #{orderDetail.order.customerId}
- </if>
- <if test="orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
- and o.customer_name regexp #{orderDetail.order.customerName}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">
- and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- </where>
- group by fgi.order_id, fgi.order_number
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectAllocatePageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
- count(zu.order_number) as 'total' from
- (select fgi.order_number as order_number
- from mm.finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
- left join sd.`order` o on fgi.order_id = o.order_id
- <where>
- and fgi.quantity_available>0
- <if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
- and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </if>
- <if test="orderDetail.finishedGoodsInventory.orderNumber != null and orderDetail.finishedGoodsInventory.orderNumber != ''">
- and fgi.order_number regexp #{orderDetail.finishedGoodsInventory.orderNumber}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </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>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and o.customer_id regexp #{orderDetail.order.customerId}
- </if>
- <if test="orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
- and o.customer_name regexp #{orderDetail.order.customerName}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.area != null and orderDetail.finishedGoodsInventory.area != ''">
- and fgi.area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.area},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- </where>
- group by fgi.order_id, fgi.order_number) as zu
-
- limit #{offset},#{pageSize};
- </select>
-
- <update id="updateDeliveryDetailState">
- update sd.delivery_detail
- set delivery_detail_state=#{state}
- where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
- </update>
-
- <update id="updateInventoryquantityavailable">
- update mm.finished_goods_inventory
- set inventory=0,quantity_available=0,
- update_time=now(),area=0,status=1
- where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
- </update>
-
-
- <select id="getSelectDeliveryDetailPageTotal" >
- select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
- count(dd.id) as 'total'
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id = d.delivery_id
- left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
- left join sd.`order` o on o.order_id = dd.order_id
- <where>
- and dd.delivery_detail_state=1
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
- </if>
- <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
- and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </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>
- <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
- and d.customer_name regexp #{orderDetail.delivery.customerName}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
- and d.quantity regexp #{orderDetail.delivery.quantity}
- </if>
- <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
- and od.warehouse_num regexp #{orderDetail.warehouseNum}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </if>
- <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
- and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
- </if>
- <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
- and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
- </if>
- <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
- and d.creator regexp #{orderDetail.delivery.creator}
- </if>
- <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
- and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
- </if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
- </if>
- </where>
- order by dd.id desc
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectDeliveryDetail" resultMap="selectDelivery">
- select dd.delivery_id,
- dd.order_number,
- dd.order_id,
- o.project,
- od.product_id,
- od.product_name,
- d.customer_name,
- od.width,
- od.height,
- dd.quantity as dd_quantity,
- od.warehouse_num,
- od.delivery_num,
- d.area,
- od.building_number,
- d.creator,
- dd.delivery_detail_remakes,
- dd.create_time
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id = d.delivery_id
- left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
- left join sd.`order` o on o.order_id = dd.order_id
-
- <where>
- and dd.delivery_detail_state=1 and d.delivery_state=2
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
- </if>
- <if test="orderDetail.deliveryDetail.orderId != null and orderDetail.deliveryDetail.orderId != ''">
- and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </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>
- <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">
- and d.customer_name regexp #{orderDetail.delivery.customerName}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">
- and d.quantity regexp #{orderDetail.delivery.quantity}
- </if>
- <if test="orderDetail.warehouseNum != null and orderDetail.warehouseNum != ''">
- and od.warehouse_num regexp #{orderDetail.warehouseNum}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </if>
- <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">
- and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')
- </if>
- <if test="orderDetail.deliveryDetail.orderNumber != null and orderDetail.deliveryDetail.orderNumber != ''">
- and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}
- </if>
- <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">
- and d.creator regexp #{orderDetail.delivery.creator}
- </if>
- <if test="orderDetail.deliveryDetail.createTime != null and orderDetail.deliveryDetail.createTime != ''">
- and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}
- </if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
- </if>
- </where>
-
- order by dd.id desc
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="findOrderQuantity" >
- select quantity from sd.`order` where order_id=#{orderId}
- </select>
-
- <select id="findOrderNumberdsum" >
- select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
- </select>
-
- <select id="findOrderDeliveryQuantitySum" >
- select sum(delivery_num) from sd.order_detail where order_id=#{orderId}
- </select>
-
- <select id="findDeliveryQuantity" >
- select quantity from sd.`delivery` where delivery_id=#{deliveryId}
- </select>
-
- <select id="findDeliverydetailsum" >
- select sum(quantity) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
- </select>
-
- <update id="updateOrderWarehousingState">
- update sd.`order`
- set warehousing=#{state}
- where order_id=#{orderId}
- </update>
-
- <update id="updateOrderDeliveryState">
- update sd.`order`
- set delivery=#{state}
- where order_id=#{orderId}
- </update>
-
- <update id="updateDeliveryDeliveryState">
- update sd.`delivery`
- set stock_state=#{state}
- where delivery_id=#{deliveryId}
- </update>
-
-
- <update id="updateIntOrderNumberConut">
- update sd.order_detail
- set warehouse_num=warehouse_num+${quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateOutOrderNumberConut">
- update sd.order_detail
- set warehouse_num=warehouse_num-${quantity}
- where order_number=#{orderNumber} and order_id=#{orderId}
- </update>
-
- <update id="updateflowcard">
- update pp.flow_card
- set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
- where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
- </update>
-
- <update id="updateflowcardOut">
- update pp.flow_card
- set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()
- where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}
- </update>
-
- <update id="updateInventory">
- update mm.finished_goods_inventory
- set inventory=inventory+${flowCard.inventoryQuantity},quantity_available=quantity_available+${flowCard.inventoryQuantity},
- update_time=now(),area=actual_signal_area*quantity_available
- <if test="storageRegion != null and storageRegion != ''">
- , storage_region= #{storageRegion}
- </if>
- <if test="remark != null and remark != ''">
- , remark= #{remark}
- </if>
- where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
- </update>
-
- <update id="updateInventoryOut">
- update mm.finished_goods_inventory
- set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
- update_time=now(),area=actual_signal_area*quantity_available
- where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
- </update>
-
- <insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
- insert into mm.finished_goods_inventory (order_id,
- order_number,
- process_id,
- inventory,
- actual_signal_area,
- area,
- quantity_available,
- warehouse_number,
- storage_region,
- `status`,
- enter_storage_time,
- update_time,
- end_time,
- remark
- )
- values (
- #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
- ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
- #{flowCard.inventoryQuantity},null,#{storageRegion},
- 0,now(),now(),null,#{remark}
- )
- </insert>
-
- <select id="findOrderNumberdcount" >
- select count(*)
- from mm.`finished_goods_inventory`
- where order_number = #{orderNumber} and order_id=#{orderId};
-
- </select>
-
- <select id="finishedGoodsInventorybycount" >
- select quantity_available
- from mm.`finished_goods_inventory`
- where order_number = #{orderNumber} and order_id=#{orderId};
-
- </select>
-
-
- <select id="getSelectWarehousing" resultMap="selectFlowCard">
- select
- fc.id,
- o.order_id,
- od.building_number,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- o.creator,
- o.project,
- fc.order_number,
- od.quantity,
- fc.inventory_quantity-fc.received_quantity as inventory_quantity,
- o.area,
- fc.process_id,
- fc.received_quantity,
- o.batch
- from pp.flow_card fc left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
- o.order_id=fc.order_id
- <where>
- and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
- <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
- and o.order_id regexp #{flowCard.order.orderId}
- </if>
- <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
- and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
- <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
- </if>
- <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
- </if>
- <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
- and o.creator regexp #{flowCard.order.creator}
- </if>
- <if test="flowCard.order.project != null and flowCard.order.project != ''">
- and o.project regexp #{flowCard.order.project}
- </if>
- <if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
- and fc.order_number regexp #{flowCard.orderNumber}
- </if>
- <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
- and od.quantity regexp #{flowCard.orderDetail.quantity}
- </if>
- <if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
- and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
- </if>
- <if test="flowCard.order.area != null and flowCard.order.area != ''">
- and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
- </if>
- <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
- and o.batch regexp #{flowCard.order.batch}
- </if>
- <if test="flowCard.processId != null and flowCard.processId != ''">
- and fc.process_id regexp #{flowCard.processId}
- </if>
- <if test="flowCard.receivedQuantity != null and flowCard.receivedQuantity != ''">
- and fc.received_quantity regexp #{flowCard.receivedQuantity}
- </if>
-
- </where>
- group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time desc
- limit #{offset},#{pageSize};
- </select>
- <select id="getSelectWarehousingPageTotal" >
- select
- CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
- count(zu.order_number) as 'total' from (
- select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
- fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
- <where>
- and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
- <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
- and o.order_id regexp #{flowCard.order.orderId}
- </if>
- <if test="flowCard.orderDetail.buildingNumber != null and flowCard.orderDetail.buildingNumber != ''">
- and od.building_number regexp #{flowCard.orderDetail.buildingNumber}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
- <if test="flowCard.orderDetail.width != null and flowCard.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{flowCard.orderDetail.width},'\\.0+$','')
- </if>
- <if test="flowCard.orderDetail.height != null and flowCard.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{flowCard.orderDetail.height},'\\.0+$','')
- </if>
- <if test="flowCard.order.creator != null and flowCard.order.creator != ''">
- and o.creator regexp #{flowCard.order.creator}
- </if>
- <if test="flowCard.order.project != null and flowCard.order.project != ''">
- and o.project regexp #{flowCard.order.project}
- </if>
- <if test="flowCard.orderNumber != null and flowCard.orderNumber != ''">
- and fc.order_number regexp #{flowCard.orderNumber}
- </if>
- <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">
- and od.quantity regexp #{flowCard.orderDetail.quantity}
- </if>
- <if test="flowCard.inventoryQuantity != null and flowCard.inventoryQuantity != ''">
- and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}
- </if>
- <if test="flowCard.order.area != null and flowCard.order.area != ''">
- and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')
- </if>
- <if test="flowCard.order.batch != null and flowCard.order.batch != ''">
- and o.batch regexp #{flowCard.order.batch}
- </if>
- <if test="flowCard.processId != null and flowCard.processId != ''">
- and fc.process_id regexp #{flowCard.processId}
- </if>
- <if test="flowCard.receivedQuantity != null and flowCard.receivedQuantity != ''">
- and fc.received_quantity regexp #{flowCard.receivedQuantity}
- </if>
-
- </where>
- group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time) as zu
- </select>
-
-
- <select id="defaultfinishedGoods" resultMap="selectFinishedGoodsInventory">
- select od.order_number,
- o.order_id,
- o.project,
- o.order_type,
- od.product_name,
- od.product_id,
- od.width,
- od.height,
- fgi.inventory,
- fgi.quantity_available,
- fgi.actual_signal_area,
- fgi.area,
- fgi.warehouse_number,
- fgi.storage_region,
- fgi.`status`,
- fgi.update_time,
- fgi.enter_storage_time,
- fgi.end_time,
- fgi.remark
- from finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
- left join sd.`order` o on fgi.order_id = o.order_id
- <where>
- and fgi.status = 0 and fgi.quantity_available>0
- <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width regexp #{finishedGoodsInventory.orderDetail.width}
- </if>
- <if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
- and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
- </if>
- <if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
- </if>
- <if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
- </if>
- <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id regexp #{finishedGoodsInventory.order.orderId}
- </if>
- <if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
- and o.project regexp #{finishedGoodsInventory.order.project}
- </if>
- <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
- and o.order_type regexp #{finishedGoodsInventory.order.orderType}
- </if>
- <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
- and fgi.inventory regexp #{finishedGoodsInventory.inventory}
- </if>
- <if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
- and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
- </if>
- <if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
- </if>
- <if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` regexp #{finishedGoodsInventory.status}
- </if>
- <if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
- </if>
- <if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
- </if>
- <if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time regexp #{finishedGoodsInventory.endTime}
- </if>
- <if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark regexp #{finishedGoodsInventory.remark}
- </if>
-
- </where>
- order by fgi.id desc
-
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getPageTotal">
- select
- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
- count(fgi.id) as 'total'
- from finished_goods_inventory fgi
- left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
- left join sd.`order` o on fgi.order_id = o.order_id
- <where>
- and fgi.status = 0 and fgi.quantity_available>0
- <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width regexp #{finishedGoodsInventory.orderDetail.width}
- </if>
- <if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
- and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
- </if>
- <if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
- </if>
- <if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
- </if>
- <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id regexp #{finishedGoodsInventory.order.orderId}
- </if>
- <if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
- and o.project regexp #{finishedGoodsInventory.order.project}
- </if>
- <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
- and o.order_type regexp #{finishedGoodsInventory.order.orderType}
- </if>
- <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
- and fgi.inventory regexp #{finishedGoodsInventory.inventory}
- </if>
- <if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
- </if>
- <if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
- and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
- </if>
- <if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
- </if>
- <if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` regexp #{finishedGoodsInventory.status}
- </if>
- <if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
- </if>
- <if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
- </if>
- <if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time regexp #{finishedGoodsInventory.endTime}
- </if>
- <if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark regexp #{finishedGoodsInventory.remark}
- </if>
-
- </where>
-
- order by fgi.id desc
- limit #{offset},#{pageSize}
- ;
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml
deleted file mode 100644
index bfd83e1..0000000
--- a/north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml
+++ /dev/null
@@ -1,652 +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.mm.FinishedOperateLogMapper">
- <resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedOperateLog" >
- <id column="id" property="id"/>
- <result column="operation_order_number" property="operationOrderNumber"/>
- <result column="order_id" property="orderId"/>
- <result column="operation_number" property="operationNumber"/>
- <result column="quantity" property="quantity"/>
- <result column="operate_type" property="operateType"/>
- <result column="operator" property="operator"/>
- <result column="operate_time" property="operateTime"/>
- <result column="stater_operation_order_number" property="staterOperationOrderNumber"/>
- <result column="end_operation_order_number" property="endOperationOrderNumber"/>
- <result column="status" property="status"/>
- <result column="type" property="type"/>
- <result column="reviewed" property="reviewed"/>
- <result column="reviewed_time" property="reviewedTime"/>
- <result column="remarks" property="remarks"/>
- <result column="is_state" property="isState"/>
- <result column="process_id" property="processId"/>
-
- <result column="width" property="orderDetail.width"/>
- <result column="height" property="orderDetail.height"/>
- <result column="product_id" property="orderDetail.productId"/>
- <result column="product_name" property="orderDetail.productName"/>
-
- </resultMap>
-
- <select id="getSelectStorageRecord" resultMap="selectFinishedGoodsInventory">
- select fol.id,
- fol.operation_order_number,
- fol.order_id,
- fol.operate_type,
- fol.process_id,
- fol.operation_number,
- fol.quantity,
- fol.operator,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- fol.operate_time,
- fol.`status`,
- fol.is_state,
- fol.reviewed,
- fol.reviewed_time,
- fol.type,
- fol.remarks
- from (select *
- from mm.finished_operate_log aa where aa.operate_type = #{type} and aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectStorageRecordLogPageTotal">
- select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
- count(fol.id) as 'total'
- from (select *
- from mm.finished_operate_log aa where aa.operate_type = #{type} and aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <update id="updateToExamine">
- update mm.finished_operate_log set reviewed=#{userName},reviewed_time=now(),status=#{type} where operation_order_number=#{finishedOperateLog.operationOrderNumber};
- </update>
-
- <update id="updateFinishedOperateLogState">
- update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
- </update>
-
- <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
- select fol.id,
- fol.operation_order_number,
- fol.order_id,
- fol.operation_number,
- fol.quantity,
- fol.operator,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- fol.operate_time,
- fol.`status`,
- fol.is_state,
- fol.reviewed,
- fol.reviewed_time,
- fol.type,
- fol.remarks
- from (select *
- from mm.finished_operate_log aa where (aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') and aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectOperateRecordLogPageTotal" >
- select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
- count(fol.id) as 'total'
- from (select *
- from mm.finished_operate_log aa where (aa.operate_type = '棰嗗嚭' or aa.operate_type = '杩斿伐') and aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
- select fol.operation_order_number,
- fol.order_id,
- fol.operation_number,
- fol.stater_operation_order_number,
- fol.end_operation_order_number,
- fol.quantity,
- fol.operator,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- fol.operate_time
- from (select *
- from mm.finished_operate_log aa where aa.operate_type = '璋冩嫧') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.staterOperationOrderNumber != null and finishedOperateLog.staterOperationOrderNumber != ''">
- and fol.stater_operation_order_number regexp #{finishedOperateLog.staterOperationOrderNumber}
- </if>
- <if test="finishedOperateLog.endOperationOrderNumber != null and finishedOperateLog.endOperationOrderNumber != ''">
- and fol.end_operation_order_number regexp #{finishedOperateLog.endOperationOrderNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getselectAllocateFinishedOperateLogPageTotal" >
- select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
- count(fol.id) as 'total'
- from (select *
- from mm.finished_operate_log aa where aa.operate_type = '璋冩嫧') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.end_operation_order_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.staterOperationOrderNumber != null and finishedOperateLog.staterOperationOrderNumber != ''">
- and fol.stater_operation_order_number regexp #{finishedOperateLog.staterOperationOrderNumber}
- </if>
- <if test="finishedOperateLog.endOperationOrderNumber != null and finishedOperateLog.endOperationOrderNumber != ''">
- and fol.end_operation_order_number regexp #{finishedOperateLog.endOperationOrderNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectFinishedOperateLogReport" resultMap="selectFinishedGoodsInventory">
- select fol.id,
- fol.operation_order_number,
- fol.order_id,
- fol.operate_type,
- fol.process_id,
- fol.operation_number,
- fol.quantity,
- fol.operator,
- od.product_id,
- od.product_name,
- od.width,
- od.height,
- fol.stater_operation_order_number,
- fol.end_operation_order_number,
- fol.operate_time,
- fol.`status`,
- fol.is_state,
- fol.reviewed,
- fol.reviewed_time,
- fol.type,
- fol.remarks
- from (select *
- from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
- and fol.operate_type regexp #{finishedOperateLog.operateType}
- </if>
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectFinishedOperateLogReportPageTotal">
- select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
- count(fol.id) as 'total'
- from (select *
- from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
- left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
- <where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
- <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
- and fol.operate_type regexp #{finishedOperateLog.operateType}
- </if>
- <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
- and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
- </if>
- <if test="finishedOperateLog.orderId != null and finishedOperateLog.orderId != ''">
- and fol.order_id regexp #{finishedOperateLog.orderId}
- </if>
- <if test="finishedOperateLog.operationNumber != null and finishedOperateLog.operationNumber != ''">
- and fol.operation_number regexp #{finishedOperateLog.operationNumber}
- </if>
- <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
- and fol.quantity regexp #{finishedOperateLog.quantity}
- </if>
- <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
- and fol.operator regexp #{finishedOperateLog.operator}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.productId != null and finishedOperateLog.orderDetail.productId != ''">
- and od.product_id regexp #{finishedOperateLog.orderDetail.productId}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.productName != null and finishedOperateLog.orderDetail.productName != ''">
- and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.height != null and finishedOperateLog.orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.height},'\\.0+$','')
- </if>
- <if test="finishedOperateLog.operateTime != null and finishedOperateLog.operateTime != ''">
- and fol.operate_time regexp #{finishedOperateLog.operateTime}
- </if>
- <if test="finishedOperateLog.status != null and finishedOperateLog.status != ''">
- and fol.`status` regexp #{finishedOperateLog.status}
- </if>
- <if test="finishedOperateLog.reviewed != null and finishedOperateLog.reviewed != ''">
- and fol.reviewed regexp #{finishedOperateLog.reviewed}
- </if>
- <if test="finishedOperateLog.reviewedTime != null and finishedOperateLog.reviewedTime != ''">
- and fol.reviewed_time regexp #{finishedOperateLog.reviewedTime}
- </if>
- <if test="finishedOperateLog.type != null and finishedOperateLog.type != ''">
- and fol.type regexp #{finishedOperateLog.type}
- </if>
- <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
- and fol.remarks regexp #{finishedOperateLog.remarksr}
- </if>
- </where>
- order by fol.`status` desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getselectFinishedOperateLog" >
- select
- *
- from
- mm.finished_operate_log limit 0,1;
- </select>
-
-
-
- <select id="getmaximum" >
- select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
- </select>
-
- <insert id="insertIntFinishedOperateLog" useGeneratedKeys="true" >
- insert into mm.finished_operate_log(operation_order_number,
- order_id,
- process_id,
- operation_number,
- operate_type,
- operator,
- quantity,
- operate_time,
- status
- )
- values (
- #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},#{flowCard.inventoryQuantity},now(),"鏈鏍�"
- )
- </insert>
-
- <insert id="insertOutFinishedOperateLog" useGeneratedKeys="true" >
- insert into mm.finished_operate_log(operation_order_number,
- order_id,
- operation_number,
- operate_type,
- operator,
- quantity,
- operate_time,
- status
- )
- values (
- #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
- ,"鍑哄簱",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"鏈鏍�"
- )
- </insert>
-
- <insert id="insertFinishedOperateLogTakeOut" useGeneratedKeys="true" >
- insert into mm.finished_operate_log(operation_order_number,
- order_id,
- operation_number,
- operate_type,
- operator,
- quantity,
- operate_time,
- status,
- type,
- remarks
- )
- values (
- #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
- ,"棰嗗嚭",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",#{operateType},#{remarks}
- )
- </insert>
-
- <insert id="insertFinishedOperateLogRework" useGeneratedKeys="true" >
- insert into mm.finished_operate_log(operation_order_number,
- order_id,
- operation_number,
- operate_type,
- operator,
- quantity,
- operate_time,
- status,
- type,
- remarks
- )
- values (
- #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
- ,"杩斿伐",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",#{operateType},#{remarks}
- )
- </insert>
-
- <insert id="insertFinishedOperateLogAllocate" useGeneratedKeys="true" >
- insert into mm.finished_operate_log(operation_order_number,
- order_id,
- operation_number,
- operate_type,
- operator,
- quantity,
- operate_time,
- status,
- stater_operation_order_number,
- end_operation_order_number
- )
- values (
- #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
- ,"璋冩嫧",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",#{orderDetail.orderId},#{orderDetail.orderNumber}
- )
- </insert>
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml b/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml
deleted file mode 100644
index dc5c9b6..0000000
--- a/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml
+++ /dev/null
@@ -1,771 +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.mm.MaterialInventoryMapper">
-
- <resultMap id="selectMaterialOutboundDetail" type="com.example.erp.entity.mm.MaterialOutboundDetail" >
- <id column="id" property="id"/>
- <result column="material_outbound_id" property="materialOutboundId"/>
- <result column="material_outbound_number" property="materialOutboundNumber"/>
- <result column="inventory_id" property="inventoryId"/>
- <result column="inventory_organization" property="inventoryOrganization"/>
- <result column="material_code" property="materialCode"/>
- <result column="material_name" property="materialName"/>
- <result column="use_id" property="useId"/>
- <result column="producer" property="producer"/>
- <result column="unit" property="unit"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="thickness" property="thickness"/>
- <result column="outbound_quantity" property="outboundQuantity"/>
- <result column="single_piece_area" property="singlePieceArea"/>
- <result column="inventory_area" property="inventoryArea"/>
- <result column="date_of_manufacture" property="dateOfManufacture"/>
- <result column="remarks" property="remarks"/>
-
- <result column="material_requisition_personnel" property="materialOutbound.materialRequisitionPersonnel"/>
- <result column="material_requisition_team" property="materialOutbound.materialRequisitionTeam"/>
- <result column="order_id" property="materialOutbound.orderId"/>
- <result column="outbound_type" property="materialOutbound.outboundType"/>
- <result column="warehouse_manager" property="materialOutbound.warehouseManager"/>
- <result column="material_requisition_date" property="materialOutbound.materialRequisitionDate"/>
- <result column="reviewed" property="materialOutbound.reviewed"/>
- <result column="reviewed_time" property="materialOutbound.reviewedTime"/>
-
- </resultMap>
-
-
-
- <select id="getSelectMaterialInventoryDate">
- select
- mi.id,
- mi.inventory_organization as inventoryOrganization,
- mi.material_code AS materialCode,
- mi.producer,
- mi.inventory_quantity AS inventoryQuantity,
- mi.available_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
- mi.safety_stock AS safetyStock,
- mi.total_area AS totalArea,
- mi.single_piece_area singlePieceArea,
- date(mi.date_of_manufacture) AS dateOfManufacture,
- mi.quality_guarantee_period qualityGuaranteePeriod,
- mi.inventory_area AS inventoryArea,
- mi.dead_stock AS deadStock,
- mi.remarks,
- date(mi.create_time) AS createTime,
- ms.json
- from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
- <where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialInventoryDatePageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.material_inventory mi
- <where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectMaterialInventoryEngineeringDate">
- select
- ou.id as useId,
- ou.project_no as projectNo,
- mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
- mi.id,
- mi.inventory_organization as inventoryOrganization,
- mi.material_code AS materialCode,
- mi.producer,
- mi.safety_stock AS safetyStock,
- mi.total_area AS totalArea,
- mi.single_piece_area singlePieceArea,
- date(mi.date_of_manufacture) AS dateOfManufacture,
- mi.quality_guarantee_period qualityGuaranteePeriod,
- mi.inventory_area AS inventoryArea,
- mi.dead_stock AS deadStock,
- mi.remarks,
- date(mi.create_time) AS createTime,
- ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
- left join pp.optimize_project op on op.project_no=ou.project_no
- <where>
- mi.plan_quantity>0 and op.state>=100 and
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialInventoryEngineeringDatePageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- pp.optimize_use ou
- <where>
- ou.not_use_count>0 and ou.state=1 and
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectMaterialInventory">
- select
- mi.id,
- mi.inventory_organization as inventoryOrganization,
- mi.material_code AS materialCode,
- mi.producer,
- mi.inventory_quantity AS inventoryQuantity,
- mi.available_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
- mi.safety_stock AS safetyStock,
- mi.total_area AS totalArea,
- mi.single_piece_area singlePieceArea,
- date(mi.date_of_manufacture) AS dateOfManufacture,
- mi.quality_guarantee_period qualityGuaranteePeriod,
- mi.inventory_area AS inventoryArea,
- mi.dead_stock AS deadStock,
- mi.remarks,
- date(mi.create_time) AS createTime,
- ms.json
- from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
- <where>
- <if test="materialInventory.stockId != null and materialInventory.stockId != ''">
- and mi.id in
- <foreach item="id" collection="ids" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialInventoryPageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.material_inventory mi
- <where>
- <if test="materialInventory.id != null and materialInventory.id != ''">
- and mi.id regexp #{materialInventory.id}
- </if>
-
- </where>
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialInventoryEngineering">
- select
- ou.id as useId,
- ou.project_no as projectNo,
- mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
- mi.id,
- mi.inventory_organization as inventoryOrganization,
- mi.material_code AS materialCode,
- mi.producer,
- mi.safety_stock AS safetyStock,
- mi.total_area AS totalArea,
- mi.single_piece_area singlePieceArea,
- date(mi.date_of_manufacture) AS dateOfManufacture,
- mi.quality_guarantee_period qualityGuaranteePeriod,
- mi.inventory_area AS inventoryArea,
- mi.dead_stock AS deadStock,
- mi.remarks,
- date(mi.create_time) AS createTime,
- ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
-
- <where>
- <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
- and ou.id in
- <foreach item="id" collection="ids" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
-
- </where>
-
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialInventoryEngineeringPageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- pp.optimize_use ou
- <where>
- <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
- and ou.id in
- <foreach item="id" collection="ids" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
-
- </where>
-
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectMaterialOutboundDate">
- select
- *
- from
- mm.material_outbound mo
- <where>
- date(mo.create_time)>=#{startDate} and date(mo.create_time) <= #{endDate}
- <if test="materialOutbound.materialOutboundId != null and materialOutbound.materialOutboundId != ''">
- and mo.material_outbound_id regexp #{materialOutbound.materialOutboundId}
- </if>
- <if test="materialOutbound.materialRequisitionPersonnel != null and materialOutbound.materialRequisitionPersonnel != ''">
- and mo.material_requisition_personnel regexp #{materialOutbound.materialRequisitionPersonnel}
- </if>
- <if test="materialOutbound.materialRequisitionTeam != null and materialOutbound.materialRequisitionTeam != ''">
- and mo.material_requisition_team regexp #{materialOutbound.materialRequisitionTeam}
- </if>
- <if test="materialOutbound.orderId != null and materialOutbound.orderId != ''">
- and mo.order_id regexp #{materialOutbound.orderId}
- </if>
- <if test="materialOutbound.outboundType != null and materialOutbound.outboundType != ''">
- and mo.outbound_type regexp #{materialOutbound.outboundType}
- </if>
- <if test="materialOutbound.warehouseManager != null and materialOutbound.warehouseManager != ''">
- and mo.warehouse_manager regexp #{materialOutbound.warehouseManager}
- </if>
- <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
- and mo.reviewed regexp #{materialOutbound.reviewed}
- </if>
- </where>
- order by mo.reviewed_state desc,mo.create_time desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialOutboundDatePageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.material_outbound mo
- <where>
- date(mo.create_time)>=#{startDate} and date(mo.create_time) <= #{endDate}
- <if test="materialOutbound.materialOutboundId != null and materialOutbound.materialOutboundId != ''">
- and mo.material_outbound_id regexp #{materialOutbound.materialOutboundId}
- </if>
- <if test="materialOutbound.materialRequisitionPersonnel != null and materialOutbound.materialRequisitionPersonnel != ''">
- and mo.material_requisition_personnel regexp #{materialOutbound.materialRequisitionPersonnel}
- </if>
- <if test="materialOutbound.materialRequisitionTeam != null and materialOutbound.materialRequisitionTeam != ''">
- and mo.material_requisition_team regexp #{materialOutbound.materialRequisitionTeam}
- </if>
- <if test="materialOutbound.orderId != null and materialOutbound.orderId != ''">
- and mo.order_id regexp #{materialOutbound.orderId}
- </if>
- <if test="materialOutbound.outboundType != null and materialOutbound.outboundType != ''">
- and mo.outbound_type regexp #{materialOutbound.outboundType}
- </if>
- <if test="materialOutbound.warehouseManager != null and materialOutbound.warehouseManager != ''">
- and mo.warehouse_manager regexp #{materialOutbound.warehouseManager}
- </if>
- <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
- and mo.reviewed regexp #{materialOutbound.reviewed}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectReturningWarehouseDate">
- select
- *
- from
- mm.returning_warehouse rw
- <where>
- date(rw.create_time)>=#{startDate} and date(rw.create_time) <= #{endDate}
- <if test="returningWarehouse.returningId != null and returningWarehouse.returningId != ''">
- and rw.returning_id regexp #{returningWarehouse.returningId}
- </if>
- <if test="returningWarehouse.materialRequisitionPersonnel != null and returningWarehouse.materialRequisitionPersonnel != ''">
- and rw.material_requisition_personnel regexp #{returningWarehouse.materialRequisitionPersonnel}
- </if>
- <if test="returningWarehouse.materialRequisitionTeam != null and returningWarehouse.materialRequisitionTeam != ''">
- and rw.material_requisition_team regexp #{returningWarehouse.materialRequisitionTeam}
- </if>
- <if test="returningWarehouse.orderId != null and returningWarehouse.orderId != ''">
- and rw.order_id regexp #{returningWarehouse.orderId}
- </if>
- <if test="returningWarehouse.returningType != null and returningWarehouse.returningType != ''">
- and rw.returning_type regexp #{returningWarehouse.returningType}
- </if>
- <if test="returningWarehouse.warehouseManager != null and returningWarehouse.warehouseManager != ''">
- and rw.warehouse_manager regexp #{returningWarehouse.warehouseManager}
- </if>
- <if test="returningWarehouse.reviewed != null and returningWarehouse.reviewed != ''">
- and rw.reviewed regexp #{returningWarehouse.reviewed}
- </if>
- <if test="returningWarehouse.project != null and returningWarehouse.project != ''">
- and rw.project regexp #{returningWarehouse.project}
- </if>
- <if test="returningWarehouse.batch != null and returningWarehouse.batch != ''">
- and rw.batch regexp #{returningWarehouse.batch}
- </if>
-
-
-
- </where>
- order by rw.reviewed_state desc,rw.create_time desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectReturningWarehouseDatePageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.returning_warehouse rw
- <where>
- date(rw.create_time)>=#{startDate} and date(rw.create_time) <= #{endDate}
- <if test="returningWarehouse.returningId != null and returningWarehouse.returningId != ''">
- and rw.returning_id regexp #{returningWarehouse.returningId}
- </if>
- <if test="returningWarehouse.materialRequisitionPersonnel != null and returningWarehouse.materialRequisitionPersonnel != ''">
- and rw.material_requisition_personnel regexp #{returningWarehouse.materialRequisitionPersonnel}
- </if>
- <if test="returningWarehouse.materialRequisitionTeam != null and returningWarehouse.materialRequisitionTeam != ''">
- and rw.material_requisition_team regexp #{returningWarehouse.materialRequisitionTeam}
- </if>
- <if test="returningWarehouse.orderId != null and returningWarehouse.orderId != ''">
- and rw.order_id regexp #{returningWarehouse.orderId}
- </if>
- <if test="returningWarehouse.returningType != null and returningWarehouse.returningType != ''">
- and rw.returning_type regexp #{returningWarehouse.returningType}
- </if>
- <if test="returningWarehouse.warehouseManager != null and returningWarehouse.warehouseManager != ''">
- and rw.warehouse_manager regexp #{returningWarehouse.warehouseManager}
- </if>
- <if test="returningWarehouse.reviewed != null and returningWarehouse.reviewed != ''">
- and rw.reviewed regexp #{returningWarehouse.reviewed}
- </if>
- <if test="returningWarehouse.project != null and returningWarehouse.project != ''">
- and rw.project regexp #{returningWarehouse.project}
- </if>
- <if test="returningWarehouse.batch != null and returningWarehouse.batch != ''">
- and rw.batch regexp #{returningWarehouse.batch}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialOutbound">
- select
- *
- from
- mm.material_outbound mo
- <where>
- <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
- and mo.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="SelectMaterialOutboundDetail" >
- select
- *
- from mm.material_outbound_detail modd
- <where>
- <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
- and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
- </if>
- </where>
- </select>
-
- <select id="getSelectMaterialOutboundDetail" >
- select
- modd.use_id as useId,
- modd.inventory_id as id,
- modd.inventory_organization as inventoryOrganization,
- modd.material_code as materialCode,
- modd.material_name as materialName,
- modd.producer,
- modd.width,
- modd.height,
- modd.thickness,
- modd.unit,
- modd.outbound_quantity as outboundQuantity,
- date(modd.date_of_manufacture) as dateOfManufacture,
- modd.single_piece_area as singlePieceArea,
- modd.inventory_area as inventoryArea,
- modd.remarks,
- mi.inventory_quantity as inventoryQuantity,
- if(mo.reviewed_state!=1,modd.outbound_quantity+mi.available_quantity,mi.available_quantity) as availableQuantity,
- ms.json
- from mm.material_outbound_detail modd left join mm.material_inventory mi on modd.inventory_id=mi.id
- left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
- left join mm.material_store ms on modd.material_code=ms.id
- <where>
- <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
- and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialOutboundEngineering" >
- select
- ou.project_no as projectNo,
- modd.inventory_id as id,
- modd.inventory_organization as inventoryOrganization,
- modd.material_code as materialCode,
- modd.material_name as materialName,
- modd.producer,
- modd.width,
- modd.height,
- modd.thickness,
- modd.unit,
- modd.outbound_quantity as outboundQuantity,
- date(modd.date_of_manufacture) as dateOfManufacture,
- modd.single_piece_area as singlePieceArea,
- modd.inventory_area as inventoryArea,
- modd.remarks,
- ou.use_count as inventoryQuantity,
- if(mo.reviewed_state!=1,modd.outbound_quantity+ou.not_use_count,ou.not_use_count) as availableQuantity,
- ms.json
- from mm.material_outbound_detail modd left join pp.optimize_use ou on modd.use_id=ou.id
- left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
- left join mm.material_store ms on modd.material_code=ms.id
- <where>
- <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
- and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialOutboundDetailPageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.material_outbound_detail modd
- <where>
- <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
- and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectReturningWarehouse">
- select
- *
- from
- mm.returning_warehouse rw
- <where>
- <if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
- and returning_id regexp #{returningWarehouseDetail.returningId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectReturningWarehouseDetail" >
- select
- rwd.inventory_id as inventoryId,
- mi.inventory_organization as inventoryOrganization,
- rwd.material_code as id,
- mi.producer,
- rwd.return_quantity as returnQuantity,
- date(mi.date_of_manufacture) as dateOfManufacture,
- mi.single_piece_area as singlePieceArea,
- mi.inventory_area as inventoryArea,
- rwd.remarks,
- mi.inventory_quantity as inventoryQuantity,
- ms.json
- from mm.returning_warehouse_detail rwd left join mm.material_inventory mi on rwd.inventory_id=mi.id
- left join mm.returning_warehouse rw on rwd.returning_id=rw.returning_id
- left join mm.material_store ms on rwd.material_code=ms.id
- <where>
- <if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
- and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectReturningWarehouseDetailPageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.returning_warehouse_detail rwd
- <where>
- <if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
- and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <insert id="insertMaterialStore" useGeneratedKeys="true" >
- insert into mm.material_store (type,json,create_time
- )
- values (
- #{type},#{json},now()
- )
- </insert>
-
- <update id="updateMaterialStore" >
- update mm.material_store set json=#{json} where id=#{id}
- </update>
-
- <delete id="deleteMaterialOutbound" >
- delete from mm.material_outbound where material_outbound_id=#{materialOutboundId}
- </delete>
-
- <delete id="deleteMaterialOutboundDetail" >
- delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
- </delete>
-
- <delete id="deleteReturningWarehouseDetail" >
- delete from mm.returning_warehouse_detail where returning_id=#{returningId}
- </delete>
-
- <select id="getMaximum" >
- select count(*) from mm.material_outbound where date(create_time)=CURDATE()
- </select>
-
- <select id="getMaximums" >
- select count(*) from mm.returning_warehouse where date(create_time)=CURDATE()
- </select>
-
- <select id="getMaterialOutboundCount" >
- select count(*) from mm.material_outbound where material_outbound_id=#{materialOutboundId}
- </select>
-
- <select id="getReturningWarehouseCount" >
- select count(*) from mm.returning_warehouse where returning_id=#{returningId}
- </select>
-
- <select id="getMaterialOutboundDetailMaximum" >
- select count(*) from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
- </select>
-
- <select id="getReturningWarehouseDetailMaximum" >
- select count(*) from mm.returning_warehouse where returning_id=#{returningId}
- </select>
-
- <select id="getMaterialInventoryCount" >
- select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
- </select>
-
- <select id="getMaterialInventoryCountNull" >
- select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
- </select>
-
- <select id="getMaterialInventoryCountId" >
- select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
- </select>
-
- <select id="getMaterialInventoryCountNullId" >
- select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
- </select>
-
- <select id="getIsNotMaterialOutboundDetail" >
- select * from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
- </select>
-
- <select id="getIsNotReturningWarehouseDetail" >
- select * from mm.returning_warehouse_detail where returning_id=#{returningId}
- </select>
-
- <insert id="insertMaterialOutbound" useGeneratedKeys="true" >
- insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
- warehouse_manager,material_requisition_date,reviewed_state,create_time)
- values (
- #{number} ,#{materialOutbound.materialRequisitionPersonnel},#{materialOutbound.materialRequisitionTeam},
- #{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
- 0,now()
- )
- </insert>
-
- <insert id="insertMaterialOutboundDetail" useGeneratedKeys="true" >
- insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,material_name,use_id,inventory_id,inventory_organization,producer,unit,width,
- height,thickness,outbound_quantity,single_piece_area,inventory_area,date_of_manufacture,remarks)
- values (
- #{number} ,#{materialOutboundNumber},#{materialOutboundDetail.materialCode},#{materialOutboundDetail.materialName},#{materialOutboundDetail.useId},#{materialOutboundDetail.id},
- #{materialOutboundDetail.inventoryOrganization},#{materialOutboundDetail.producer},#{materialOutboundDetail.unit},
- #{materialOutboundDetail.width},#{materialOutboundDetail.height},#{materialOutboundDetail.thickness},#{materialOutboundDetail.outboundQuantity},
- #{materialOutboundDetail.singlePieceArea},#{materialOutboundDetail.inventoryArea},#{materialOutboundDetail.dateOfManufacture},#{materialOutboundDetail.remarks}
- )
- </insert>
-
- <insert id="insertMaterialInventory" useGeneratedKeys="true" >
- insert into mm.material_inventory (inventory_organization, material_code, producer, stock_id,
- inventory_quantity, available_quantity, safety_stock, total_area, single_piece_area,
- date_of_manufacture, quality_guarantee_period, inventory_area, dead_stock, remarks, create_time)
- values (
- #{materialInventory.inventoryOrganization} ,#{materialCode},
- #{materialInventory.producer},0,#{materialInventory.inventoryQuantity},#{materialInventory.inventoryQuantity},0,
- #{totalArea},#{singlePieceArea},#{materialInventory.dateOfManufacture},#{materialInventory.qualityGuaranteePeriod},
- #{materialInventory.inventoryArea},0,#{materialInventory.remarks},now()
- )
- </insert>
-
- <insert id="insertMaterialInventoryReturning" useGeneratedKeys="true" >
- insert into mm.material_inventory (inventory_organization, material_code, producer, stock_id,
- inventory_quantity, available_quantity, safety_stock, total_area, single_piece_area,
- date_of_manufacture, quality_guarantee_period, inventory_area, dead_stock, remarks, create_time)
- values (
- #{returningWarehouseDetail.inventoryOrganization} ,#{materialCode},
- #{returningWarehouseDetail.producer},0,#{returningWarehouseDetail.returnQuantity},0,0,
- #{totalArea},#{singlePieceArea},#{returningWarehouseDetail.dateOfManufacture},#{returningWarehouseDetail.qualityGuaranteePeriod},
- #{returningWarehouseDetail.inventoryArea},0,#{returningWarehouseDetail.remarks},now()
- )
- </insert>
-
-
- <insert id="insertReturningWarehouse" useGeneratedKeys="true" >
- insert into mm.returning_warehouse(returning_id, returning_type, material_requisition_personnel, material_requisition_team,
- warehouse_manager, reviewed_state, order_id, batch, project, create_time)
- values (
- #{number} ,#{returningWarehouse.returningType},#{returningWarehouse.materialRequisitionPersonnel},#{returningWarehouse.materialRequisitionTeam},
- #{returningWarehouse.warehouseManager},0,#{returningWarehouse.orderId},#{returningWarehouse.batch},#{returningWarehouse.project},now()
- )
- </insert>
-
- <insert id="insertReturningWarehouseDetail" useGeneratedKeys="true" >
- insert into mm.returning_warehouse_detail (returning_id, returning_number, inventory_id, material_code, return_quantity,date_of_manufacture, remarks)
- values (
- #{number} ,#{returningWarehouseNumber},#{returningWarehouseDetail.inventoryId},#{returningWarehouseDetail.id},
- #{returningWarehouseDetail.returnQuantity},#{returningWarehouseDetail.dateOfManufacture},#{returningWarehouseDetail.remarks}
- )
- </insert>
-
- <update id="updateMaterialInventoryAvailableOptOut">
- update mm.material_inventory
- set available_quantity=available_quantity-#{quantity}
- where id=#{useId}
- </update>
-
- <update id="updateMaterialInventoryAvailableOptInt">
- update mm.material_inventory
- set available_quantity=available_quantity+#{quantity}
- where id=#{useId}
- </update>
-
- <update id="updateMaterialInventoryAvailableOut">
- update mm.material_inventory
- set available_quantity=available_quantity-#{quantity}
- where id=#{inventoryId}
- </update>
-
- <update id="updateMaterialInventoryAvailableInt">
- update mm.material_inventory
- set available_quantity=available_quantity+#{quantity}
- where id=#{inventoryId}
- </update>
-
- <update id="updateMaterialInventoryInventoryOut">
- update mm.material_inventory
- set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
- where id=#{inventoryId}
- </update>
-
- <update id="updateMaterialInventoryInventoryInt">
- update mm.material_inventory
- set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
- where id=#{inventoryId}
- </update>
-
- <update id="updateMaterialInventoryAvailableInventoryOut">
- update mm.material_inventory
- set available_quantity=available_quantity-#{quantity},inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
- where id=#{inventoryId}
- </update>
-
- <update id="updateMaterialInventoryAvailableInventoryInt">
- update mm.material_inventory
- set available_quantity=available_quantity+#{quantity},inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
- where id=#{inventoryId}
- </update>
-
-
- <update id="updateMaterialOutboundToExamine">
- update mm.material_outbound set reviewed_state=#{reviewedState},reviewed=#{reviewed},reviewed_time=now()
- where material_outbound_id=#{materialOutboundId}
- </update>
-
- <update id="updateMaterialOutboundCounterExamination">
- update mm.material_outbound set reviewed_state=#{reviewedState}
- where material_outbound_id=#{materialOutboundId}
- </update>
-
- <update id="updateReturningWarehouseToExamine">
- update mm.returning_warehouse set reviewed_state=#{reviewedState},reviewed=#{reviewed},reviewed_time=now()
- where returning_id=#{returningId}
- </update>
-
- <update id="updateReturningWarehouseCounterExamination">
- update mm.returning_warehouse set reviewed_state=#{reviewedState}
- where returning_id=#{returningId}
- </update>
-
- <update id="updateMaterialInventory" >
- update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
- available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
- total_area=total_area+#{totalArea}
- where material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
- </update>
-
- <update id="updateMaterialInventoryReturning" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
- where material_code=#{materialCode} and
- date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}
-
-
- </update>
-
- <update id="updateMaterialInventoryReturningNull" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
- where material_code=#{materialCode} and
- date_of_manufacture is null
-
-
- </update>
-
- <update id="updateReturningWarehouseDetail" >
- update mm.returning_warehouse_detail set inventory_id=#{materialInventoryId}
- where returning_id=#{number} and returning_number=#{returningWarehouseNumber}
- </update>
-
- <update id="updateMaterialInventoryArea" >
- update mm.material_inventory set single_piece_area=#{singlePieceArea},
- total_area=inventory_quantity*#{singlePieceArea}
- where material_code=#{materialCode}
- </update>
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml b/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml
deleted file mode 100644
index 1c3214b..0000000
--- a/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml
+++ /dev/null
@@ -1,63 +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.mm.MaterialStoreMapper">
-
- <select id="getSelectMaterialStore">
- select
- *
- from
- mm.material_store m
- <where>
- <if test="materialStore.id != null and materialStore.id != ''">
- and m.id regexp #{materialStore.id}
- </if>
- <if test="materialStore.type != null and materialStore.type != ''">
- and m.type regexp #{materialStore.type}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectMaterialStoreById">
- select * from mm.material_store m where id=#{id}
- </select>
-
- <select id="getSelectMaterialStorePageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.material_store m
- <where>
- <if test="materialStore.id != null and materialStore.id != ''">
- and m.id regexp #{materialStore.id}
- </if>
- <if test="materialStore.type != null and materialStore.type != ''">
- and m.type regexp #{materialStore.type}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <insert id="insertMaterialStore" useGeneratedKeys="true" >
- insert into mm.material_store (type,json,create_time
- )
- values (
- #{type},#{json},now()
- )
- </insert>
-
- <update id="updateMaterialStore" >
- update mm.material_store set json=#{json} where id=#{id}
- </update>
-
- <delete id="deleteMaterialStore" >
- delete from mm.material_store where id=#{id}
- </delete>
-
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml b/north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml
deleted file mode 100644
index 5a2b2ac..0000000
--- a/north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml
+++ /dev/null
@@ -1,75 +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.BasicDateProduceMapper">
- <resultMap id="selectBasicDataProduce" type="com.example.erp.entity.pp.BasicDataProduce">
- <id column="id" property="id"/>
- <result column="basic_type" property="basicType"/>
- <result column="basic_name" property="basicName"/>
- <result column="basic_category" property="basicCategory"/>
-
-
- <result column="d_basic_type" property="basicData.basicType"/>
- <result column="d_basic_name" property="basicData.basicName"/>
- <result column="d_basic_category" property="basicData.basicCategory"/>
-
-
-
- </resultMap>
-
- <select id="SelectWorkBasicTeams" resultMap="selectBasicDataProduce">
- select bdp.basic_name ,bd.basic_name as d_basic_name
- from pp.basic_data_produce bdp
- left join sd.basic_data bd on bdp.basic_category = bd.id
- where bd.basic_name = #{process}
- and bdp.basic_type = "teamsgroups"
- </select>
-
-<!-- 鏌ヨ宸ュ簭-->
- <select id="selectProcessMp">
- select * from sd.basic_data where basic_type='product' and basic_category='process'
-
- </select>
-
- <select id="selectBasicMp">
- select bdp.id, bdp.basic_type, bdp.basic_name, bd.basic_name as d_basic_name
- from pp.basic_data_produce bdp
- left join sd.basic_data bd on bdp.basic_category = bd.id
- order by bdp.id desc
- </select>
-
- <select id="openSelectIdMp">
- select bdp.id, bdp.basic_type, bdp.basic_name, bd.basic_name as d_basic_name
- from pp.basic_data_produce bdp
- left join sd.basic_data bd on bdp.basic_category = bd.id
- where bdp.id = #{id}
- </select>
-
- <delete id="deleteBasicMp">
- delete from pp.basic_data_produce where id = #{id}
- </delete>
-
- <update id="updateBasicMp">
- update pp.basic_data_produce set basic_type = #{type},basic_name = #{name},basic_category = #{basicId} where id = #{id}
- </update>
-
- <select id="getBasicData">
- select id from sd.basic_data where basic_category = 'process' and basic_name = #{process}
- </select>
-
- <insert id="addTeamGroupMp">
- insert into pp.basic_data_produce(basic_type,basic_name,basic_category,create_time)
- values('teamsgroups',#{basicName},#{basicId},now())
- </insert>
-
- <insert id="saveBreakageTypeMp">
- insert into pp.basic_data_produce(basic_type,basic_name,create_time)
- values('breakagetype',#{basicName},now())
- </insert>
-
- <insert id="saveBreakageReasonMp">
- insert into pp.basic_data_produce(basic_type,basic_name,create_time)
- values('breakagereason',#{basicName},now())
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml b/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml
deleted file mode 100644
index 741cc4c..0000000
--- a/north-glass-erp/target/classes/mapper/pp/DeviceMaintenance.xml
+++ /dev/null
@@ -1,91 +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.DeviceMaintenanceMapper">
- <resultMap id="DeviceMaintenanceMapper" type="com.example.erp.entity.pp.DeviceMaintenance">
- <id column="id" property="id"/>
- <result column="device_id" property="deviceId"/>
- <result column="type" property="type"/>
- <result column="fault_time" property="faultTime"/>
- <result column="fault_reason" property="faultReason"/>
- <result column="maintenance_time" property="maintenanceTime"/>
- <result column="maintenance_illustrate" property="maintenanceIllustrate"/>
- <result column="start_time" property="startTime"/>
- <result column="stop_time" property="stopTime"/>
- <result column="personnel" property="personnel"/>
- <result column="cost" property="cost"/>
-
-
- </resultMap>
- <select id="getBasicData">
- select id
- from sd.basic_data
- where basic_category = 'process'
- and basic_name = #{process}
- </select>
-
-<insert id="addMachineMp">
- insert into pp.basic_data_produce(basic_type,basic_name,basic_category,create_time)
- values('device',#{basicName},#{basicId},now())
-</insert>
-
- <select id="selectProcessMp">
- select * from sd.basic_data where basic_type='product' and basic_category='process'
- </select>
-
- <select id="selectDeviceMp">
- SELECT
- bdp.id,
- bdp.basic_type,
- bdp.basic_name,
- bd.basic_name AS basic_category
- FROM
- sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
- WHERE
- bd.basic_category = 'process'
- AND bdp.basic_type = 'device'
- </select>
-
- <select id="getDeviceData">
- select id
- from basic_data_produce
- where basic_type = 'device'
- and basic_name = #{deviceName}
- </select>
-
- <insert id="saveMaintenanceAndRepairMp">
- insert into device_maintenance(device_id,device_name,type,fault_time,fault_reason,maintenance_time,
- maintenance_illustrate,start_time,stop_time,process,personnel,cost,create_time)
- values (#{deviceId},#{deviceName},#{type},#{faultTime},#{faultReason},#{maintenanceTime},
- #{maintenanceIllustrate},#{stopTime},#{startTime},#{process},#{personnel},#{cost},now())
- </insert>
-
- <select id="selectMaintenanceMp" resultMap="DeviceMaintenanceMapper">
- select * from device_maintenance where DATE_FORMAT((create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
- </select>
-
- <delete id="deleteMaintenanceMp">
- delete from device_maintenance where id = #{id}
- </delete>
-
- <select id="selectMachineMp">
- select dm.device_id,dm.device_name,
- if(dm.type=1,'缁翠慨','淇濆吇') as type,
- (select count(*) from device_maintenance where id = dm.id and type = 1) as faultCount,
- (select count(*) from device_maintenance where id = dm.id and type = 2) as maintenanceCount,
- (select date(fault_time) from device_maintenance where id = dm.id and type = 1 order by fault_time desc limit 1) as faultLastTime,
- (select date(maintenance_time) from device_maintenance where id = dm.id and type = 2 order by maintenance_time desc limit 1) as maintenanceLastTime,
- (select sum(cost) from device_maintenance where id = dm.id and dm.type=1) as faultCost,
- (select sum(cost) from device_maintenance where id = dm.id and dm.type=2) as maintenanceCost,
- dm.process
- from device_maintenance as dm
- group by dm.device_id
-
- </select>
-
- <select id="openSelectIdMp">
- select * from device_maintenance where id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
deleted file mode 100644
index 626010c..0000000
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ /dev/null
@@ -1,494 +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.FlowCardMapper">
- <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="selectFlowCard" resultMap="flowCardMap">
- select
- a.order_Id,
- a.process_Id,
- c.product_id,
- c.product_name,
- b.project,
- sum(a.quantity) as quantity,
- sum(c.compute_gross_area) as compute_gross_area,
- a.founder,
- c.processing_note,
- if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status
- from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
- left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
- where a.create_time between #{selectTime1} and #{selectTime2}
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and a.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.processId != null and flowCard.processId != ''">
- and a.process_Id regexp #{flowCard.processId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and c.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
- and c.product_name regexp #{flowCard.orderDetail.productName}
- </if>
-
- <if test="flowCard.order.project != null and flowCard.order.project!= ''">
- and b.project regexp #{flowCard.order.project}
- </if>
-
-
- group by a.process_Id
- ORDER BY a.id desc
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getPageTotal">
- select
- CEILING(count(a.process_Id)/#{pageSize}) as 'pageTotal',
- count(distinct a.process_Id) as 'total'
- from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
- left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
- where a.create_time between #{selectTime1} and #{selectTime2}
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and a.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.productionId != null and flowCard.productionId != ''">
- and a.process_Id regexp #{flowCard.productionId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and c.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
- and c.product_name regexp #{flowCard.orderDetail.productName}
- </if>
-
- <if test="flowCard.order.project != null and flowCard.order.project!= ''">
- and b.project regexp #{flowCard.order.project}
- </if>
-
- ORDER BY a.id desc
- limit #{offset},#{pageSize};
- </select>
-
- <!--鍒嗘灦鏌ヨ-->
- <select id="selectFlowCardMp" resultMap="flowCardMap">
- select o.order_id,
- o.customer_name,
- o.project,
- o.batch,
- o.other_remarks,
- o.icon,
- o.order_type,
- o.salesman,
- o.processing_note,
- o.delivery_address
- from sd.`order` as o
- left join sd.order_glass_detail ogd on o.order_id = ogd.order_id
- where o.production_order=2 and ogd.splitting_status=0 and o.create_time between #{selectTime1} and
- #{selectTime2}
-
- <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
- and o.order_id regexp #{flowCard.order.orderId}
- </if>
- <if test="flowCard.order.customerName != null and flowCard.order.customerName != ''">
- and o.customer_name regexp #{flowCard.order.customerName}
- </if>
- <if test="flowCard.order.project != null and flowCard.order.project != ''">
- and o.project regexp #{flowCard.order.project}
- </if>
- <if test="flowCard.order.batch != null and flowCard.order.batch!= ''">
- and o.batch regexp #{flowCard.order.batch}
- </if>
-
- <if test="flowCard.order.otherRemarks != null and flowCard.order.otherRemarks!= ''">
- and o.other_remarks regexp #{flowCard.order.otherRemarks}
- </if>
-
- <if test="flowCard.order.icon != null and flowCard.order.icon!= ''">
- and o.icon regexp #{flowCard.order.icon}
- </if>
- <if test="flowCard.order.orderType != null and flowCard.order.orderType!= ''">
- and o.order_type regexp #{flowCard.order.orderType}
- </if>
- <if test="flowCard.order.salesman != null and flowCard.order.salesman!= ''">
- and o.salesman regexp #{flowCard.order.salesman}
- </if>
- group by o.order_id
- order by o.id desc
-
- ;
- </select>
-
- <!-- 鍒嗘灦鏄庣粏鏌ヨ-->
- <select id="detailsSelectMp">
- select od.order_id,
- ogd.production_id,
- od.product_id,
- od.product_name,
- SUM( od.quantity) as quantity,
- SUM(od.compute_gross_area) as compute_gross_area,
- sum(od.perimeter) as perimeter
- from sd.order_detail as od left join
- (select order_id,order_number,production_id,splitting_status from sd.order_glass_detail
- GROUP BY order_id,order_number
- ) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- where od.order_id = #{orderId} and ogd.splitting_status=0
-
- group by od.order_id, ogd.production_id
- order by od.id desc
- </select>
-
- <!-- 鏇存柊鍒嗘灦鐘舵��-->
- <update id="updateDeleteState">
- update
- sd.order_glass_detail as ogd left join flow_card as fc
- on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
- set ogd.splitting_status=0
- where ogd.order_id = #{orderId}
- and ogd.production_id = left(#{processId},11)
-
- </update>
-
- <!-- 鍒犻櫎娴佺▼鍗�-->
- <update id="deleteFlowCardMp">
- delete
- from flow_card as fc
- where fc.production_id = left(#{processId},11)
- </update>
-
- <!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
-
- <!--resultMap="flowCardMap"-->
- <select id="selectNoCardMp">
-
- select od.order_number,
- od.order_number AS 'orderNumber',
- od.width,
- od.height,
- od.shape,
- od.quantity,
- od.compute_gross_area,
- p.total_thickness,
- od.quantity as baiscQuantity,
- od.compute_gross_area as 'computeGrossArea',
- p.total_thickness AS 'totalThickness',
- p.thickness,
- od.weight
- from 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
- left join sd.product as p on od.product_name = p.product_name
- where od.order_id = #{orderId}
- and ogd.production_id = #{productionId}
- and ogd.splitting_status = 0
- GROUP BY od.order_number
- order by od.id
-
- </select>
-
- <!--淇敼鎺掔増鐘舵��-->
- <update id="updateLayoutStatusMp">
- update flow_card as fc
- set fc.layout_status=#{state}
- where fc.process_id = #{processId}
- </update>
-
- <!-- 鏌ヨ瀵瑰簲娴佺▼鍗″彿鎺掔増鐘舵��-->
- <select id="selectLayoutStatus">
- select fc.layout_status
- from flow_card as fc
- where fc.process_id = #{processId}
- LIMIT 1
- </select>
-
- <!-- 鏌ヨ鎶ュ伐琛ㄥ唴鏄惁鏈夊搴旀祦绋嬪崱-->
- <select id="reportingWorkCount">
- select COUNT(rw.process_id)
- from reporting_work as rw
- where rw.process_id = #{processId}
- </select>
- <!-- 鎻掑叆Flow_card琛�-->
- <insert id="addFlowCardMp">
- insert into flow_card (order_id,
- production_id,
- process_id,
- landing_sequence,
- order_number,
- technology_number,
- quantity,
- founder,
- layers_number,
- splitFrame_time,
- create_time)
- select ogd.order_id,
- ogd.production_id,
- #{processId},
- #{landingSequence},
- ogd.order_number,
- ogd.technology_number,
- #{quantity},
- #{userName},
- #{layer},
- NOW(),
- NOW()
-
-
- from sd.order_glass_detail as ogd
- where ogd.production_id = #{productionId}
- and ogd.order_number = #{orderNumber}
- GROUP BY ogd.technology_number
- </insert>
-
- <!-- 鏇存柊鍒嗘灦鐘舵��-->
- <update id="updateFlowState">
- update sd.order_glass_detail as ogd
- set ogd.splitting_status=1
- where ogd.production_id = #{productionId}
- and ogd.order_number = #{orderNumber}
- </update>
- <!-- 鏌ヨ鏈垎鏋剁殑鏉℃暟-->
- <select id="selectFlowCount">
- select COUNT(*)
- from sd.order_glass_detail as ogd
- where ogd.order_id = left(#{productionId}, 10)
- and ogd.splitting_status = 0
- </select>
- <!-- 淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬�-->
- <update id="updateProcessingCard">
- update sd.`order` as o
- set o.processing_card=#{state}
- where o.order_id = left(#{productionId}, 10)
- </update>
-
- <!-- 鏌ヨ宸叉帓鐗堟暟鎹�-->
- <select id="selectOkSchedulingMp">
- select od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2),
- (od.quantity - IFNULL(ps.scheduling_quantity, 0)),
- round(od.width * od.height * (od.quantity - IFNULL(ps.scheduling_quantity, 0)) / 1000000, 2),
- IFNULL(ps.scheduling_quantity, 0),
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000, 2),
- od.product_name,
- od.shape
- from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
- where od.order_id = #{orderId}
- and ps.processes = #{processes}
- and ps.scheduling_id IS NOT NULL
- order by ps.id desc
- </select>
- <!-- 鏌ヨ鏈帓鐗堟暟鎹�-->
- <select id="selectNoSchedulingMp">
-
- </select>
- <!-- 棣栨鏌ヨ鎺掔増鏁版嵁-->
- <select id="selectLastSchedulingMp">
- select od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL(ps.scheduling_quantity, 0)) as pendingProductionQuantity,
- round(od.width * od.height * (od.quantity - IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- od.product_name,
- od.shape
- from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
- where od.create_time between #{selectTime1} and #{selectTime2}
- </select>
-
- <!-- 鏌ヨ瀵瑰簲搴忓彿鐨勫眰鏁�-->
- <select id="selectLayer">
- select COUNT(ogd.order_number)
- from sd.order_glass_detail as ogd
- where ogd.production_id = #{productionId}
- and ogd.order_number = #{orderNumber}
- </select>
- <!-- 鏌ヨ璇ヨ鍗曟祦绋嬪崱鏉℃暟 -->
- <select id="selectFlowCardCount">
- select COUNT(*)
- from flow_card
- where order_id = #{orderId}
- </select>
-
- <select id="flowCardDetailMp">
- select fc.order_id,
- fc.process_id,
- fc.order_number,
- fc.technology_number,
- fc.quantity,
- ogd.child_width,
- ogd.child_height,
- round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
- od.product_name,
- ogd.glass_child,
- fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
- from flow_card as fc
- left join sd.order_glass_detail as ogd
- on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
- fc.technology_number = ogd.technology_number
- left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
- where fc.process_id = #{processId}
- GROUP BY fc.order_id, fc.process_id, fc.order_number,fc.technology_number
- order by fc.order_number,fc.technology_number
- </select>
-
- <delete id="deleteReportingWork">
- delete from sd.order_process_detail
- where left(process_id,11) = left(#{processId},11)
- </delete>
-
- <select id="selectPrintFlowCardMp">
- select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
- position(#{orderId} in order_id ) and position(#{project} in project)
- and processing_card=2
- </select>
-
- <select id="selectPrintMp">
- select fc.id,
- fc.order_id,
- fc.process_id,
- o.customer_name,
- o.project,
- ogd.technology_number,
- ogd.glass_address,
- od.quantity,
- ogd.total_area,
- od.product_name,
- ogd.glass_child,
- fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
- from flow_card as fc
- left join sd.order_glass_detail as ogd
- on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
- ogd.technology_number = fc.technology_number
- left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
- left join sd.`order` as o on o.order_id = fc.order_id
- where fc.order_id = #{orderId}
- GROUP BY fc.process_id, ogd.technology_number
- order by fc.process_id, ogd.technology_number
-
- </select>
-
- <select id="getPrimaryList">
- select o.customer_name,
- o.project,
- ogd.process,
- od.edging_type,
- ogd.glass_child,
- od.product_name,
- o.processing_note,
- fc.process_id,
- SUM( od.quantity) as quantity,
- SUM(od.gross_area) as gross_area,
- SUM(od.weight) as weight,
- #{technologyNumber} as technologyNumber,
- concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
- from flow_card as fc
- left join sd.order_glass_detail as ogd
- on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
- fc.technology_number = ogd.technology_number
- left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
- left join sd.`order` as o on o.order_id = fc.order_id
- where fc.process_id = #{processId}
- and fc.technology_number = #{technologyNumber}
- group by fc.process_id, fc.technology_number
- </select>
-
- <select id="getDetailList">
- select fc.order_number,
- concat(ogd.child_width, "*", ogd.child_height) as child_width,
- od.quantity,
- ogd.total_area,
- od.perimeter,
- od.bend_radius,
- od.remarks
- from flow_card as fc
- left join sd.order_glass_detail as ogd
- on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
- fc.technology_number = ogd.technology_number
- left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
- where fc.process_id = #{processId}
- and fc.technology_number = #{technologyNumber}
- group by fc.process_id, fc.order_number
- order by fc.order_number
- </select>
-
- <select id="getProcessList">
- select *
- from sd.order_process_detail
- where process_id = #{processId}
- and technology_number = #{technologyNumber}
- group by process
- </select>
-
- <update id="updateInventory">
- update flow_card set inventory_quantity=#{completedQuantity}
- where process_id = #{processId} and order_number = #{orderNumber} and technology_number = #{technologyNumber}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml b/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
deleted file mode 100644
index 9b140eb..0000000
--- a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
+++ /dev/null
@@ -1,157 +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.PatchLogMapper">
-
-
-
- <!--鑾峰彇琛ョ墖鏁版嵁-->
- <select id="SelectReplenish" >
- select
- r.id,
- r.review_status,
- r.reporting_work_id,
- r.patch_id,
- r.process_id,
- r.order_id,
- r.order_sort,
- o.project,
- o.batch,
- od.building_number,
- od.product_name,
- r.technology_number,
- ogd.glass_address,
- r.patch_num,
- od.width,
- od.height,
- od.shape,
- r.patch_type,
- r.patch_reason,
- r.responsible_team,
- r.responsible_personnel,
- r.responsible_equipment,
- r.patch_area,
- r.quality_inspector,
- r.patch_processes,
- r.reviewer,
- date(r.create_time) as create_time,
- date(r.update_time) as update_time
- from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
- left join sd.`order` o on r.order_id = o.order_id
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
- <where>
- date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
- </where>
- order by r.review_status,r.id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="SelectReplenishPageTotal" >
- select CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
- count(zu.id) as 'total'
- from (select r.id as id
- from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
- left join sd.`order` o on r.order_id = o.order_id
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
- <where>
- date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
- </where>
- ) as zu
- limit #{offset},#{pageSize};
- </select>
-
-
-
-
- <select id="getMaximum" >
- select count(*) from pp.patch_log where date(create_time)=CURDATE()
- </select>
-
-
- <insert id="insertReplenish" useGeneratedKeys="true" >
- insert into pp.patch_log(patch_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
- responsible_personnel, patch_type, patch_reason, patch_processes, patch_num,
- patch_area,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
- values (
- #{oddNumber}, #{patchLog.reportingWorkId},#{patchLog.processId},#{patchLog.orderId},#{patchLog.orderSort},#{patchLog.technologyNumber},
- #{patchLog.responsibleTeam},#{patchLog.responsiblePersonnel},#{patchLog.patchType},#{patchLog.patchReason},
- #{patchLog.patchProcesses},#{patchLog.patchNum},#{patchLog.patchArea},#{patchLog.responsibleEquipment},#{patchLog.qualityInspector},"",0,now()
- )
- </insert>
-
- <update id="updateReplenish" >
- update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
- </update>
-
-
- <update id="updateOrderProcessDetail" >
- update sd.order_process_detail
- set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
- where order_id = #{patchLog.orderId}
- and process_id = #{patchLog.processId}
- and order_number = #{patchLog.orderSort}
- and technology_number = #{patchLog.technologyNumber}
- and id <![CDATA[<]]> (select a.opdid
- from (select id as opdid
- from sd.order_process_detail opd
- where opd.order_id = #{patchLog.orderId}
- and opd.process_id = #{patchLog.processId}
- and opd.order_number = #{patchLog.orderSort}
- and opd.technology_number = #{patchLog.technologyNumber}
- and process = #{reportingWork.thisProcess}) as a)
- </update>
-
- <update id="updateDamageDetails" >
- update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
- </update>
-
-
- <select id="getSelectReplenish">
- select date(rw.reporting_work_time) as reportingWorkTime,
- o.order_id as orderId,
- dd.reporting_work_id as reportingWorkId,
- rw.production_id as productionId,
- rw.process_id as processId,
- o.project,
- o.batch,
- dd.id as reviewer,
- od.building_number as buildingNumber,
- dd.order_number as orderSort,
- od.product_name as productName,
- dd.technology_number as technologyNumber,
- ogd.glass_address as glassAddress,
- dd.breakage_quantity-dd.quantity as patchNum,
- od.width,
- od.height,
- od.shape,
- dd.responsible_process as responsibleProcess,
- rw.this_process as patchProcesses,
- dd.breakage_quantity-dd.quantity as breakageQuantity,
- dd.return_process as patchProcesses,
- dd.breakage_reason as patchReason,
- dd.breakage_type as patchType,
- dd.responsible_personnel as responsiblePersonnel,
- dd.responsible_equipment as responsibleEquipment,
- dd.responsible_team as responsibleTeam,
- ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
- rw.quality_inspector as qualityInspector
- from pp.damage_details dd
- left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
- left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
-
- left join sd.`order` o on rw.order_id = o.order_id
- left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
-
- where dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1))
- order by dd.id desc
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ProductionScheduling.xml b/north-glass-erp/target/classes/mapper/pp/ProductionScheduling.xml
deleted file mode 100644
index 80b4bb7..0000000
--- a/north-glass-erp/target/classes/mapper/pp/ProductionScheduling.xml
+++ /dev/null
@@ -1,243 +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.ProductionSchedulingMapper">
- <resultMap id="ProductionSchedulingMap" type="com.example.erp.entity.pp.ProductionScheduling">
- <result column="processes" property="processes"/>
- <result column="scheduling_quantity" property="schedulingQuantity"/>
- <result column="order_number" property="orderNumber"/>
- <result column="scheduling_id" property="schedulingId"/>
- <result column="order_id" property="orderId"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <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="order_id" property="orderId"/>
- <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>
-
-
- </resultMap>
-
-
- <!-- 鏌ヨ宸叉帓鐗堟暟鎹�-->
- <select id="selectOkSchedulingMp">
- select date(ps.scheduled_start_time) as scheduled_start_time,
- date(ps.plan_end_time) as plan_end_time,
- od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- ps.scheduling_quantity,
- (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) as pendingProductionQuantity,
- round(od.width * od.height * (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) / 1000000,
- 2) as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- IF(ps.review_status = 0, "鏈鏍�", "宸插鏍�") as review_status,
- ps.reviewer,
- od.product_name,
- od.shape,
- ps.scheduling_id
- from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
- where ps.scheduling_id IS NOT NULL
- and od.create_time between #{selectTime1} and #{selectTime2}
- and position(#{processes} in ps.processes)
- and position(#{orderId} in ps.order_id)
- group by od.order_id, od.order_number
- order by ps.id desc
- </select>
-
- <!-- 鏌ヨ宸叉帓浜х殑鏁版嵁-->
- <select id="selectSchedulingNotMp">
- select date(ps.scheduled_start_time) as scheduled_start_time,
- date(ps.plan_end_time) as plan_end_time,
- od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- ps.scheduling_quantity,
- (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) as scheduling_quantity,
- round(od.width * od.height * (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) / 1000000, 2)
- as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000, 2)
- as productionScheduledArea,
- IF(ps.review_status = 0, "鏈鏍�", "宸插鏍�")
- as review_status,
- ps.reviewer,
- od.product_name,
- od.shape,
- ps.scheduling_id
- from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
- where (ps.scheduling_id IS NOT NULL)
- and position(#{processes} in ps.processes)
- and position(#{orderId} in ps.order_id)
- group by od.order_id, od.order_number
- order by ps.id desc
- </select>
- <!-- 鏌ヨ鏈帓浜ф暟鎹�-->
- <select id="selectNoSchedulingMp">
- select ogd.order_id,
- o.customer_name,
- o.project,
- ogd.order_number,
- ogd.technology_number,
- ogd.child_width,
- ogd.child_height,
- od.quantity,
- round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
- round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000, 2)
- as pendingProductionArea,
- IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
- round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- ogd.glass_child,
- od.shape
- from sd.order_glass_detail as ogd
-
- left join sd.order as o on ogd.order_id = o.order_id
- left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- left join sd.order_process_detail as opd on opd.order_id=ogd.order_id and opd.order_number=ogd.order_number and opd.technology_number=ogd.technology_number
- left join
- (select order_id,order_number,technology_number,SUM(scheduling_quantity) as schedulingQuantity from production_scheduling where processes=#{processes} group by order_id,order_number,technology_number) as ps on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and ps.technology_number=ogd.technology_number
-
- where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2} and opd.reporting_work_num_count=0
-
- and position(#{orderId} in ogd.order_id)
--- and position("鍒囧壊" in ps.processes)
-
- group by ogd.order_id, ogd.order_number,ogd.technology_number
- order by ogd.order_id desc
- </select>
- <!-- 棣栨鏌ヨ鎺掍骇鏁版嵁-->
- <select id="selectLastSchedulingMp">
- select ogd.order_id,
- o.customer_name,
- o.project,
- ogd.order_number,
- ogd.technology_number,
- ogd.child_width,
- ogd.child_height,
- od.quantity,
- round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
- round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000, 2)
- as pendingProductionArea,
- IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
- round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- ogd.glass_child,
- od.shape
- from sd.order_glass_detail as ogd
-
- left join sd.order as o on ogd.order_id = o.order_id
- left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- left join sd.order_process_detail as opd on opd.order_id=ogd.order_id and opd.order_number=ogd.order_number and opd.technology_number=ogd.technology_number
- left join
- (select order_id,order_number,technology_number,SUM(scheduling_quantity) as schedulingQuantity from production_scheduling where processes=#{processes} group by order_id,order_number,technology_number) as ps on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and ps.technology_number=ogd.technology_number
-
- where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2} and opd.reporting_work_num_count=0
-
- and position(#{orderId} in ogd.order_id)
--- and position("鍒囧壊" in ps.processes)
-
- group by ogd.order_id, ogd.order_number,ogd.technology_number
- order by ogd.order_id desc
- </select>
-
- <select id="selectMaxId">
- select COUNT(ps.scheduling_id)
- from `production_scheduling` as ps
- where date(ps.create_time) = curdate()
- </select>
-
- <insert id="insertSelective">
- insert into production_scheduling(scheduling_id,
- order_id,
- order_number,
- technology_number,
- processes,
- scheduling_quantity,
- scheduled_start_time,
- plan_end_time,
- notes,
- create_time)
- VALUES (#{schedulingId},
- #{orderId},
- #{orderNumber},
- #{technologyNumber},
- #{processes},
- #{schedulingQuantity},
- #{scheduledStartTime},
- #{planEndTime},
- #{notes},
- now())
- </insert>
-
- <update id="examineSchedulingMp">
- update production_scheduling
- set review_status=1,
- reviewer=#{userName}
- where scheduling_id = #{schedulingId}
- </update>
-
- <delete id="deleteSchedulingMp">
- delete
- from production_scheduling
- where scheduling_id = #{schedulingId}
- </delete>
-
- <select id="selectProcess">
- SELECT *
- FROM sd.basic_data as bd
- where bd.basic_category = 'process'
- and bd.basic_type = 'product'
- </select>
-
- <select id="selectNumberMp">
-
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
deleted file mode 100644
index fa088b6..0000000
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ /dev/null
@@ -1,367 +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>
-
- <resultMap id="damageDetailsTableMap" type="com.example.erp.entity.pp.DamageDetails">
- <result column="responsible_process" property="responsibleProcess"/>
- <result column="responsible_team" property="responsibleTeam"/>
- <result column="breakage_type" property="breakageType"/>
- <result column="breakage_reason" property="breakageReason"/>
- <result column="breakage_quantity" property="breakageQuantity"/>
- <result column="area" property="area"/>
- <result column="reporting_work_id" property="reportingWork.reportingWorkId"/>
- <result column="reporting_work_time" property="reportingWork.reportingWorkTime"/>
- <result column="this_process" property="reportingWork.thisProcess"/>
- <result column="project" property="order.project"/>
- <result column="order_id" property="order.orderId"/>
- <result column="glass_child" property="orderGlassDetail.glassChild"/>
- </resultMap>
-
-
- <resultMap id="reportMap" type="com.example.erp.entity.pp.Report">
- <result column="process_id" property="processId"/>
- <result column="customer_name" property="customerName"/>
- <result column="project" property="project"/>
- <result column="order_id" property="orderId"/>
- <result column="batch" property="batch"/>
- <result column="shape" property="shape"/>
- <result column="order_number" property="orderNumber"/>
- <result column="technology_number" property="technologyNumber"/>
- <result column="process" property="technologyFlow"/>
- <result column="quantity" property="orderNum"/>
- <result column="child_width" property="childWidth"/>
- <result column="child_height" property="childHeight"/>
- <result column="stockNum" property="stockNum"/>
- <result column="stockArea" property="stockArea"/>
- <result column="product_name" property="productName"/>
- <result column="bend_radius" property="bendRadius"/>
- </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>
-
- <select id="getProcessBreaking" resultMap="damageDetailsTableMap">
- select rw.reporting_work_id,rw.reporting_work_time,dd.responsible_process,dd.responsible_team,
- dd.breakage_type,dd.breakage_reason,ROUND((dd.breakage_quantity)) as breakage_quantity,
- round(ogd.child_width*ogd.child_height*(dd.breakage_quantity)/1000000,2) as area,rw.this_process,
- o.project,o.order_id,ogd.glass_child
- from
- damage_details as dd
- left join reporting_work as rw
- on rw.reporting_work_id=dd.reporting_work_id
- left join sd.order as o
- on rw.order_id=o.order_id
- left join sd.order_glass_detail as ogd
- on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
- and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
- and rw.this_worn_quantity>0 and dd.available=0
- and reviewed_state!=2
- and rw.this_process!=dd.responsible_process
- GROUP BY dd.id
- order by dd.id desc
- limit #{offset},#{pageSize}
- </select>
-
- <select id="getProcessBreakingTotal">
- select
- CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
- count(distinct dd.id) as 'total'
- from
- damage_details as dd
- left join reporting_work as rw
- on rw.reporting_work_id=dd.reporting_work_id
- left join sd.order as o
- on rw.order_id=o.order_id
- left join sd.order_glass_detail as ogd
- on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
- and ogd.technology_number and dd.technology_number
- where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
- and rw.this_worn_quantity>0 and dd.available=0
- and reviewed_state!=2
- and rw.this_process!=dd.responsible_process
- order by dd.id desc
- </select>
-
- <select id="workInProgressMp">
- select #{selectProcesses} as thisProcess,
- fc.process_id,
- o.customer_name,
- o.project,
- o.order_id,
- o.batch,
- od.shape,
- ogd.order_number,
- ogd.technology_number,
- ogd.process,
- od.quantity,
- ogd.child_width,
- ogd.child_height,
- odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num as stockNum,
- ROUND(ogd.child_width * ogd.child_height *
- (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num) / 1000000, 2) as stockArea,
- od.product_name,
- od.bend_radius
-
- from 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
- LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id = ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
- left join sd.order_process_detail as odpds
- ON odpds.id = odpd.id - 1
- left join
- (SELECT sum(rw.rework_num) as 'patchNumSum',
- rw.process_id,
- rw.order_sort,
- rw.technology_number,
- rwk.this_process
- from rework as rw
- LEFT JOIN
- reporting_work as rwk
- on rw.reporting_work_id = rwk.reporting_work_id
- where rwk.this_process = #{selectProcesses}
- and rw.review_status = 1
- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
- left join sd.`order` as o
- on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0
- and odpd.process = #{selectProcesses} and o.create_time between #{selectTime1} and #{selectTime2}
- and position(#{orderId} in od.order_id) and position(#{inputProject} in o.project)
-
- group by fc.process_id, fc.order_number, fc.technology_number
- order by fc.process_id, fc.order_number, fc.technology_number
- </select>
-
- <!--
- <if test="Report.processId != null and Report.processId != ''">
- and fc.process_id regexp #{Report.processId}
- </if>
- <if test="Report.customerName != null and Report.customerName != ''">
- and o.customer_name regexp #{Report.customerName}
- </if>
- <if test="Report.project != null and Report.project != ''">
- and o.project regexp #{Report.project}
- </if>
- <if test="Report.batch != null and Report.batch != ''">
- and o.batch regexp #{Report.batch}
- </if>
- <if test="Report.shape != null and Report.shape != ''">
- and od.shape regexp #{Report.shape}
- </if>
- -->
-
-<!-- <select id="getWorkInProgressTotal">-->
-<!-- select CEILING(count(fc.id) / #{pageSize}) as 'pageTotal',-->
-<!-- count(distinct fc.id) as 'total'-->
-
-<!-- from 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-->
-<!-- LEFT JOIN flow_card AS fc-->
-<!-- ON fc.order_id = ogd.order_id-->
-<!-- and fc.production_id = ogd.production_id-->
-<!-- AND fc.order_number = ogd.order_number-->
-<!-- AND fc.technology_number = ogd.technology_number-->
-<!-- left join sd.order_process_detail as odpd-->
-<!-- ON odpd.order_id = fc.order_id-->
-<!-- AND odpd.order_number = fc.order_number-->
-<!-- AND odpd.technology_number = fc.technology_number-->
-<!-- and odpd.process_id = fc.process_id-->
-<!-- left join sd.order_process_detail as odpds-->
-<!-- ON odpds.id = odpd.id - 1-->
-<!-- left join-->
-<!-- (SELECT sum(rw.rework_num) as 'patchNumSum',-->
-<!-- rw.process_id,-->
-<!-- rw.order_sort,-->
-<!-- rw.technology_number,-->
-<!-- rwk.this_process-->
-<!-- from rework as rw-->
-<!-- LEFT JOIN-->
-<!-- reporting_work as rwk-->
-<!-- on rw.reporting_work_id = rwk.reporting_work_id-->
-<!-- where rwk.this_process = #{selectProcesses}-->
-<!-- and rw.review_status = 1-->
-<!-- GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c-->
-<!-- on c.process_id = fc.process_id-->
-<!-- and c.order_sort = fc.order_number-->
-<!-- and c.technology_number = fc.technology_number-->
-<!-- left join sd.`order` as o-->
-<!-- on o.order_id = od.order_id-->
-<!-- where LENGTH(fc.process_id) = 14-->
-<!-- and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - -->
-<!-- odpd.broken_num != 0-->
-<!-- and odpd.process = #{selectProcesses}-->
-<!-- and o.create_time between #{selectTime1} and #{selectTime2}-->
-<!-- and position(#{orderId} in od.order_id)-->
-<!-- and position(#{inputProject} in o.project)-->
-<!-- group by fc.process_id, fc.order_number, fc.technology_number-->
-<!-- order by fc.process_id, fc.order_number, fc.technology_number-->
-<!-- limit #{offset},#{pageSize};-->
-<!-- </select>-->
-
- <select id="processToBeCompletedMp">
- select DATE(o.create_time) as create_time,
- DATE(o.delivery_date) as delivery_date,
- o.order_id,
- fc.process_id,
- o.customer_name,
- o.project,
- o.batch,
- od.order_number,
- ogd.technology_number,
- ogd.glass_child,
- ogd.child_width,
- ogd.child_height,
- od.quantity,
- ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
- ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
- odpd.reporting_work_num as completeNum,
- ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
- 2) as completeArea,
- od.quantity - odpd.reporting_work_num as incompleteNum,
- ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
- 2) as incompleteArea,
- od.product_name
-
- from 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
- LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id = ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
- left join sd.`order` as o
- on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
- and odpd.process = #{selectProcesses}
- and o.create_time between #{selectTime1} and #{selectTime2}
- and position(#{orderId} in od.order_id)
- and position(#{inputProject} in o.project)
- and od.quantity > odpd.reporting_work_num
-
- group by fc.process_id, fc.order_number, fc.technology_number
- order by fc.process_id, fc.order_number, fc.technology_number
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml b/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
deleted file mode 100644
index 3fbea0f..0000000
--- a/north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
+++ /dev/null
@@ -1,714 +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.ReportingWorkMapper">
- <resultMap id="reportingWorkMap" type="com.example.erp.entity.pp.ReportingWork">
- <result property="orderId" column="order_id"/>
- <result property="productionId" column="production_id"/>
- <result property="previousProcess" column="previous_process"/>
- <result property="nextProcess" column="next_process"/>
- <result property="thisProcess" column="this_process"/>
- <result property="reviewedState" column="reviewed_state"/>
- <result property="previousProcessQuantity" column="previous_process_quantity"/>
- <result property="reportingWorkTime" column="reporting_work_time"/>
- <result property="thisCompletedQuantity" column="this_completed_quantity"/>
- <result property="thisWornQuantity" column="this_worn_quantity"/>
- <result property="deviceName" column="device_name"/>
- <result property="teamsGroupsName" column="teams_groups_name"/>
- <result property="reviewedState" column="reviewed_state"/>
- <result property="reportingWorkId" column="reporting_work_id"/>
- <result property="processId" column="process_id"/>
- <result property="completedArea" column="completedArea"/>
- <result property="wornArea" column="wornArea"/>
- <result property="qualityInspector" column="quality_inspector"/>
- <result property="qualityInsTime" column="quality_ins_time"/>
-
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result property="customerId" column="customer_id"/>
- <result property="customerName" column="customer_name"/>
- <result property="project" column="project"/>
- <result property="batch" column="batch"/>
- </association>
- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
- <result property="shape" column="shape"/>
- </association>
- <association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
- <result property="orderId" column="order_id"/>
- <result property="productionId" column="production_id"/>
- </association>
- <association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
- <result property="completedQuantity" column="completed_quantity"/>
- <result property="orderNumber" column="order_number"/>
- <result property="technologyNumber" column="technology_number"/>
- </association>
- <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
- <result property="area" column="area"/>
- <result property="glassChild" column="glass_child"/>
- <result property="glassAddress" column="glass_address"/>
- <result property="childWidth" column="child_width"/>
- <result property="childHeight" column="child_height"/>
- </association>
- <association property="damageDetails" javaType="com.example.erp.entity.pp.DamageDetails">
- <result property="qualityInsStatus" column="quality_ins_status"/>
- <result property="breakageQuantity" column="breakage_quantity"/>
- <result property="available" column="available"/>
- <result property="returnProcess" column="return_process"/>
- <result property="breakageType" column="breakage_type"/>
- <result property="breakageReason" column="breakage_reason"/>
- <result property="responsibleEquipment" column="responsible_equipment"/>
- <result property="responsibleProcess" column="responsible_process"/>
- <result property="responsibleTeam" column="responsible_team"/>
- <result property="responsiblePersonnel" column="responsible_personnel"/>
- </association>
-
- </resultMap>
-
-<!-- 鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�-->
- <select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
- select o.order_id,
- fc.production_id,
- o.customer_id,
- o.customer_name,
- o.project,
- SUM(fc.quantity) as previous_process_quantity,
- #{previousProcess} as previous_process,
- #{nextProcess} as next_process,
- #{process} as this_process,
- ifnull((rw.reviewed_state),1) as reviewed_state -- 涓嬪伐搴忓鏍哥姸鎬�
- from sd.order as o
- left join flow_card as fc on fc.order_id = o.order_id
- left join (select if(count(reviewed_state)>0 and process_id=null,1,0) as reviewed_state ,
- process_id
- from reporting_work
- where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}) as rw
- on rw.process_id = fc.process_id
- where fc.process_id = #{processIdStr}
- and fc.technology_number = #{technologyStr}
- GROUP BY fc.process_id
- </select>
-
- <select id="SelectWorkBasicDeviceMp">
- SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
- on bd.id=bdp.basic_category
- where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
- </select>
-
- <select id="SelectWorkBasicTeamsMp">
- SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM sd.basic_data as bd left join `basic_data_produce` as bdp
- on bd.id=bdp.basic_category
- where bd.basic_category="process" and bdp.basic_type="teamsgroups" and bd.basic_name = #{process}
- </select>
-
- <!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
- <select id="SelectTechnologicalProcess">
- select ogd.process
- from sd.order_glass_detail as ogd
- where ogd.production_id = LEFT(#{processIdStr}, 11)
- limit 1
-
- </select>
-
- <select id="SelectWorkTechnologyMp">
- select GROUP_CONCAT(distinct fc.technology_number)
- from flow_card as fc
- where fc.process_id = #{processIdStr}
- </select>
-
-<!-- 绗竴閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
- <select id="SelectTechnologicalNumMp">
- SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
- od.shape,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num as quantity,
- fc.quantity -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
- odpd.reporting_work_num as completed,
- odpd.broken_num as onceBroken,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- FROM
- 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
- LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id=ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
- WHERE
- fc.process_id = #{processIdStr}
- AND fc.technology_number = #{technologyStr}
- AND odpd.process = #{process}
- order by fc.order_number
- </select>
-
-<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
- <select id="SelectReworlDetailMp">
- SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
- od.shape,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
- 0,
- odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
- 0,
- odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
- odpd.reporting_work_num as completed,
- odpd.broken_num as onceBroken,
- ogd.`group`,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
-
-
- FROM
- 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
- <if test="process == '澶硅兌'">
- AND ogd.`group` = (select `group`
- from sd.order_glass_detail
- where order_id = ogd.order_id
- and order_number = ogd.order_number
- and technology_number =#{technologyStr}
- limit 1)
- </if>
-
- LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id=ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
- left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
- left join sd.order_process_detail as odpds
- ON odpds.id = odpd.id-1
- left join
- (SELECT
- sum(rw.rework_num) as 'patchNumSum',
- rw.process_id,rw.order_sort,rw.technology_number,
- rwk.this_process
- from
- rework as rw
- LEFT JOIN
- reporting_work as rwk
- on rw.reporting_work_id =rwk.reporting_work_id
- where rwk.this_process=#{process}
- and rw.review_status=1
- and rw.process_id = #{processIdStr}
- GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
-
- WHERE
- fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰'">
- AND fc.technology_number = #{technologyStr}
- </if>
- AND odpd.process = #{process}
- order by fc.order_number
- </select>
-
- <select id="SelectProcessMp">
- select * from sd.basic_data where basic_type='product' and basic_category='process'
-
- </select>
-
- <select id="historyProcessMp">
- select ifnull(GROUP_CONCAT(distinct rw.this_process),'') from reporting_work as rw where rw.process_id=#{processIdStr}
- </select>
-
- <select id="historyDeviceMp">
- SELECT
- bdp.id,
- bdp.basic_type,
- bdp.basic_name,
- bd.basic_name AS basic_category
- FROM
- sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
- WHERE
- bd.basic_category = 'process'
- AND bdp.basic_type = 'device'
- AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
- </select>
-
- <select id="historyTeamsMp">
- SELECT
- bdp.id,
- bdp.basic_type,
- bdp.basic_name,
- bd.basic_name,bd.id AS basic_category,
- rw.process
- FROM
- sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp
- ON bd.id = bdp.basic_category
- right join (
- select distinct process from
- ( select distinct rw.this_process as process
- from reporting_work as rw where rw.process_id=#{processIdStr}
- UNION
- select #{process}
- ) as t
- ) as rw
- on rw.process=bd.basic_name
- WHERE
- bdp.basic_type = 'teamsgroups'
- </select>
-
- <select id="SelectHistoryProcessMp">
- SELECT
- distinct
- bd.basic_name AS basic_category
- FROM
- sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
- WHERE
- bd.basic_category = 'process'
- AND bdp.basic_type = 'teamsgroups'
- AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
- </select>
-
- <select id="selectBasicNameByType">
- select * from `basic_data_produce` as a where a.basic_type = #{type}
- </select>
-
- <select id="selectMaxReportingWorkId">
- select
- ifnull(SUBSTR(max(reporting_work_id) from 9),0)
- from
- reporting_work as a
- where
- date(a.create_time) = curdate()
- order by id desc,reporting_work_id desc limit 1
- </select>
-
- <!-- 鏌ヨ娴佺▼鍗″伐搴忔姤宸ュ彲鎶ユ暟閲�-->
- <select id="selectReportingWorkNum">
-
- </select>
- <select id="selectGlassProcessNum" resultType="java.lang.Integer">
- select
- if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)< 0,
- 0,
- (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
- )
- from flow_card as a
- left join sd.order_process_detail as b
- on
- b.order_number = a.order_number
- and b.technology_number = a.technology_number
- and b.order_id = SUBSTR(#{processId} from 1 for 10)
- and b.process = #{thisProcess}
- and b.process_id = a.process_id
- left join sd.order_process_detail as d
- on d.id=b.id-1
- left join (SELECT
- sum(rw.rework_num) as 'reworkNumSum',
- rw.process_id,rw.order_sort,rw.technology_number,
- rwk.this_process
- from
- rework as rw
- LEFT JOIN
- reporting_work as rwk
- on rw.reporting_work_id =rwk.reporting_work_id
- where rwk.this_process=#{thisProcess}
- and rw.review_status=1
- and rw.process_id = SUBSTR(#{processId} from 1 for 14)
- GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
- on c.process_id = a.process_id
- and c.order_sort = a.order_number
- and c.technology_number = a.technology_number
-
- where
- a.process_id=SUBSTR(#{processId} from 1 for 14)
- and a.order_number = #{orderNumber}
- and a.technology_number = #{technologyNumber}
- </select>
- <select id="selectFlowCardNum" resultType="java.lang.Integer">
- select
- a.quantity-b.reporting_work_num-b.broken_num+ifnull(c.patchNumSum,0)
- from flow_card as a
- left join sd.order_process_detail as b
- on
- b.order_number = a.order_number
- and b.technology_number = a.technology_number
- and b.order_id = SUBSTR(#{processId} from 1 for 10)
- and b.process = #{thisProcess}
- and b.process_id = a.process_id
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
- from patch_log
- group by order_sort,technology_number) as c
- on
- c.process_id = a.process_id
- and c.order_sort = a.order_number
- and c.technology_number = a.technology_number
-
- where
- a.process_id=SUBSTR(#{processId} from 1 for 14)
- and a.order_number = #{orderNumber}
- and a.technology_number = #{technologyNumber}
- </select>
-
-<!--鏌ヨ淇敼鎶ュ伐鏄庣粏鏁版嵁-->
- <select id="selectByReportingWorkId" >
- select
- a.reporting_work_id,
- d.order_number,
- d.glass_child,
- d.technology_number,
- d.glass_address,
- c.quantity as quantity_card,
- d.child_width,
- d.child_height,
- e.shape,
- if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
- c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
- ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
- ifnull(a.completed_quantity,0) as 'completedQuantity', -- 瀹屽伐鏁�
- ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
- ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
- if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
- <if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
- ifnull(g.completed_quantity,0) as nextQuantitySum, -- 鍚庡伐搴忓凡瀹屾垚
- if((f.completed_quantity
- -ifnull(g.completed_quantity,0))
- >=
- a.completed_quantity,
- 0,
- (a.completed_quantity-f.completed_quantity
- +ifnull(g.completed_quantity,0))
- ) as minQuantity -- 淇敼鏈�灏忔暟
- </if>
- <if test="nextProcess == null or nextProcess == ''"> -- 鏈�鍚庝竴閬撳伐搴�
-# c.received_quantity, -- 宸插叆搴撴暟閲�
-# c.inventory_quantity, -- 搴撳瓨鏁伴噺
- if(ifnull(inventory_quantity,0)
- -ifnull(c.received_quantity,0)
- >= a.completed_quantity,0,
- (a.completed_quantity-(ifnull(c.inventory_quantity,0)
- -ifnull(c.received_quantity,0)))
- )
- as minQuantity -- 淇敼鏈�灏忔暟
- </if>
- -- e.thisQuantitySum
- from reporting_work as b
-
- right join flow_card as c
- on c.process_id = b.process_id
-
- left join reporting_work_detail as a
- on a.reporting_work_id = b.reporting_work_id
- and c.order_number=a.order_number
- and c.technology_number = a.technology_number
-
- left join sd.order_glass_detail as d
- on d.order_id = c.order_id
- and c.order_number = d.order_number
- and d.technology_number = c.technology_number
- left join sd.order_detail as e
- on e.order_id = d.order_id and e.order_number = d.order_number
-
- left join (select sum(completed_quantity) as completed_quantity ,
- rw.process_id,
- rwd.order_number,
- rwd.technology_number,
- rw.this_process
- from reporting_work as rw
- left join reporting_work_detail as rwd
- on rw.reporting_work_id = rwd.reporting_work_id
- group by rw.process_id,
- rw.this_process,
- rwd.order_number,
- rwd.technology_number
- ) as f
- on f.process_id = b.process_id
- and f.this_process = b.this_process
- and f.order_number = a.order_number
- and f.technology_number = a.technology_number
- <if test="nextProcess != null and nextProcess != ''">
- left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
- rw.process_id,
- rwd.order_number,
- rwd.technology_number,
- rw.this_process
- from reporting_work as rw
- left join reporting_work_detail as rwd
- on rw.reporting_work_id = rwd.reporting_work_id
- group by rw.process_id,
- rw.this_process,
- rwd.order_number,
- rwd.technology_number
- ) as g
- on g.process_id = b.process_id
- and g.this_process = b.next_process
- and g.order_number = a.order_number
- and g.technology_number = a.technology_number
- </if>
- where b.reporting_work_id = #{reportingWorkId}
- GROUP BY c.order_number,c.technology_number
- </select>
-<select id="selectReportingWorkMp" resultMap="reportingWorkMap">
- select rw.reporting_work_id,
- (rw.reporting_work_time) as reporting_work_time,
- o.order_id,
- rw.process_id,
- o.project,
- o.batch,
- rw.this_process,
- rw.this_completed_quantity,
- round(ogd.area * rw.this_completed_quantity,2) as completedArea,
- rw.this_worn_quantity,
- round(ogd.area * rw.this_worn_quantity,2) as wornArea,
- rw.device_name,
- rw.teams_groups_name,
- rw.reviewed_state
- # (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
- from sd.order as o
- left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
- left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
- left join reporting_work_detail as rwd
- on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
- rwd.technology_number = ogd.technology_number
- where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and position(#{orderId} in rw.order_id)
- and rw.reviewed_state!=-1
- <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
- </if>
- <if test="reportingWork.orderId != null and reportingWork.orderId != ''">
- and o.order_id regexp #{reportingWork.orderId}
- </if>
- <if test="reportingWork.processId != null and reportingWork.processId != ''">
- and rw.process_id regexp #{reportingWork.processId}
- </if>
- <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
- and o.project regexp #{reportingWork.order.project}
- </if>
- <if test="reportingWork.order.batch != null and reportingWork.order.batch != ''">
- and o.batch regexp #{reportingWork.order.batch}
- </if>
- <if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
- and rw.this_process regexp #{reportingWork.thisProcess}
- </if>
- GROUP BY rw.reporting_work_id
- ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getPageTotal">
- select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
- count(distinct rw.reporting_work_id) as 'total'
- from sd.order as o
- left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
- left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
- left join reporting_work_detail as rwd
- on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
- rwd.technology_number = ogd.technology_number
- where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
- and rw.reviewed_state!=-1
- ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
- </select>
-<!-- 鏍规嵁鎶ュ伐缂栧彿鏌ヨ涓嬪伐搴�-->
- <select id="selectNextProcess">
- select next_process from reporting_work where reporting_work_id=#{reportingWorkId}
- </select>
-<!-- 鏌ヨ涓嬪伐搴忔槸鍚︽姤宸�-->
- <select id="selectCountByProcessId">
- select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
- </select>
-
-<!-- 鏌ヨ瀹屽伐娆＄牬鏁伴噺-->
- <select id="reportingWorkDate">
- select rw.process_id,
- rwd.order_number,
- rwd.technology_number,
- rwd.completed_quantity,
- IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
- from reporting_work as rw
- left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
- left join damage_details as dd
- on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
- dd.technology_number = rwd.technology_number
- where rw.reporting_work_id = #{reportingWorkId}
- GROUP BY rwd.order_number, rwd.technology_number
- </select>
-
-<!-- 淇敼鎶ュ伐娴佺▼鍗¤〃鏁版嵁-->
- <update id="updateWorkProcess">
- update sd.order_process_detail
- set reporting_work_num_count=reporting_work_num_count - #{completedQuantity},
- reporting_work_num=reporting_work_num - #{completedQuantity},
- broken_num=broken_num - #{breakageQuantity}
- where process_id = #{processId}
- and order_number = #{orderNumber}
- and technology_number = #{technologyNumber}
- and process = #{thisProcess}
- </update>
-
-<!-- 鍒犻櫎鎶ュ伐-->
- <update id="deleteWork">
- update reporting_work set reviewed_state=-1
- where reporting_work_id = #{reportingWorkId}
- </update>
-<!-- 鑾峰彇鏈�鍚庝竴閬撳伐搴�-->
- <select id="selectLastProcess">
- select process
- from sd.order_process_detail
- where process_id = #{processId}
- and technology_number = 1
- order by id desc
- LIMIT 1
- </select>
-<!-- 鏌ヨ鍙叆搴撱�佸凡鍏ュ簱鏁伴噺-->
- <select id="selectReceiptQuantity">
- select ifnull(SUM(quantity),0) as quantity,
- ifnull(SUM(inventory_quantity), 0) as inventoryQuantity,
- ifnull(SUM(received_quantity), 0) as receivedQuantity
- from flow_card
- where process_id = #{processId}
- and technology_number = 1
- GROUP BY process_id
- </select>
-<!-- 鏌ヨ鎶ュ伐缂栧彿瀹屽伐鏁伴噺-->
- <select id="selectCompletedQuantity">
- select ifnull(this_completed_quantity,0) from reporting_work where reporting_work_id=#{reportingWorkId}
- </select>
-<!-- 鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺-->
- <update id="updateInventoryQuantity">
- update flow_card
- set inventory_quantity = inventory_quantity - #{completedQuantity}
- where process_id = #{processId}
- and order_number = #{orderNumber}
- and technology_number = #{technologyNumber}
- </update>
-<!-- 璐ㄦ瀹℃牳鏌ヨ-->
- <select id="selectQualityTestingMp" resultMap="reportingWorkMap">
- select rw.reporting_work_id,
- rw.reporting_work_time,
- rw.process_id,
- o.project,
- o.customer_name,
- rw.this_process,
- ifnull(rw.this_completed_quantity,0) as this_completed_quantity,
- rw.this_worn_quantity,
- rw.teams_groups_name,
- rw.device_name,
- rw.previous_process,
- rw.next_process,
- rw.quality_inspector,
- rw.quality_ins_time,
- dd.quality_ins_status
- from sd.order as o
- left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
- left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
-
- left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
- where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and position(#{processId} in rw.process_id)
- and position(#{state} in dd.quality_ins_status)
- and rw.reviewed_state!=-1
- <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
- </if>
- <if test="reportingWork.processId != null and reportingWork.processId != ''">
- and rw.process_id regexp #{reportingWork.processId}
- </if>
- <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
- and o.project regexp #{reportingWork.order.project}
- </if>
- <if test="reportingWork.order.customerName != null and reportingWork.order.customerName != ''">
- and o.customer_name regexp #{reportingWork.order.customerName}
- </if>
- GROUP BY rw.reporting_work_id
- ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getQualityPageTotal" >
- select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
- count(distinct rw.reporting_work_id) as 'total'
- from sd.order as o
- left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
- left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
-
- left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id
- where rw.reviewed_state != 2
- and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and position(#{processId} in rw.process_id)
- and position(#{state} in dd.quality_ins_status)
- and rw.reviewed_state!=-1
- ORDER BY rw.reporting_work_id desc
- limit #{offset},#{pageSize};
- </select>
-
-<!-- 淇敼璐ㄦ鐘舵��-->
- <update id="updateQualityStatusMp">
- update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
- set dd.quality_ins_status = 2,
- rw.quality_inspector=#{username},
- rw.examine_time=NOW()
- where rw.reporting_work_id = #{reportingWorkId}
- </update>
-
-<!-- 璐ㄦ鏄庣粏鏌ヨ-->
- <select id="detailsQualityMp">
- select rwd.order_number,
- ogd.glass_child,
- rwd.technology_number,
- ogd.glass_address,
- ogd.child_width,
- ogd.child_height,
- ifnull(od.shape,'') as shape,
- rwd.completed_quantity,
- dd.breakage_quantity,
- dd.available,
- ifnull(dd.return_process,'') as return_process,
- dd.breakage_type,
- dd.breakage_reason,
- dd.responsible_equipment,
- dd.responsible_process,
- dd.responsible_team,
- ifnull(dd.responsible_personnel,'') as responsible_personnel
- from sd.order_detail as od
- left join sd.order_glass_detail as ogd
- on ogd.order_id = od.order_id and ogd.order_number = od.order_number
- left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
- left join reporting_work_detail as rwd
- on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
- rwd.technology_number = ogd.technology_number
- left join damage_details as dd
- on dd.reporting_work_id = rw.reporting_work_id and dd.order_number = rwd.order_number and
- dd.technology_number = rwd.technology_number
- where rw.reviewed_state != 2
- and rw.reporting_work_id = #{reportingWorkId}
- and rw.reviewed_state != -1
- GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
- ORDER BY rwd.order_number
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml
deleted file mode 100644
index dcdc2fb..0000000
--- a/north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml
+++ /dev/null
@@ -1,267 +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.ReportingWorkDetailMapper">
- <!--杩斿伐鏂板-->
- <resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
- <id column="id" property="id"/>
- <result column="rework_team" property="reworkTeam"/>
- <result column="breakage_quantity" property="breakageQuantity"/>
- <result column="return_process" property="returnProcess"/>
- <result column="breakage_reason" property="breakageReason"/>
- <result column="responsible_equipment" property="responsibleEquipment"/>
- <result column="responsible_team" property="responsibleTeam"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
- <result column="process_id" property="processId"/>
- </association>
-
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="order_id" property="orderId"/>
- <result column="project" property="project"/>
- <result column="batch" property="batch"/>
- </association>
-
- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
- <result column="shape" property="shape"/>
-
- </association>
-
- <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
- <result column="glass_child" property="glassChild"/>
- <result column="order_number" property="orderNumber"/>
- <result column="technology_number" property="technologyNumber"/>
- <result column="glass_address" property="glassAddress"/>
- <result column="child_height" property="childHeight"/>
-
- </association>
-
- <!-- <result column="order_id" property="orderId"/>-->
-
- </resultMap>
-
- <!--杩斿伐绠＄悊椤甸潰-->
- <resultMap id="reworkManage" type="com.example.erp.entity.pp.ReportingWorkDetail">
-
- <id column="id" property="id"/>
- <result column="rework_team" property="reworkTeam"/>
- <result column="breakage_number" property="breakageNumber"/>
- <result column="return_process" property="returnProcess"/>
- <result column="breakage_reason" property="breakageReason"/>
- <result column="breakage_type" property="breakageType"/>
- <result column="responsible_equipment" property="responsibleEquipment"/>
- <result column="responsible_team" property="responsibleTeam"/>
- <result column="rework_area" property="reworkArea"/>
- <result column="order_number" property="orderNumber"/>
- <result column="quality_inspector" property="qualityInspector"/>
-
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
- <result column="process_id" property="processId"/>
- </association>
-
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="order_id" property="orderId"/>
- <result column="project" property="project"/>
- <result column="batch" property="batch"/>
- </association>
-
- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
- <result column="shape" property="shape"/>
- </association>
-
- <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
- <result column="glass_child" property="glassChild"/>
- <!--<result column="order_number" property="orderNumber"/>-->
- <result column="technology_number" property="technologyNumber"/>
- <result column="glass_address" property="glassAddress"/>
- <result column="child_height" property="childHeight"/>
- <result column="child_width" property="childWidth"/>
-
- </association>
- <association property="OrderProcessDetail" javaType="com.example.erp.entity.sd.OrderProcessDetail">
- <result column="reporting_work_num" property="reportingWorkNum"/>
- </association>
-
-
- </resultMap>
-
- <!--鑾峰彇杩斿伐鏂板鏁版嵁-->
- <select id="queryReworkAdd" resultMap="reworkAdd">
- select * from v_rework
- <where>
- rework_team is null
-
- <if test="order_id != null and order_id != ''">
- and order_id = #{order_id}
- </if>
-
- <if test="process_id != null and process_id != ''">
- and process_id = #{process_id}
- </if>
-
- <if test="project != null and project != ''">
- and project = #{project}
- </if>
- </where>
-
- order by id desc
- limit #{pageNum},#{pageSize}
- ;
- </select>
-
-
- <!--杩斿伐绠＄悊-->
- <select id="reworkDataManage" resultMap="reworkManage">
- select * from v_rework
-
-
-
- order by id desc
- limit #{pageNum},#{pageSize}
- ;
- </select>
-
-
- <!--杩斿伐绠＄悊-->
- <select id="reworkDataManage2" resultMap="reworkManage">
- select * from v_rework
-
- <where>
-
- /*create_time <![CDATA[>=]]> #{sDate} and create_time <![CDATA[<=]]> #{eDate}}*/
- /*澶т簬绛変簬锛屽皬浜庣瓑浜�*/
- create_time >= #{sDate} and create_time <= #{eDate}}
-
- and rework_team is not null
-
- <if test="order_id != null and order_id != ''">
- and order_id = #{order_id}
- </if>
-
- <if test="process_id != null and process_id != ''">
- and process_id = #{process_id}
- </if>
-
- <if test="project != null and project != ''">
- and project = #{project}
- </if>
-
-
- </where>
-
- order by id desc
- limit #{pageNum},#{pageSize}
- ;
- </select>
-
-
-
- <!--鏌ヨdetail鏄庣粏-->
- <select id="reportingWorkId">
- select * from reporting_work_detail
- where reporting_work_id = #{reportingWorkId}
- </select>
-
- <select id="selectInventory">
- select reporting_work_num
- FROM sd.order_process_detail as opd
- where opd.process_id = #{processId}
- and opd.order_number = #{orderNumber}
- and opd.technology_number = #{technologyNumber}
- and opd.process = '鍖呰'
- </select>
- <!--<where>
-
- create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
- <!–杩斿伐缂栧彿–>
- <if test="rework_id!=null and rework != ''">
- and rework_id = #{reworkId}
- </if>
- <!–娴佺▼鍗″彿–>
- <if test="process_id != null and process_id != ''">
- and process_id=#{processId}
- </if>
- <!–杩斿伐绫诲瀷–>
- <if test="rework_Type != null and rework_Type!=''">
- and rework_Type=#{rework_Type}
- </if>
- <!–杩斿伐鍘熷洜–>
- <if test="rework_Reason != null and rework_Reason!=''">
- and rework_Reason=#{rework_Reason}
- </if>
- <!–杩斿伐宸ュ簭–>
- <if test="rework_Processes != null and rework_Processes!=''">
- and rework_Processes=#{rework_Processes}
- </if>
- <!–杩斿伐鏁伴噺–>
- <if test="rework_Num != null and rework_Num!=''">
- and rework_Num=#{rework_Num}
- </if>
- <!–杩斿伐鐝粍–>
- <if test="rework_Team != null and rework_Team!=''">
- and rework_Team=#{rework_Team}
- </if>
- <!–瀹℃牳浜�–>
- <if test="reviewer != null and reviewer!=''">
- and reviewer=#{reviewer}
- </if>
- <!–瀹℃牳鐘舵��–>
- <if test="review_Status != null and review_Status!=''">
- and review_Status=#{review_Status}
- </if>
- <!–杩斿伐闈㈢Н–>
- <if test="rework_Area != null and rework_Area!=''">
- and rework_Area=#{rework_Area}
- </if>
-
- </where>-->
-
- <!--鑾峰彇杩斿伐鏂板鏁版嵁-->
- <!--<select id="getReworkAdd">
- SELECT `b`.`id` AS `id`,
- `b`.`rework_team` AS `rework_team`,
- `c`.`order_id` AS `order_id`,
- `a`.`process_id` AS `process_id`,
- `c`.`project` AS `project`,
- `c`.`batch` AS `batch`,
- `d`.`glass_child` AS `glass_child`,
- `d`.`order_number` AS `order_Number`,
- `d`.`technology_number` AS `technology_number`,
- `d`.`glass_address` AS `glass_address`,
- `b`.`breakage_number` AS `breakage_number`,
- `d`.`child_width` AS `child_width`,
- `d`.`child_height` AS `child_height`,
- `e`.`shape` AS `shape`,
- `b`.`return_process` AS `return_process`,
- `b`.`breakage_reason` AS `breakage_reason`,
- `b`.`responsible_equipment` AS `responsible_equipment`,
- `b`.`responsible_team` AS `responsible_team`,
- round((((`d`.`child_width` * `d`.`child_height`) * `b`.`breakage_number`) / 1000000),
- 2) AS `rework_area`,
- `b`.`qualityIns_pector` AS `qualityIns_pector`
- FROM ((((
- `reporting_work_detail` `b`
- LEFT JOIN `reporting_work` `a` ON ((
- `a`.`reporting_work_id` = `b`.`reporting_work_id`
- )))
- LEFT JOIN `sd`.`order` `c` ON ((
- `a`.`order_id` = `c`.`order_id`
- )))
- LEFT JOIN `sd`.`order_detail` `e` ON (((
- `c`.`order_id` = `e`.`order_id`
- )
- AND (`e`.`order_number` = `b`.`order_number`))))
- LEFT JOIN `sd`.`order_glass_detail` `d` ON (((
- `d`.`order_id` = `c`.`order_id`
- )
- AND (`b`.`order_number` = `d`.`order_number`)
- AND (`b`.`technology_number` = `d`.`technology_number`))))
- WHERE (
- `b`.`available` = 1)
- </select>-->
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
deleted file mode 100644
index ab2fd15..0000000
--- a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
+++ /dev/null
@@ -1,135 +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.ReworkMapper">
-
-
-
- <!--鑾峰彇杩斿伐鏁版嵁-->
- <select id="SelectRework" >
- select
- r.id,
- r.review_status,
- r.rework_team,
- r.rework_id,
- r.process_id,
- r.order_id,
- r.order_sort,
- o.project,
- o.batch,
- od.product_name,
- r.technology_number,
- ogd.glass_address,
- r.rework_num,
- od.width,
- od.height,
- od.shape,
- r.rework_type,
- r.rework_reason,
- r.responsible_team,
- r.responsible_personnel,
- r.responsible_equipment,
- r.rework_area,
- r.quality_inspector,
- r.rework_processes,
- r.reviewer,
- date(r.create_time) as create_time,
- date(r.update_time) as update_time
- from pp.rework r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
- left join sd.`order` o on r.order_id = o.order_id
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
- <where>
- date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
- </where>
- order by r.review_status,r.id desc limit #{offset},#{pageSize};
- </select>
-
- <select id="SelectReworkPageTotal" >
- select CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
- count(zu.id) as 'total'
- from (select r.id as id
- from pp.rework r
- left join sd.order_detail od on r.order_id = od.order_id and r.order_sort = od.order_number
- left join sd.`order` o on r.order_id = o.order_id
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
- <where>
- date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
- </where>
- ) as zu
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectRework">
- select o.order_id as orderId,
- dd.reporting_work_id as reportingWorkId,
- rw.process_id as processId,
- o.project,
- o.batch,
- dd.id as reviewer,
- dd.order_number as orderSort,
- od.product_name as productName,
- dd.technology_number as technologyNumber,
- ogd.glass_address as glassAddress,
- dd.breakage_quantity-dd.quantity as reworkNum,
- od.width,
- od.height,
- od.shape,
- dd.breakage_quantity-dd.quantity as breakageQuantity,
- dd.return_process as reworkProcesses,
- dd.breakage_reason as reworkReason,
- dd.breakage_type as reworkType,
- dd.responsible_personnel as responsiblePersonnel,
- dd.responsible_equipment as responsibleEquipment,
- dd.responsible_team as responsibleTeam,
- ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
- rw.quality_inspector as qualityInspector
- from pp.damage_details dd
- left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
- left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id and rw.reviewed_state>0
-
- left join sd.`order` o on rw.order_id = o.order_id
- left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
- left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
- on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
-
- where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
- </select>
-
-
- <select id="getMaximum" >
- select count(*) from pp.rework where date(create_time)=CURDATE()
- </select>
-
- <select id="getMaxFlowCard" >
- select count(*) from pp.flow_card where project_no=#{processId}
- </select>
-
- <insert id="insertRework" useGeneratedKeys="true" >
- insert into pp.rework(rework_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
- responsible_personnel, rework_type, rework_reason, rework_processes, rework_num,
- rework_area, rework_team,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
- values (
- #{oddNumber}, #{rework.reportingWorkId},#{rework.processId},#{rework.orderId},#{rework.orderSort},#{rework.technologyNumber},#{rework.responsibleTeam},
- #{rework.responsiblePersonnel},#{rework.reworkType},#{rework.reworkReason},#{rework.reworkProcesses},#{rework.reworkNum},
- #{rework.reworkArea},#{rework.reworkTeam},#{rework.responsibleEquipment},#{rework.qualityInspector},'',0,now()
- )
- </insert>
-
- <update id="updateRework" >
- update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
- </update>
-
- <update id="updateDamageDetails" >
- update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
- </update>
-
-
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/WordOrder.xml b/north-glass-erp/target/classes/mapper/pp/WordOrder.xml
deleted file mode 100644
index 1de3c6f..0000000
--- a/north-glass-erp/target/classes/mapper/pp/WordOrder.xml
+++ /dev/null
@@ -1,188 +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.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"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <result column="batch" property="order.batch"/>
- <result column="order_type" property="order.orderType"/>
- <result column="project" property="order.project"/>
- <result column="area" property="order.area"/>
- <result column="creator" property="order.creator"/>
-<!-- <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="orderDetail.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"/>-->
- <result column="gross_area" property="orderDetail.grossArea"/>
-<!-- </association>-->
-
- </resultMap>
-
- <select id="selectWordOrder" resultMap="wordOrderMap">
- select
- o.order_id,
- o.batch,
- o.project,
- o.order_type,
- o.area as gross_area,
- o.quantity as quantity,
- o.creator
- from sd.order_detail as od
- left join `order` as o
- on o.order_id=od.order_id
- where o.production_order!=2 and o.order_review=2
-
- <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
- and o.order_id regexp #{orderGlassDetail.orderId}
- </if>
-
- <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
- and o.batch regexp #{orderGlassDetail.order.batch}
- </if>
- <if test="orderGlassDetail.order.project != null and orderGlassDetail.order.project!= ''">
- and o.project regexp #{orderGlassDetail.order.project}
- </if>
- <if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
- and o.order_type regexp #{orderGlassDetail.order.orderType}
- </if>
-
- <if test="orderGlassDetail.createTime != ''">
- and DATE_FORMAT((o.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,
- od.order_number,
- ogd.production_id,
- o.batch,
- o.project,
- o.order_type,
- (od.gross_area) as gross_area,
- (od.quantity) as quantity,
- o.creator,
- od.id
- from sd.order_glass_detail as ogd
- left join order_detail as od
- on od.order_id=ogd.order_id
- and ogd.order_number=od.order_number
- left join `order` as o
- on o.order_id=ogd.order_id
- where ogd.production_id IS NOT NULL
-
- <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.order.project != null and orderGlassDetail.order.project!= ''">
- and o.project regexp #{orderGlassDetail.order.project}
- </if>
- <if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
- and o.order_type regexp #{orderGlassDetail.order.orderType}
- </if>
-
- <if test="orderGlassDetail.createTime != ''">
- and DATE_FORMAT((o.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
- </if>
- group by od.id,ogd.order_id,od.order_number
- order by od.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}
- </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>
- <select id="selectProcessCard">
- select processing_card from sd.`order` where order_id = #{orderId}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/BasicDataMapper.xml b/north-glass-erp/target/classes/mapper/sd/BasicDataMapper.xml
deleted file mode 100644
index 1764398..0000000
--- a/north-glass-erp/target/classes/mapper/sd/BasicDataMapper.xml
+++ /dev/null
@@ -1,44 +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.sd.BasicDateMapper">
- <select id="getOrderBasicData">
- select
- *
- from
- basic_data as a
- where a.basic_type=#{type}
- </select>
- <select id="getOrderBasicDataByTypeAndChildType">
- select
- *
- from
- basic_data as a
- where a.basic_type=#{type} and a.basic_category = #{childType}
- </select>
-
- <select id="getOrderBasicDataType">
- select
- a.basic_category
- from
- basic_data as a
- where a.basic_type=#{type}
- group by a.basic_category
-
- </select>
-
- <select id="getBasicData">
- select * from basic_data
- order by id desc
- </select>
-
- <select id="getBasicDataFirstType">
- select * from basic_data
- group by basic_type
- </select>
- <select id="getBasicDataLastType">
- select * from basic_data
- group by basic_category
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml b/north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml
deleted file mode 100644
index 4f8836a..0000000
--- a/north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml
+++ /dev/null
@@ -1,51 +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.sd.BasicGlassTypeMapper">
- <select id="getOneLevel">
- select
- *
- from
- basic_glass_type as a
- where a.level=1
- </select>
- <select id="getTwoLevel">
- select
- *
- from
- basic_glass_type as a
- where a.level=2
- ORDER BY a.id ;
- </select>
-
- <select id="selectMaxType">
- select
- *
- from
- basic_glass_type as a
- where a.level=1
- ORDER BY a.id desc limit 1;
-
- </select>
-
- <select id="selectMaxTowLevelType">
- select
- *
- from
- basic_glass_type as a
- where
- a.level=2
- and a.belong = #{type}
-
- ORDER BY a.id desc limit 1;
- </select>
-
- <update id="updateGlassTypeName" parameterType="com.example.erp.entity.sd.BasicGlassType" >
- update
- basic_glass_type as a
- set a.type_name = #{basicGlassType.typeName}
- where a.id = #{basicGlassType.id}
- </update>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/BasicOtherMoneyMapper.xml b/north-glass-erp/target/classes/mapper/sd/BasicOtherMoneyMapper.xml
deleted file mode 100644
index 4e37293..0000000
--- a/north-glass-erp/target/classes/mapper/sd/BasicOtherMoneyMapper.xml
+++ /dev/null
@@ -1,8 +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.sd.BasicOtherMoneyMapper">
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/CustomerMapper.xml b/north-glass-erp/target/classes/mapper/sd/CustomerMapper.xml
deleted file mode 100644
index aa4a38d..0000000
--- a/north-glass-erp/target/classes/mapper/sd/CustomerMapper.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<!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.CustomerMapper">
-
- <resultMap id="selectCustomerOrderDetail" type="com.example.erp.entity.sd.OrderDetail">
-
- <result column="order_id" property="orderId"/>
- <result column="order_number" property="orderNumber"/>
- <result column="quantity" property="quantity"/>
- <result column="building_number" property="buildingNumber"/>
- <result column="product_name" property="productName"/>
- <result column="product_id" property="productId"/>
- <result column="price" property="price"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="area" property="area"/>
- <result column="shape" property="shape"/>
- <result column="gross_area" property="grossArea"/>
- <result column="compute_area" property="computeArea"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="processing_note" property="processingNote"/>
- <result column="edging_type" property="edgingType"/>
- <result column="perimeter" property="perimeter"/>
-
-
- <result column="batch" property="order.batch"/>
- <result column="project" property="order.project"/>
- <result column="customer_id" property="order.customerId"/>
- <result column="customer_name" property="order.customerName"/>
- <result column="money" property="order.money"/>
- <result column="order_type" property="order.orderType"/>
- <result column="salesman" property="order.salesman"/>
- <result column="create_time" property="order.createTime"/>
-
-
-
-
-
- </resultMap>
-
-
- <select id="getSelectCustomerOderDate" resultMap="selectCustomerOrderDetail">
- select od.order_id,
- od.order_number,
- o.project,
- od.product_id,
- od.product_name,
- o.customer_id,
- o.customer_name,
- sum(od.quantity) as quantity,
- sum(od.area) as area,
- od.shape,
- od.width,
- od.height,
- o.batch,
- o.money,
- o.order_type,
- o.salesman,
- o.create_time
- from order_detail od
- left join `order` o on o.order_id = od.order_id
- <where>
- and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and o.customer_id = #{orderDetail.order.customerId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.order.money != null and orderDetail.order.money != ''">
- and o.money regexp REGEXP_REPLACE(#{orderDetail.order.money},'\\.0+$','')
- </if>
- <if test="orderDetail.order.orderType != null and orderDetail.order.orderType != ''">
- and o.order_type regexp #{orderDetail.order.orderType}
- </if>
- <if test="orderDetail.order.salesman != null and orderDetail.order.salesman != ''">
- and o.salesman regexp #{orderDetail.order.salesman}
- </if>
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
- and od.order_number regexp #{orderDetail.orderNumber}
- </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>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
-
- </where>
- group by od.product_id, od.width, od.height
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectCustomerOderDatePageTotal" >
- select
- CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
- count(zu.id) as 'total' from (select od.product_id,od.id
- from order_detail od
- left join `order` o on o.order_id = od.order_id
- <where>
- and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- <if test="orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and o.customer_id = #{orderDetail.order.customerId}
- </if>
- <if test="orderDetail.order.project != null and orderDetail.order.project != ''">
- and o.project regexp #{orderDetail.order.project}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.order.money != null and orderDetail.order.money != ''">
- and o.money regexp REGEXP_REPLACE(#{orderDetail.order.money},'\\.0+$','')
- </if>
- <if test="orderDetail.order.orderType != null and orderDetail.order.orderType != ''">
- and o.order_type regexp #{orderDetail.order.orderType}
- </if>
- <if test="orderDetail.order.salesman != null and orderDetail.order.salesman != ''">
- and o.salesman regexp #{orderDetail.order.salesman}
- </if>
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
- and od.order_number regexp #{orderDetail.orderNumber}
- </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>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
-
- </where>
- group by od.product_id, od.width, od.height) as zu
- </select>
-
- <select id="getCustomerList">
- select
- *
- from
- sd.customer
- </select>
- <select id="getSelectCustomer">
- select
- *
- from
- sd.customer c
- <where>
- <if test="customer.id != null and customer.id != ''">
- and c.id regexp #{customer.id}
- </if>
- <if test="customer.customerName != null and customer.customerName != ''">
- and c.customer_name regexp #{customer.customerName}
- </if>
- <if test="customer.grade != null and customer.grade != ''">
- and c.grade regexp #{customer.grade}
- </if>
- <if test="customer.moneyLimit != null and customer.moneyLimit != ''">
- and c.money_limit regexp REGEXP_REPLACE(#{customer.moneyLimit},'\\.0+$','')
- </if>
- <if test="customer.address != null and customer.address != ''">
- and c.address regexp #{customer.address}
- </if>
- <if test="customer.contact != null and customer.contact != ''">
- and c.contact regexp #{customer.contact}
- </if>
- <if test="customer.phone != null and customer.phone != ''">
- and c.phone regexp #{customer.phone}
- </if>
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectCustomerPageTotal">
- select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- sd.customer c
- <where>
- <if test="customer.id != null and customer.id != ''">
- and c.id regexp #{customer.id}
- </if>
- <if test="customer.customerName != null and customer.customerName != ''">
- and c.customer_name regexp #{customer.customerName}
- </if>
- <if test="customer.grade != null and customer.grade != ''">
- and c.grade regexp #{customer.grade}
- </if>
- <if test="customer.moneyLimit != null and customer.moneyLimit != ''">
- and c.money_limit regexp REGEXP_REPLACE(#{customer.moneyLimit},'\\.0+$','')
- </if>
- <if test="customer.address != null and customer.address != ''">
- and c.address regexp #{customer.address}
- </if>
- <if test="customer.contact != null and customer.contact != ''">
- and c.contact regexp #{customer.contact}
- </if>
- <if test="customer.phone != null and customer.phone != ''">
- and c.phone regexp #{customer.phone}
- </if>
-
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <insert id="insertCustomer" useGeneratedKeys="true" >
- insert into sd.customer(customer_name,grade,money_limit,address,contact,phone)
- values (
- #{customer.customerName},#{customer.grade},#{customer.moneyLimit},
- #{customer.address},#{customer.contact},#{customer.phone}
- )
- </insert>
-
- <update id="updateCustomer" useGeneratedKeys="true" >
- update sd.customer set customer_name=#{customer.customerName},grade=#{customer.grade},
- money_limit=#{customer.moneyLimit},address= #{customer.address},
- contact=#{customer.contact},phone=#{customer.phone} where id=#{customer.id}
- </update>
-
- <delete id="deleteCustomer" >
- delete from sd.customer where id=#{customer.id}
- </delete>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/DeliveryDetailMapper.xml
deleted file mode 100644
index adf8814..0000000
--- a/north-glass-erp/target/classes/mapper/sd/DeliveryDetailMapper.xml
+++ /dev/null
@@ -1,714 +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.sd.DeliveryDetailMapper">
-
- <resultMap id="selectDeliveryFinishedGoodsInventoryOrderDetail" type="com.example.erp.entity.sd.OrderDetail">
-
- <result column="order_id" property="orderId"/>
- <result column="order_number" property="orderNumber"/>
- <result column="o_quantity" property="quantity"/>
- <result column="building_number" property="buildingNumber"/>
- <result column="product_name" property="productName"/>
- <result column="product_id" property="productId"/>
- <result column="price" property="price"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="shape" property="shape"/>
- <result column="gross_area" property="grossArea"/>
- <result column="compute_area" property="computeArea"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="processing_note" property="processingNote"/>
- <result column="edging_type" property="edgingType"/>
- <result column="perimeter" property="perimeter"/>
-
- <result column="delivery_num" property="deliveryNum"/>
-
- <result column="delivery_id" property="deliveryDetail.deliveryid"/>
-
- <result column="d_quantity" property="deliveryDetail.quantity"/>
- <result column="money" property="deliveryDetail.money"/>
- <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
- <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
-
- <result column="batch" property="order.batch"/>
- <result column="t_quantity" property="order.quantity"/>
-
-
- <result column="customer_id" property="delivery.customerId"/>
- <result column="customer_name" property="delivery.customerName"/>
- <result column="project" property="delivery.project"/>
- <result column="pay_method" property="delivery.payMethod"/>
- <result column="pay_date" property="delivery.payDate"/>
- <result column="contacts" property="delivery.contacts"/>
- <result column="contact_number" property="delivery.contactNumber"/>
- <result column="delivery_address" property="delivery.deliveryAddress"/>
- <result column="remarks" property="delivery.remarks"/>
- <result column="create_time" property="delivery.createTime"/>
- <result column="delivery_date" property="delivery.deliveryDate"/>
- <result column="creator" property="delivery.creator"/>
-
- <result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
- <result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
- <result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
-
-
- </resultMap>
-
- <resultMap id="selectDeliveryDetail" type="com.example.erp.entity.sd.DeliveryDetail">
-
- <result column="order_id" property="orderId"/>
- <result column="order_number" property="orderNumber"/>
- <result column="o_quantity" property="quantity"/>
- <result column="delivery_id" property="deliveryId"/>
- <result column="delivery_number" property="deliveryNumber"/>
- <result column="quantity" property="quantity"/>
- <result column="area" property="area"/>
- <result column="money" property="money"/>
- <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
- <result column="delivery_detail_state" property="deliveryDetailState"/>
- <result column="create_time" property="createTime"/>
-
- <result column="customer_id" property="delivery.customerId"/>
- <result column="customer_name" property="delivery.customerName"/>
- <result column="project" property="delivery.project"/>
- <result column="pay_method" property="delivery.payMethod"/>
- <result column="payment_terms" property="delivery.paymentTerms"/>
- <result column="pay_date" property="delivery.payDate"/>
- <result column="contacts" property="delivery.contacts"/>
- <result column="contact_number" property="delivery.contactNumber"/>
- <result column="delivery_address" property="delivery.deliveryAddress"/>
- <result column="delivery_date" property="delivery.deliveryDate"/>
- <result column="creator" property="delivery.creator"/>
- <result column="salesman" property="delivery.salesman"/>
-
-
-
- </resultMap>
-
- <resultMap id="selectDeliveryDetailOrderDetail" type="com.example.erp.entity.sd.DeliveryDetail">
-
- <result column="order_number" property="orderNumber"/>
- <result column="o_quantity" property="quantity"/>
- <result column="delivery_id" property="deliveryId"/>
- <result column="delivery_number" property="deliveryNumber"/>
- <result column="quantity" property="quantity"/>
- <result column="area" property="area"/>
- <result column="money" property="money"/>
- <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
- <result column="delivery_detail_state" property="deliveryDetailState"/>
- <result column="create_time" property="createTime"/>
-
- <result column="product_id" property="orderDetail.productId"/>
- <result column="product_name" property="orderDetail.productName"/>
- <result column="order_id" property="orderDetail.orderId"/>
-
-
-
-
- </resultMap>
-
- <delete id="deleteDeliveryDetail">
- delete from sd.delivery_detail where delivery_id=#{deliveryId}
- </delete>
-
- <update id="updateOrderDetailDeliveryNum">
- update sd.order_detail set delivery_num=delivery_num+#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
- </update>
-
- <update id="updateIsNotOrderDetailDeliveryNum">
- update sd.order_detail set delivery_num=delivery_num-#{quantity} where order_id=#{orderId} and order_number=#{orderNumber}
- </update>
-
- <update id="updateOrderDelivery">
- update sd.`order` set delivery=#{state} where order_id=#{orderDetail.orderId}
- </update>
-
- <select id="getdeliveryDetailmaximum" >
- select count(*) from sd.delivery_detail where delivery_id=#{deliveryId}
- </select>
-
- <select id="getIsNotDeliveryDetail" >
- select * from sd.delivery_detail where delivery_id=#{deliveryId}
- </select>
-
- <select id="getSelectDetailQuantity" >
- select quantity from sd.`order` where order_id=#{orderId}
- </select>
-
- <select id="getSelectDetailNum" >
- select sum(quantity) from sd.order_detail where order_id=#{orderId}
- </select>
-
-
- <insert id="insertDeliveryDetail" useGeneratedKeys="true" >
- insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
- area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
- values (
- #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
- #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
- #{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,#{orderDetail.otherColumns},now()
- )
- </insert>
-
-
-
- <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
- select od.order_id,
- o.batch,
- dd.delivery_number,
- fgi.quantity_available + dd.quantity as quantity_available,
- od.order_number,
- od.quantity-dd.quantity as t_quantity,
- od.quantity as o_quantity,
- dd.quantity as d_quantity,
- od.building_number,
- od.product_id,
- od.product_name,
- od.price,
- fgi.storage_region,
- dd.money,
- od.width,
- od.height,
- od.shape,
- fgi.actual_signal_area,
- od.gross_area,
- od.compute_area,
- od.compute_gross_area,
- od.processing_note,
- od.edging_type,
- od.perimeter,
- dd.delivery_detail_remakes,
- dd.other_columns
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id=d.delivery_id
- left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
- left join sd.`order` o on dd.order_id=o.order_id
- left join mm.finished_goods_inventory fgi on dd.order_id=fgi.order_id and dd.order_number=fgi.order_number
- <where>
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
- </if>
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and od.quantity regexp #{orderDetail.quantity}
- </if>
- <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
- and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </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>
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and od.price regexp #{orderDetail.price}
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
- and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
- and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and od.processing_note regexp #{orderDetail.processingNote}
- </if>
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and od.edging_type regexp #{orderDetail.edgingType}
- </if>
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and od.perimeter regexp #{orderDetail.perimeter}
- </if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
- </if>
-
- </where>
- order by dd.id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectShippingOrderDetailPageTotal">
- select
- CEILING(count(dd.id)/#{pageSize})
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id=d.delivery_id
- left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
- left join sd.`order` o on dd.order_id=o.order_id
- left join mm.finished_goods_inventory fgi on dd.order_id=fgi.order_id and dd.order_number=fgi.order_number
- <where>
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
- and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
- </if>
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and od.quantity regexp #{orderDetail.quantity}
- </if>
- <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
- and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </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>
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and od.price regexp #{orderDetail.price}
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
- and dd.money regexp REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
- and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and od.processing_note regexp #{orderDetail.processingNote}
- </if>
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and od.edging_type regexp #{orderDetail.edgingType}
- </if>
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and od.perimeter regexp #{orderDetail.perimeter}
- </if>
- <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
- select od.order_id,
- od.order_number,
- o.batch,
- fgi.quantity_available,
- od.quantity- od.delivery_num as t_quantity,
- od.quantity as o_quantity,
- fgi.quantity_available as d_quantity,
- od.building_number,
- od.product_id,
- od.product_name,
- od.price,
- fgi.storage_region,
- od.width,
- od.height,
- od.shape,
- fgi.actual_signal_area,
- od.gross_area,
- od.compute_area,
- od.compute_gross_area,
- od.processing_note,
- od.edging_type,
- od.perimeter
- from sd.order_detail od
- left join sd.`order` o on od.order_id = o.order_id
- left join mm.finished_goods_inventory fgi
- on od.order_id = fgi.order_id and od.order_number = fgi.order_number
- <where>
- fgi.quantity_available > 0 and od.quantity > od.delivery_num
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and od.quantity regexp #{orderDetail.quantity}
- </if>
- <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
- and od.delivery_num regexp #{orderDetail.deliveryNum}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </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>
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and od.price regexp REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
- and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and od.processing_note regexp #{orderDetail.processingNote}
- </if>
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and od.edging_type regexp #{orderDetail.edgingType}
- </if>
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and od.perimeter regexp #{orderDetail.perimeter}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectShippingOrderDetailsPageTotal">
- select
- CEILING(count(od.id)/#{pageSize})
- from sd.order_detail od
- left join sd.`order` o on od.order_id = o.order_id
- left join mm.finished_goods_inventory fgi
- on od.order_id = fgi.order_id and od.order_number = fgi.order_number
- <where>
- fgi.quantity_available > 0 and od.quantity > od.delivery_num
- <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
- and od.order_id regexp #{orderDetail.orderId}
- </if>
- <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and o.batch regexp #{orderDetail.order.batch}
- </if>
- <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
- </if>
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and od.quantity regexp #{orderDetail.quantity}
- </if>
- <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
- and od.delivery_num regexp #{orderDetail.deliveryNum}
- </if>
- <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
- and od.building_number regexp #{orderDetail.buildingNumber}
- </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>
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and od.price regexp REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
- </if>
- <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
- </if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
- </if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
- </if>
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and od.shape regexp #{orderDetail.shape}
- </if>
- <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
- </if>
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
- and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
- </if>
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
- </if>
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and od.processing_note regexp #{orderDetail.processingNote}
- </if>
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and od.edging_type regexp #{orderDetail.edgingType}
- </if>
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and od.perimeter regexp #{orderDetail.perimeter}
- </if>
- </where>
- limit #{offset},#{pageSize};
- </select>
-
-
- <select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">
- select dd.delivery_id,
- dd.delivery_number,
- d.payment_terms,
- d.project,
- d.customer_id,
- d.customer_name,
- d.delivery_date,
- d.pay_method,
- d.pay_date,
- d.salesman,
- d.creator,
- d.contacts,
- d.contact_number,
- d.delivery_address,
- dd.order_id,
- dd.order_number,
- dd.area,
- dd.money,
- dd.quantity,
- dd.delivery_detail_remakes,
- dd.create_time
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id=d.delivery_id
- <where>
- and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
- <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
- </if>
- <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
- and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
- </if>
- <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
- and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
- </if>
- <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
- and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
- </if>
- <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
- </if>
- <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
- </if>
- <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
- </if>
- <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
- </if>
- <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
- and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
- and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
- and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
- and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
- and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
- and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
- and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
- and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
- and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
- and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
- and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
- and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
- and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
- </if>
-
- </where>
- order by dd.delivery_id,dd.delivery_number
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectDeliveryDetailReportPageTotal">
- select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
- count(dd.id) as 'total'
- from sd.delivery_detail dd
- left join sd.delivery d on dd.delivery_id=d.delivery_id
- <where>
- and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
- <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
- </if>
- <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
- and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
- </if>
- <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
- and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
- </if>
- <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
- and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
- </if>
- <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
- and dd.area like concat('%', #{deliveryDetail.area},'%')
- </if>
- <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
- and dd.money like concat('%', #{deliveryDetail.money},'%')
- </if>
- <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
- and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
- </if>
- <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
- and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
- </if>
- <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
- and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
- and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
- and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
- and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
- and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
- and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
- and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
- and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
- and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
- and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
- and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
- and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
- </if>
- <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
- and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
- </if>
-
- </where>
- order by dd.delivery_id,dd.delivery_number
- </select>
-
- <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
- select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
- delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
-
- <where>
- <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
- </if>
- </where>
- group by od.order_id,od.product_name,od.product_id
- </select>
-
- <select id="getSelectDeliveryDetailPrinting" >
- select od.order_id,
- od.order_number,
- od.product_name,
- od.width,
- od.height,
- dd.quantity,
- dd.money,
- dd.area,
- ifnull(od.processing_note,"") as processingNote,
- ifnull(od.building_number,"") as buildingNumber,
- od.price
- from delivery_detail dd
- left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
- where delivery_id = #{deliveryId}
- and od.order_id = #{orderId}
- and od.product_id = #{productId}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/DeliveryMapper.xml b/north-glass-erp/target/classes/mapper/sd/DeliveryMapper.xml
deleted file mode 100644
index 587b1e5..0000000
--- a/north-glass-erp/target/classes/mapper/sd/DeliveryMapper.xml
+++ /dev/null
@@ -1,311 +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.sd.DeliveryMapper">
-
- <resultMap id="selectOrderInventory" type="com.example.erp.entity.sd.Order">
-
- <result column="create_order" property="createOrder"/>
- <result column="process_review" property="processReview"/>
- <result column="order_review" property="orderReview"/>
- <result column="production_order" property="productionOrder"/>
- <result column="processing_card" property="processingCard"/>
- <result column="warehousing" property="warehousing"/>
- <result column="delivery" property="delivery"/>
- <result column="order_id" property="orderId"/>
- <result column="customer_id" property="customerId"/>
- <result column="customer_name" property="customerName"/>
- <result column="quantity" property="quantity"/>
- <result column="project" property="project"/>
- <result column="batch" property="batch"/>
- <result column="money" property="money"/>
- <result column="area" property="area"/>
- <result column="create_time" property="createTime"/>
- <result column="pack_type" property="packType"/>
- <result column="order_type" property="orderType"/>
- <result column="creator" property="creator"/>
- <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>
-
- <update id="updatedelivery">
- update sd.delivery set area=#{area},quantity=#{quantity},money=#{money},other_money=#{otherMoney} 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>
-
-
- <insert id="insertDelivery" useGeneratedKeys="true" >
- insert into sd.delivery(delivery_state,stock_state,payment_terms,delivery_id,order_id,project,customer_id,customer_name,
- delivery_date,pay_method,pay_date,salesman_id,salesman,creator_id,creator,contacts,contact_number,delivery_address,
- area,quantity,money,remarks,create_time)
- values (
- 0,0,#{delivery.paymentTerms},#{number} ,#{orderId},#{delivery.project},#{delivery.customerId},#{delivery.customerName},#{delivery.deliveryDate},#{delivery.payMethod},
- #{delivery.payDate},#{delivery.salesmanId},#{delivery.salesman},#{delivery.creatorId},#{delivery.creator},#{delivery.contacts},#{delivery.contactNumber},#{delivery.deliveryAddress},
- 0,0,0,#{delivery.remarks},now()
- )
- </insert>
-
- <select id="getSelectOrderInventory" resultMap="selectOrderInventory">
- 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) as quantity_available,
- o.project,
- o.batch,
- o.money,
- o.area,
- o.create_time,
- o.pack_type,
- o.order_type,
- o.creator
- from sd.`order` o
- left join mm.finished_goods_inventory fgi on o.order_id = fgi.order_id
- <where>
- fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- <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.quantity != null and order.quantity != ''">
- and o.quantity REGEXP #{order.quantity}
- </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.money != null and order.money != ''">
- and o.money REGEXP REGEXP_REPLACE(#{order.money},'\\.0+$','')
- </if>
- <if test="order.area != null and order.area != ''">
- and o.area REGEXP REGEXP_REPLACE(#{order.area},'\\.0+$','')
- </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.creator != null and order.creator != ''">
- and o.creator REGEXP #{order.creator}
- </if>
- <if test="order.createTime != null and order.createTime != ''">
- and o.create_time REGEXP #{order.createTime}
- </if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
- </if>
- </where>
- group by o.order_id order by o.id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectOrderInventoryPageTotal" >
- 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,
- o.money,o.area,o.create_time,o.pack_type,o.order_type,o.creator
- from sd.`order` o left join mm.finished_goods_inventory fgi on o.order_id=fgi.order_id
- <where>
- fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- <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.quantity != null and order.quantity != ''">
- and o.quantity REGEXP #{order.quantity}
- </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.money != null and order.money != ''">
- and o.money REGEXP REGEXP_REPLACE(#{order.money},'\\.0+$','')
- </if>
- <if test="order.area != null and order.area != ''">
- and o.area REGEXP REGEXP_REPLACE(#{order.area},'\\.0+$','')
- </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.creator != null and order.creator != ''">
- and o.creator REGEXP #{order.creator}
- </if>
- <if test="order.createTime != null and order.createTime != ''">
- and o.create_time REGEXP #{order.createTime}
- </if>
- <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
- </if>
- </where>
- group by o.order_id limit #{offset},#{pageSize}) as zu;
-
-
-
-
- </select>
-
- <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,
- d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id
- from sd.delivery d
- <where>
- <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
- and d.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
- </if>
-
- </where>
- limit 0,1
- </select>
-
- <select id="getSelectShippingOrderDetailDeliveryPrinting" >
- select
- d.delivery_id,d.quantity,d.money,d.area,d.project,
- d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
- d.delivery_address,d.remarks,d.create_time,d.delivery_date,d.creator,d.salesman,d.salesman_id
- from sd.delivery d
- <where>
- <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
- and d.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
- </if>
-
- </where>
- </select>
-
-
- <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}
- </if>
-
- </where>
- limit 0,1
- </select>
-
- <select id="getSelectShippingOrder">
- select * from sd.delivery d
- <where>
- date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
- <if test="delivery.deliveryId != null and delivery.deliveryId != ''">
- and d.delivery_id regexp #{delivery.deliveryId}
- </if>
- <if test="delivery.creator != null and delivery.creator != ''">
- and d.creator regexp #{delivery.creator}
- </if>
- <if test="delivery.deliveryDate != null and delivery.deliveryDate != ''">
- and d.delivery_date regexp #{delivery.deliveryDate}
- </if>
- <if test="delivery.customerId != null and delivery.customerId != ''">
- and d.customer_id regexp #{delivery.customerId}
- </if>
- <if test="delivery.customerName != null and delivery.customerName != ''">
- and d.customer_name regexp #{delivery.customerName}
- </if>
- <if test="delivery.project != null and delivery.project != ''">
- and d.project regexp #{delivery.project}
- </if>
- <if test="delivery.orderId != null and delivery.orderId != ''">
- and d.order_id regexp #{delivery.orderId}
- </if>
- <if test="delivery.payMethod != null and delivery.payMethod != ''">
- and d.pay_method regexp #{delivery.payMethod}
- </if>
- <if test="delivery.quantity != null and delivery.quantity != ''">
- and d.quantity regexp #{delivery.quantity}
- </if>
- <if test="delivery.area != null and delivery.area != ''">
- and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
- </if>
-
- </where>
- order by d.id desc
- limit #{offset},#{pageSize};
- </select>
-
- <select id="getSelectShippingOrderPageTotal">
- select
- 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) <= #{endDate}
- <if test="delivery.deliveryId != null and delivery.deliveryId != ''">
- and d.delivery_id regexp #{delivery.deliveryId}
- </if>
- <if test="delivery.creator != null and delivery.creator != ''">
- and d.creator regexp #{delivery.creator}
- </if>
- <if test="delivery.deliveryDate != null and delivery.deliveryDate != ''">
- and d.delivery_date regexp #{delivery.deliveryDate}
- </if>
- <if test="delivery.customerId != null and delivery.customerId != ''">
- and d.customer_id regexp #{delivery.customerId}
- </if>
- <if test="delivery.customerName != null and delivery.customerName != ''">
- and d.customer_name regexp #{delivery.customerName}
- </if>
- <if test="delivery.project != null and delivery.project != ''">
- and d.project regexp #{delivery.project}
- </if>
- <if test="delivery.orderId != null and delivery.orderId != ''">
- and d.order_id regexp #{delivery.orderId}
- </if>
- <if test="delivery.payMethod != null and delivery.payMethod != ''">
- and d.pay_method regexp #{delivery.payMethod}
- </if>
- <if test="delivery.quantity != null and delivery.quantity != ''">
- and d.quantity regexp #{delivery.quantity}
- </if>
- <if test="delivery.area != null and delivery.area != ''">
- and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
- </if>
- </where>
- limit #{offset},#{pageSize};
-</select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/DeliveryOtherMoneyMapper.xml b/north-glass-erp/target/classes/mapper/sd/DeliveryOtherMoneyMapper.xml
deleted file mode 100644
index 4b98a04..0000000
--- a/north-glass-erp/target/classes/mapper/sd/DeliveryOtherMoneyMapper.xml
+++ /dev/null
@@ -1,28 +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.sd.DeliveryOtherMoneyMapper">
- <select id="findById">
- select
- a.*,
- b.alias
- from sd.delivery_other_money as a
- left join sd.basic_other_money as b
- on a.`column` = b.`column`
- where a.delivery_id = #{deliveryId}
- </select>
-
- <insert id="insertDeliveryOtherMoney" useGeneratedKeys="true">
- insert into sd.delivery_other_money(delivery_id, `column`, quantity, price, money, create_time)
- values
- (#{deliveryOtherMoney.deliveryId},#{deliveryOtherMoney.column},#{deliveryOtherMoney.quantity},
- #{deliveryOtherMoney.price},#{deliveryOtherMoney.money},now())
- </insert>
-
- <delete id="deleteDeliveryOtherMoney">
- delete from sd.delivery_other_money where delivery_id = #{deliveryId}
- </delete>
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderDetailMapper.xml
deleted file mode 100644
index f5cbe6d..0000000
--- a/north-glass-erp/target/classes/mapper/sd/OrderDetailMapper.xml
+++ /dev/null
@@ -1,414 +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.sd.OrderDetailMapper">
- <insert id="insertBatch" parameterType="java.util.List">
- INSERT INTO
- order_detail (order_id,
- order_number,
- building_number,
- product_id,
- product_name,
- price,
- quantity,
- gross_amount,
- width,
- height,
- shape,
- area,
- gross_area,
- compute_area,
- compute_gross_area,
- processing_note,
- remarks,
- bend_radius,
- edging_type,
- weight,
- perimeter,
- other_columns
- )
- values
- <foreach collection ="orderDetails" item="orderDetail" separator =",">
- (#{orderDetail.orderId},
- #{orderDetail.orderNumber},
- #{orderDetail.buildingNumber},
- #{orderDetail.productId},
- #{orderDetail.productName},
- #{orderDetail.price},
- #{orderDetail.quantity},
- #{orderDetail.grossAmount},
- #{orderDetail.width},
- #{orderDetail.height},
- #{orderDetail.shape},
- #{orderDetail.area},
- #{orderDetail.grossArea},
- #{orderDetail.computeArea},
- #{orderDetail.computeGrossArea},
- #{orderDetail.processingNote},
- #{orderDetail.remarks},
- #{orderDetail.bendRadius},
- #{orderDetail.edgingType},
- #{orderDetail.weight},
- #{orderDetail.perimeter},
- #{orderDetail.otherColumns}
- )
- </foreach>
- </insert>
-
- <update id="updateOrderMoney" parameterType="java.util.List">
- <foreach collection="orderDetails" item="item" index="index" open="" close="" separator=";">
- update order_detail as a
- set
- a.price = #{item.price},
- a.gross_amount = #{item.grossAmount}
- where
- a.order_id = #{item.orderId} and
- a.order_number = #{item.orderNumber}
-
- </foreach>
-
- </update>
-
- <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
- <result column="order_number" property="orderNumber"/>
-
- <result column="product_id" property="productId"/>
- <result column="product_name" property="productName"/>
- <result column="price" property="price"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="quantity" property="quantity"/>
- <result column="bend_radius" property="bendRadius"/>
- <result column="gross_area" property="grossArea"/>
- <result column="compute_gross_area" property="computeGrossArea"/>
- <result column="shape" property="shape"/>
- <result column="edging_type" property="edgingType"/>
- <result column="processing_note" property="processingNote"/>
- <result column="remarks" property="remarks"/>
- <result column="perimeter" property="perimeter"/>
- <result column="gross_amount" property="grossAmount"/>
- <result column="levelOne" property="levelOne"/>
- <result column="levelTwo" property="levelTwo"/>
- <result column="total_thickness" property="totalThickness"/>
- <result column="createTime" property="createTime"/>
-
- <result column="order_type" property="order.orderType"/>
- <result column="customer_name" property="order.customerName"/>
- <result column="project" property="order.project"/>
- <result column="order_id" property="order.orderId"/>
- <result column="batch" property="order.batch"/>
- <result column="b.processing_note" property="order.processingNote"/>
- <result column="icon" property="order.icon"/>
- <result column="packType" property="order.packType"/>
- <result column="salesman" property="order.salesman"/>
- <result column="delivery_address" property="order.deliveryAddress"/>
- <result column="creator" property="order.creator"/>
- <result column="verifier" property="order.verifier"/>
- <result column="customer_batch" property="order.customerBatch"/>
-
- </resultMap>
-
-
- <select id="getOrderReport" resultMap="orderMap">
- SELECT
- *,
- a.create_time as createTime,
- d.type_name as levelOne,
- e.type_name as levelTwo
- from order_detail as a
- left join sd.`order` as b
- on b.order_id = a.order_id
- left join sd.product as c
- on c.id = a.product_id
- left join sd.basic_glass_type as d
- on d.type_id = c.type_id
- left join sd.basic_glass_type as e
- on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
-
- <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
- and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.project != null and orderDetail.order.project != ''">
- and b.project like concat('%',#{orderDetail.order.project},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.orderId != null and orderDetail.order.orderId != ''">
- and b.order_id like concat('%',#{orderDetail.order.orderId},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and b.batch like concat('%',#{orderDetail.order.batch},'%')
- </if>
-
- <if test="orderDetail.productId != null and orderDetail.productId != ''">
- and a.product_id like concat('%',#{orderDetail.productId},'%')
- </if>
-
- <if test="orderDetail.productName != null and orderDetail.productName != ''">
- and a.product_name like concat('%',#{orderDetail.productName},'%')
- </if>
-
- <if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
- and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
- </if>
-
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and a.width like concat('%',#{orderDetail.width},'%')
- </if>
-
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and a.height like concat('%',#{orderDetail.height},'%')
- </if>
-
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and a.quantity like concat('%',#{orderDetail.quantity},'%')
- </if>
-
- <if test="orderDetail.bendRadius != null and orderDetail.bendRadius != ''">
- and a.bend_radius like concat('%',#{orderDetail.bendRadius},'%')
- </if>
-
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and a.gross_area like concat('%',#{orderDetail.grossArea},'%')
- </if>
-
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and a.compute_gross_area like concat('%',#{orderDetail.computeGrossArea},'%')
- </if>
-
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and a.shape like concat('%',#{orderDetail.shape},'%')
- </if>
-
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and a.edging_type like concat('%',#{orderDetail.edgingType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.processingNote != null and orderDetail.order.processingNote != ''">
- and b.processing_note like concat('%',#{orderDetail.order.processingNote},'%')
- </if>
-
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and a.processing_note like concat('%',#{orderDetail.processingNote},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.icon != null and orderDetail.order.icon != ''">
- and b.icon like concat('%',#{orderDetail.order.icon},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.packType != null and orderDetail.order.packType != ''">
- and b.pack_type like concat('%',#{orderDetail.order.packType},'%')
- </if>
-
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and a.perimeter like concat('%',#{orderDetail.perimeter},'%')
- </if>
-
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and a.price like concat('%',#{orderDetail.price},'%')
- </if>
-
- <if test="orderDetail.grossAmount != null and orderDetail.grossAmount != ''">
- and a.gross_amount like concat('%',#{orderDetail.grossAmount},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.alType != null and orderDetail.order.alType != ''">
- and b.al_type like concat('%',#{orderDetail.order.alType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.salesman != null and orderDetail.order.salesman != ''">
- and b.salesman like concat('%',#{orderDetail.order.salesman},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.deliveryAddress != null and orderDetail.order.deliveryAddress != ''">
- and b.delivery_address like concat('%',#{orderDetail.order.deliveryAddress},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.creator != null and orderDetail.order.creator != ''">
- and b.creator like concat('%',#{orderDetail.order.creator},'%')
- </if>
-
- <if test="orderDetail.totalThickness != null and orderDetail.totalThickness != ''">
- and c.total_thickness like concat('%',#{orderDetail.totalThickness},'%')
- </if>
-
- <if test="orderDetail.levelOne != null and orderDetail.levelOne != ''">
- and d.type_name like concat('%',#{orderDetail.levelOne},'%')
- </if>
-
- <if test="orderDetail.levelTwo != null and orderDetail.levelTwo != ''">
- and e.type_name like concat('%',#{orderDetail.levelTwo},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
- and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
- </if>
- order by a.id desc
- limit #{offset},#{pageSize}
- </select>
- <select id="getOrderReportTotal" >
- SELECT
- CEILING(count(a.id)/#{pageSize}) as 'pageTotal',
- count(a.id) as 'total'
- from order_detail as a
- left join sd.`order` as b
- on b.order_id = a.order_id
- left join sd.product as c
- on c.id = a.product_id
- left join sd.basic_glass_type as d
- on d.type_id = c.type_id
- left join sd.basic_glass_type as e
- on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
- <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
- and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
- and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.project != null and orderDetail.order.project != ''">
- and b.project like concat('%',#{orderDetail.order.project},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.orderId != null and orderDetail.order.orderId != ''">
- and b.order_id like concat('%',#{orderDetail.order.orderId},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.batch != null and orderDetail.order.batch != ''">
- and b.batch like concat('%',#{orderDetail.order.batch},'%')
- </if>
-
- <if test="orderDetail.productId != null and orderDetail.productId != ''">
- and a.product_id like concat('%',#{orderDetail.productId},'%')
- </if>
-
- <if test="orderDetail.productName != null and orderDetail.productName != ''">
- and a.product_name like concat('%',#{orderDetail.productName},'%')
- </if>
-
- <if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
- and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
- </if>
-
- <if test="orderDetail.width != null and orderDetail.width != ''">
- and a.width like concat('%',#{orderDetail.width},'%')
- </if>
-
- <if test="orderDetail.height != null and orderDetail.height != ''">
- and a.height like concat('%',#{orderDetail.height},'%')
- </if>
-
- <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
- and a.quantity like concat('%',#{orderDetail.quantity},'%')
- </if>
-
- <if test="orderDetail.bendRadius != null and orderDetail.bendRadius != ''">
- and a.bend_radius like concat('%',#{orderDetail.bendRadius},'%')
- </if>
-
- <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
- and a.gross_area like concat('%',#{orderDetail.grossArea},'%')
- </if>
-
- <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
- and a.compute_gross_area like concat('%',#{orderDetail.computeGrossArea},'%')
- </if>
-
- <if test="orderDetail.shape != null and orderDetail.shape != ''">
- and a.shape like concat('%',#{orderDetail.shape},'%')
- </if>
-
- <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
- and a.edging_type like concat('%',#{orderDetail.edgingType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.processingNote != null and orderDetail.order.processingNote != ''">
- and b.processing_note like concat('%',#{orderDetail.order.processingNote},'%')
- </if>
-
- <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
- and a.processing_note like concat('%',#{orderDetail.processingNote},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.icon != null and orderDetail.order.icon != ''">
- and b.icon like concat('%',#{orderDetail.order.icon},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.packType != null and orderDetail.order.packType != ''">
- and b.pack_type like concat('%',#{orderDetail.order.packType},'%')
- </if>
-
- <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
- and a.perimeter like concat('%',#{orderDetail.perimeter},'%')
- </if>
-
- <if test="orderDetail.price != null and orderDetail.price != ''">
- and a.price like concat('%',#{orderDetail.price},'%')
- </if>
-
- <if test="orderDetail.grossAmount != null and orderDetail.grossAmount != ''">
- and a.gross_amount like concat('%',#{orderDetail.grossAmount},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.alType != null and orderDetail.order.alType != ''">
- and b.al_type like concat('%',#{orderDetail.order.alType},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.salesman != null and orderDetail.order.salesman != ''">
- and b.salesman like concat('%',#{orderDetail.order.salesman},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.deliveryAddress != null and orderDetail.order.deliveryAddress != ''">
- and b.delivery_address like concat('%',#{orderDetail.order.deliveryAddress},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.creator != null and orderDetail.order.creator != ''">
- and b.creator like concat('%',#{orderDetail.order.creator},'%')
- </if>
-
- <if test="orderDetail.totalThickness != null and orderDetail.totalThickness != ''">
- and c.total_thickness like concat('%',#{orderDetail.totalThickness},'%')
- </if>
-
- <if test="orderDetail.levelOne != null and orderDetail.levelOne != ''">
- and d.type_name like concat('%',#{orderDetail.levelOne},'%')
- </if>
-
- <if test="orderDetail.levelTwo != null and orderDetail.levelTwo != ''">
- and e.type_name like concat('%',#{orderDetail.levelTwo},'%')
- </if>
-
- <if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
- and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
- </if>
- order by a.id desc
- </select>
-
- <select id="exportOrderReport">
- SELECT
- *,
- a.create_time as createTime,
- d.type_name as levelOne,
- e.type_name as levelTwo
- from order_detail as a
- left join sd.`order` as b
- on b.order_id = a.order_id
- left join sd.product as c
- on c.id = a.product_id
- left join sd.basic_glass_type as d
- on d.type_id = c.type_id
- left join sd.basic_glass_type as e
- on e.type_id = d.belong
-
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
deleted file mode 100644
index fe328f7..0000000
--- a/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
+++ /dev/null
@@ -1,146 +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.sd.OrderGlassDetailMapper">
-
- <insert id="insertOrderGlassDetail" parameterType="java.lang.String">
- insert into
- order_glass_detail (
- order_id, order_number,
- technology_number,
- glass_address,
- glass_child,
- child_width,
- child_height,
- area,
- total_area,
-
- process,
- `group`)
- select
- od.order_id,
- od.order_number,
- pd.glass_sort,
- if(pd.glass_sort=1,'(澶�)',if(pd2.glass_sort=pd.glass_sort,'(鍐�)','')),
- pd.detail,
- if( od.bend_radius!='',
- round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,0),
- od.width
- ),
- od.height,
- od.area,
- od.gross_area,
- pd.process,
- pd.glass_group
- from sd.product_detail as pd
- left join order_detail as od
- on od.product_id = pd.prod_id and pd.detail_type='glass'
- LEFT JOIN (SELECT max(id) as id ,max(glass_sort) as glass_sort from product_detail GROUP BY prod_id)as pd2
- on pd2.id=pd.id
- left join (
- select
- a.prod_id,
- a.sort_num,
- a.glass_sort,
- (case
- when a.sort_num=1
- then left(detail,LOCATE('mm',detail)-1)/2
- else
- left(detail,LOCATE('mm',detail)-1)
- end) as 'thicknessCount'
-
- from product_detail as a
- group by prod_id,a.sort_num
- ) as t
- ON t.prod_id = od.product_id and t.sort_num <=pd.sort_num
-
-
- where od.order_id = #{orderId}
- group by od.order_number,pd.glass_sort
- ORDER BY od.order_number
- </insert>
-
- <select id="selectOrderGlassDetail">
- select * from order_glass_detail where order_id = #{orderId}
- </select>
-
- <resultMap id="orderGlassDetailMap" type="com.example.erp.entity.sd.OrderGlassDetail" >
- <id column="id" property="id"/>
- <result column="order_id" property="orderId"/>
- <result column="order_number" property="orderNumber"/>
- <result column="glass_address" property="glassAddress"/>
- <result column="technology_number" property="technologyNumber"/>
- <result column="glass_child" property="glassChild"/>
- <result column="child_width" property="childWidth"/>
- <result column="child_height" property="childHeight"/>
- <result column="icon" property="icon"/>
- <result column="process" property="process"/>
- <result column="area" property="area"/>
- <result column="total_area" property="totalArea"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
-
- <result column="building_number" property="buildingNumber"/>
- <result column="product_name" property="productName"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="shape" property="shape"/>
- <result column="edging_type" property="edgingType"/>
- <result column="quantity" property="quantity"/>
- <result column="processing_note" property="processingNote"/>
- <result column="beizhu" property="remarks"/>
-
- </association>
-
- </resultMap>
-
- <select id="selectOrderGlassDetailByOrderId" resultMap="orderGlassDetailMap">
- select
- a.order_id,
- a.order_number,
- b.building_number,
- b.product_name,
- a.glass_address,
- a.technology_number,
- a.glass_child,
- b.width,
- b.height,
- b.shape,
- a.total_area,
- b.edging_type,
- a.child_width,
- a.child_height,
- a.icon,
- a.area,
- b.quantity,
- a.process,
- b.remarks as 'beizhu',
- 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
- where a.order_id = #{orderId}
- order by a.order_number,a.technology_number
- </select>
-
- <update id="updateSizeAndProcess" parameterType="java.util.List">
- <foreach collection="orderGlassDetails" item="item" index="index" open="" close="" separator=";">
- update order_glass_detail as a,
- order_detail as b
- set
- a.child_width = #{item.childWidth},
- a.child_height = #{item.childHeight},
- a.area = #{item.area},
- a.total_area = #{item.area}*b.quantity,
- a.icon = #{item.icon},
- a.process = #{item.process}
- where
- a.order_id = b.order_id
- and a.order_id = #{item.orderId}
- and a.order_number = #{item.orderNumber}
- and a.technology_number = #{item.technologyNumber}
- </foreach>
-
- </update>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
deleted file mode 100644
index 93a2ab0..0000000
--- a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
+++ /dev/null
@@ -1,207 +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.sd.OrderMapper">
- <select id="selectMaxOrderId">
- select
- ifnull(SUBSTR(max(order_id) from 9),0)
- from
- `order` as a
- where
- date(a.create_time) = curdate()
- order by id desc,order_id desc limit 1
- </select>
-
-
- <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)
- where
- o.order_id = #{orderId}
-
- </update>
-
- <select id="getOrderList">
- select
- *,
- ifnull(sum(fgi.quantity_available),0) as goodsQuantity
- from
- `order` as o
- left join mm.finished_goods_inventory 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 != ''">
- 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.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>
- group by o.id
- order by o.id desc
- limit #{offset},#{pageSize}
- </select>
-
- <select id="getPageTotal">
- select
- CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
- count(o.id) as 'total'
- from
- `order` as o
- where date (o.create_time)>=#{startDate} and date(o.create_time) <= #{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 #{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.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>
- order by o.id desc
- limit #{offset},#{pageSize}
- </select>
-
- <update id="reviewOrderById">
- update `order` set order_review = #{status} 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} 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>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderOtherMoneyMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderOtherMoneyMapper.xml
deleted file mode 100644
index 57fe496..0000000
--- a/north-glass-erp/target/classes/mapper/sd/OrderOtherMoneyMapper.xml
+++ /dev/null
@@ -1,23 +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.sd.OrderOtherMoneyMapper">
- <select id="findById">
- select
- a.order_id,
- a.`column`,
- a.quantity,
- a.price,
- a.money,
- a.create_time,
- b.alias,
- b.id
- from order_other_money as a
- left join basic_other_money as b
- on a.`column` = b.`column`
- where a.order_id = #{orderId}
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml
deleted file mode 100644
index a3773ea..0000000
--- a/north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml
+++ /dev/null
@@ -1,125 +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.sd.OrderProcessDetailMapper">
-
- <insert id="insertOrderProcessDetail" >
- insert into
- order_process_detail(
- order_id,
- order_number,
- technology_number,
- process,
- process_id
- )
- values
- <foreach collection ="processDetailList" item="processDetail" separator =",">
- (
- #{processDetail.orderId},
- #{processDetail.orderNumber},
- #{processDetail.technologyNumber},
- #{processDetail.process},
- #{processDetail.processId}
- )
- </foreach>
-
-
- </insert>
- <update id="updateQuantity">
- update sd.order_process_detail as a
- inner join
- (select
- rwd.completed_quantity,
- rwd.breakage_quantity,
- rw.process_id,
- rwd.order_number,
- rwd.technology_number
- from pp.reporting_work_detail as rwd
- left join pp.reporting_work as rw
- on rwd.reporting_work_id = rw.reporting_work_id
- where rwd.reporting_work_id =#{reportingWorkId} ) as b
- on a.process_id = b.process_id
- and a.order_number = b.order_number
- and a.technology_number = b.technology_number
-
- <if test="type == 'delete'">
- set a.reporting_work_num_count
- = a.reporting_work_num_count-b.completed_quantity,
-
- a.reporting_work_num
- = a.reporting_work_num-b.completed_quantity,
-
- a.broken_num
- = a.broken_num-b.breakage_quantity
- </if>
-
- <if test="type == 'add'">
- set a.reporting_work_num_count
- = a.reporting_work_num_count+b.completed_quantity,
-
- a.reporting_work_num
- = a.reporting_work_num+b.completed_quantity,
-
- a.broken_num
- = a.broken_num+b.breakage_quantity
- </if>
-
- where a.process = #{process}
-
- </update>
-
- <!--鏌ヨ绛涢�夊悗鍞竴鐨勬祦绋嬪崱鍙�-->
- <select id="filterOrderProcess">
- select id,process,order_number,technology_number
- from order_process_detail
- where order_id = #{orderId}
- group by process
-
- </select>
-
- <select id="filterLastProcess">
- select id,process,order_number,technology_number
- from order_process_detail
- where order_id = #{orderId}
- and order_number = #{orderNumber}
- and technology_number = #{technologyNumber}
- and id > #{id}
- group by process
- </select>
-
-
-
- <select id="getGlassLRow">
- select
- max(a.technology_number) as rowCount,
- RowNum
- from order_process_detail as a
- left join
- (select min((@i:=@i+1)) AS RowNum,c.*
- from sd.order_glass_detail as c,
- (SELECT @i:=-1) as d
- where order_id = #{orderId}
- GROUP BY order_number
- ) as b
- on b.order_number = a.order_number
- where a.order_id = #{orderId}
- group by a.order_number
-
- </select>
- <update id="insertByReportingWorkDetail">
- update sd.order_process_detail as a
- set
- a.reporting_work_num_count=
- a.reporting_work_num_count+#{reportingWorkDetail.completedQuantity},
- a.reporting_work_num =a.reporting_work_num +#{reportingWorkDetail.completedQuantity},
- a.broken_num =a.broken_num +#{reportingWorkDetail.breakageQuantity}
-
- where
- a.process_id = #{processId}
- and a.order_number= #{reportingWorkDetail.orderNumber}
- and a.technology_number= #{reportingWorkDetail.technologyNumber}
- and a.process=#{thisProcess}
-
- </update>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/ProductDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/ProductDetailMapper.xml
deleted file mode 100644
index 042d336..0000000
--- a/north-glass-erp/target/classes/mapper/sd/ProductDetailMapper.xml
+++ /dev/null
@@ -1,28 +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.sd.ProductDetailMapper">
- <select id="getGlassDetailList">
- select * from product_detail where prod_id = #{productId} and detail_type = 'glass'
- </select>
-
- <insert id="insertList">
- insert into product_detail (
- prod_id, sort_num, glass_sort, detail_type, detail, glass_group, process,separation
- )
- values
- <foreach collection ="getProductDetails" item="ProductDetail" separator =",">
- (
- #{ProductDetail.prodId},
- #{ProductDetail.sortNum},
- #{ProductDetail.glassSort},
- #{ProductDetail.detailType},
- #{ProductDetail.detail},
- #{ProductDetail.glassGroup},
- #{ProductDetail.process},
- #{ProductDetail.separation}
- )
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml b/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml
deleted file mode 100644
index c1956ba..0000000
--- a/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml
+++ /dev/null
@@ -1,110 +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.sd.ProductMapper">
- <resultMap id="productMap" type="com.example.erp.entity.sd.Product" >
- <id column="id" property="id"/>
- <result column="product_name" property="productName"/>
- <result column="product" property="productName"/>
- <result column="total_thickness" property="totalThickness"/>
- <result column="thickness" property="thickness"/>
- <result column="query" property="query"/>
- <result column="remarks" property="remarks"/>
- <result column="state" property="state"/>
- <result column="creator" property="creator"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
- <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
- <result column="type_id" property="typeId"/>
- <result column="type_name" property="typeName"/>
- </association>
-
- <!--<result column="g_typeId" property="glassTypes.typeId"/>
- <result column="g_type" property="glassTypes.type"/>-->
-
- </resultMap>
-
- <select id="defaultProduct" resultMap="productMap">
- select a.id ,
- a.product_name,
- a.total_thickness,
- a.thickness,
- a.query,
- a.remarks,
- a.state,
- a.creator,
- date(a.create_time) as create_time,
- a.update_time as update_time,
- a.type_id as type_id,
- bgt.type_name
- from product as a
- left join basic_glass_type bgt on bgt.type_id = a.type_id
- <where>
- <if test="glassTypeId != null and glassTypeId != ''">
- and a.type_id regexp #{glassTypeId}
- </if>
- <if test="product.id != null and product.id != ''">
- and a.id regexp #{product.id}
- </if>
- <if test="product.productName != null and product.productName != ''">
- and a.product_name regexp #{product.productName}
- </if>
- <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
- and bgt.type_name regexp #{product.basicGlassType.typeName}
- </if>
- <if test="product.query != null and product.query != ''">
- and a.query regexp #{product.query}
- </if>
- <if test="product.creator != null and product.creator != ''">
- and a.creator regexp #{product.creator}
- </if>
- <if test="product.createTime != null and product.createTime != ''">
- and date(a.create_time) regexp #{product.createTime}
- </if>
- </where>
-
- order by id desc
- limit #{offset},#{pageSize}
- ;
- </select>
-
- <select id="getPageTotal" >
- select
- CEILING(count(a.id)/#{pageSize})
- from product as a
- left join basic_glass_type bgt on bgt.type_id = a.type_id
- <where>
- <if test="glassTypeId != null and glassTypeId != ''">
- and a.type_id regexp #{glassTypeId}
- </if>
- <if test="product.id != null and product.id != ''">
- and a.id regexp #{product.id}
- </if>
- <if test="product.productName != null and product.productName != ''">
- and a.product_name regexp #{product.productName}
- </if>
- <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
- and bgt.type_name regexp #{product.basicGlassType.typeName}
- </if>
- <if test="product.query != null and product.query != ''">
- and a.query regexp #{product.query}
- </if>
- <if test="product.creator != null and product.creator != ''">
- and a.creator regexp #{product.creator}
- </if>
- <if test="product.createTime != null and product.createTime != ''">
- and date(a.create_time) regexp #{product.createTime}
- </if>
- </where>
-
- order by a.id desc
- limit #{offset},#{pageSize}
- ;
- </select>
-
- <update id="updateProductStateById">
- update product set state = #{state} where id = #{id}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml b/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
deleted file mode 100644
index 9625f33..0000000
--- a/north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml
+++ /dev/null
@@ -1,69 +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.userInfo.PermissionRoleMapper">
- <select id="getUserPermission">
- select
- concat(
- if(d.page=null || d.page='','',concat(d.page, '.')),
- d.permission
- ) as 'permission'
- from user as a
- left join user_role as e
- on e.user_id = a.id
- left join role as b
- on e.role_id = b.id
- left join permission_role as c
- on b.id = c.role_id
- left join permission_basic d
- on d.id = c.permission_id
- where a.id = #{loginId}
- and d.state = 1
- </select>
-
- <select id="getUserEditPermission">
- select
- concat(
- if(d.page=null || d.page='','',concat(d.page, '.')),
- d.permission
- ) as 'permission'
- <if test="loginId!=1">
- from user as a
- left join user_role as e
- on e.user_id = a.id
- left join role as b
- on e.role_id = b.id
- left join permission_role as c
- on b.id = c.role_id
- left join permission_basic d
- on d.id = c.permission_id
- and d.permission='edit'
- where a.id = #{loginId}
-
- </if>
- <if test="loginId==1">
- from permission_basic d
- where d.permission='edit'
- </if>
- and d.state = 1
- group by d.id
- </select>
-
- <insert id="saveBatch">
- insert into
- permission_role(
- role_id,
- permission_id
- )
- values
- <foreach collection ="permissionRoles" item="permissionRole" separator =",">
- (
- #{permissionRole.roleId},
- #{permissionRole.permissionId}
- )
- </foreach>
-
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/SysError.xml b/north-glass-erp/target/classes/mapper/userInfo/SysError.xml
deleted file mode 100644
index 4765569..0000000
--- a/north-glass-erp/target/classes/mapper/userInfo/SysError.xml
+++ /dev/null
@@ -1,12 +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.userInfo.SysErrorMapper">
- <insert id="saveError">
- insert into erp_user_info.sys_error( func, error)
- values
- (#{sysError.func}, #{sysError.error})
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/SysMenu.xml b/north-glass-erp/target/classes/mapper/userInfo/SysMenu.xml
deleted file mode 100644
index df037a3..0000000
--- a/north-glass-erp/target/classes/mapper/userInfo/SysMenu.xml
+++ /dev/null
@@ -1,16 +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.userInfo.SysMenuMapper">
- <select id="findAll">
- select a.id,
- a.menuName
- from sys_menu as a
- where
- a.state=1
- and a.languageType = #{lang}
- order by a.listSort
- ;
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/SysMenuItem.xml b/north-glass-erp/target/classes/mapper/userInfo/SysMenuItem.xml
deleted file mode 100644
index fed0668..0000000
--- a/north-glass-erp/target/classes/mapper/userInfo/SysMenuItem.xml
+++ /dev/null
@@ -1,17 +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.userInfo.SysMenuItemMapper">
- <select id="findAll">
- select
- *
- from `sys_menu_item` as a
- where
- a.state=1
- and a.languageType = #{lang}
- order by
- a.menuId,a.listSort
- ;
- </select>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/userInfo/User.xml b/north-glass-erp/target/classes/mapper/userInfo/User.xml
deleted file mode 100644
index 1120d54..0000000
--- a/north-glass-erp/target/classes/mapper/userInfo/User.xml
+++ /dev/null
@@ -1,69 +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.userInfo.UserMapper">
- <resultMap id="findAllMap" type="com.example.erp.entity.userInfo.User">
- <id property="id" column="id"/>
- <result property="loginName" column="login_name"/>
- <result property="userName" column="user_name"/>
- <result property="createTime" column="create_time"/>
-
- <collection property="userRoleList" ofType="com.example.erp.entity.userInfo.UserRole">
- <result property="userId" column="user_id"/>
- <result property="roleId" column="role_id"/>
- <result property="role" column="role"/>
- </collection>
- </resultMap>
-
-
- <select id="findAll" resultMap="findAllMap">
- SELECT a.*,
- b.role_id,
- c.role
- FROM erp_user_info.user as a
- left join user_role as b
- on a.id = b.user_id
- left join role as c
- on b.role_id = c.id
- where state =1 and a.id != 1
- </select>
-
- <select id="findOne" >
- SELECT *
- FROM erp_user_info.user
- where id=#{id}
- </select>
-
- <select id="findOneLoginName" >
- SELECT *
- FROM erp_user_info.user
- where login_name=#{LoginName}
- </select>
-
- <insert id="register" useGeneratedKeys="true" keyProperty="id">
- insert erp_user_info.user
- (password,user_name)
- values (
- #{password} ,#{userName}
- )
- </insert>
-
- <select id="getUserRole">
- SELECT
- c.role
- from
- user as a
- left join user_role as b
- on a.id = b.user_id
- left join role as c
- on b.role_id = c.id
- where a.id = #{loginId}
-
- </select>
- <update id="userDelete">
- update user
- set state =0
- where id = #{id}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
deleted file mode 100644
index 2f998ae..0000000
--- a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
+++ /dev/null
Binary files differ
diff --git a/north-glass-erp/target/maven-archiver/pom.properties b/north-glass-erp/target/maven-archiver/pom.properties
deleted file mode 100644
index edd1503..0000000
--- a/north-glass-erp/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=erp
-groupId=com.example
-version=0.0.1-SNAPSHOT
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 6498f50..0000000
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,158 +0,0 @@
-com\example\erp\service\sd\DeliveryService.class
-com\example\erp\mapper\pp\BasicDateProduceMapper.class
-com\example\erp\entity\sd\Returns.class
-com\example\erp\entity\sd\DeliveryOtherMoney.class
-com\example\erp\entity\sd\Product.class
-com\example\erp\service\pp\ReportService.class
-com\example\erp\service\sd\BasicGlassTypeServise.class
-com\example\erp\service\sd\ProductService.class
-com\example\erp\entity\mm\FinishedOperateLog.class
-com\example\erp\service\sd\DeliveryService$1.class
-com\example\erp\service\userInfo\UserService.class
-com\example\erp\service\pp\ReplenishService.class
-com\example\erp\entity\sd\OrderDetail.class
-com\example\erp\config\MyCorsConfig$1.class
-com\example\erp\controller\sd\BasicOtherMoneyController.class
-com\example\erp\controller\pp\ProductionSchedulingController.class
-com\example\erp\service\sd\OrderProcessDetailService.class
-com\example\erp\entity\mm\MaterialOutboundDetail.class
-com\example\erp\controller\pp\ReworkController.class
-com\example\erp\entity\pp\DamageDetails.class
-com\example\erp\entity\pp\OptimizeUse.class
-com\example\erp\mapper\mm\BasicWarehouseTypeMapper.class
-com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.class
-com\example\erp\mapper\sd\DeliveryOtherMoneyMapper.class
-com\example\erp\service\IOrderService.class
-com\example\erp\service\pp\ReportingWorkService.class
-com\example\erp\tools\DownExcel.class
-com\example\erp\mapper\sd\BasicDateMapper.class
-com\example\erp\controller\pp\ReplenishController.class
-com\example\erp\mapper\sd\OrderGlassDetailMapper.class
-com\example\erp\entity\pp\WorkprogressMonthlySettlement.class
-com\example\erp\entity\mm\FinishedGoodsInventory.class
-com\example\erp\entity\sd\BasicOtherMoney.class
-com\example\erp\mapper\sd\DeliveryDetailMapper.class
-com\example\erp\config\MybatisPlusConfig.class
-com\example\erp\entity\mm\BasicWarehouseType.class
-com\example\erp\config\InterceptorConfig.class
-com\example\erp\entity\mm\MaterialStore.class
-com\example\erp\controller\sd\ProductController.class
-com\example\erp\entity\sd\GlassType.class
-com\example\erp\mapper\sd\OrderMapper.class
-com\example\erp\controller\pp\ReportController.class
-com\example\erp\service\mm\BasicWarehouseTypeService.class
-com\example\erp\entity\sd\OrderOtherMoney.class
-com\example\erp\mapper\OrderTestMapper.class
-com\example\erp\mapper\mm\MaterialStoreMapper.class
-com\example\erp\service\pp\ProductionSchedulingService.class
-com\example\erp\service\userInfo\SysMenuService.class
-com\example\erp\exception\GlobalExceptionHandle.class
-com\example\erp\entity\pp\SetupBom.class
-com\example\erp\entity\sd\Customer.class
-com\example\erp\entity\userInfo\SysMenu.class
-com\example\erp\entity\sd\Delivery.class
-com\example\erp\controller\pp\BasicDataProduceController.class
-com\example\erp\config\WebSocketConfig.class
-com\example\erp\controller\dto\UserDTO.class
-com\example\erp\service\pp\WorkOrderService.class
-com\example\erp\mapper\mm\FinishedOperateLogMapper.class
-com\example\erp\mapper\pp\DeviceMaintenanceMapper.class
-com\example\erp\controller\pp\ReportingWorkController.class
-com\example\erp\mapper\pp\ReportingWorkDetailMapper.class
-com\example\erp\service\sd\BasicDateService.class
-com\example\erp\entity\OrderTest.class
-com\example\erp\service\pp\FlowCardService.class
-com\example\erp\mapper\pp\PatchLogMapper.class
-com\example\erp\service\userInfo\SysMenuItemService.class
-com\example\erp\entity\pp\ReportingWorkDetail.class
-com\example\erp\controller\sd\DeliveryController.class
-com\example\erp\entity\mm\ReturningWarehouseDetail.class
-com\example\erp\service\impl\OrderServiceImpl.class
-com\example\erp\entity\sd\ProductDetail.class
-com\example\erp\mapper\pp\ReworkMapper.class
-com\example\erp\config\MyCorsConfig.class
-com\example\erp\controller\sd\BasicGlassTypeController.class
-com\example\erp\mapper\pp\FlowCardMapper.class
-com\example\erp\mapper\userInfo\SysMenuItemMapper.class
-com\example\erp\controller\userInfo\SysMenuController.class
-com\example\erp\entity\mm\ReturningWarehouse.class
-com\example\erp\entity\sd\Order.class
-com\example\erp\entity\sd\BasicGlassType.class
-com\example\erp\entity\sd\OrderGlassDetail.class
-com\example\erp\entity\userInfo\SysError.class
-com\example\erp\entity\userInfo\User.class
-com\example\erp\mapper\pp\ProductionSchedulingMapper.class
-com\example\erp\controller\sd\BasicDataController.class
-com\example\erp\entity\pp\BaseBom.class
-com\example\erp\mapper\userInfo\SysErrorMapper.class
-com\example\erp\service\mm\FinishedGoodsInventoryService.class
-com\example\erp\entity\mm\MaterialInventory.class
-com\example\erp\entity\sd\ReturnsDetail.class
-com\example\erp\controller\pp\DeviceMaintenanceController.class
-com\example\erp\entity\sd\OrderProcessDetail.class
-com\example\erp\config\SwaggerConfig.class
-com\example\erp\controller\pp\ProcessCardController.class
-com\example\erp\service\pp\ReportWorkService.class
-com\example\erp\controller\mm\FinishedGoodsInventoryController.class
-com\example\erp\service\pp\ReworkService.class
-com\example\erp\service\pp\DeviceMaintenanceService.class
-com\example\erp\service\userInfo\SysErrorService.class
-com\example\erp\ErpApplication.class
-com\example\erp\tools\netty\NettyServer.class
-com\example\erp\exception\ServiceException.class
-com\example\erp\common\interceptor\JwtInterceptor.class
-com\example\erp\entity\pp\Rework.class
-com\example\erp\service\mm\MaterialStoreService.class
-com\example\erp\entity\pp\ReportingWork.class
-com\example\erp\tools\netty\MyWebSocketHandler.class
-com\example\erp\entity\mm\MaterialOutbound.class
-com\example\erp\mapper\sd\OrderOtherMoneyMapper.class
-com\example\erp\controller\sd\OrderController.class
-com\example\erp\mapper\pp\ReportMapper.class
-com\example\erp\entity\pp\BasicDataProduce.class
-com\example\erp\controller\pp\ReportWorkController.class
-com\example\erp\service\sd\OrderService$1.class
-com\example\erp\entity\pp\PatchLog.class
-com\example\erp\mapper\pp\WorkOrderMapper.class
-com\example\erp\controller\sd\CustomerController.class
-com\example\erp\entity\pp\ProductionScheduling.class
-com\example\erp\common\CacheUtil.class
-com\example\erp\service\sd\BasicOtherMoneyService.class
-com\example\erp\entity\pp\OrderBom.class
-com\example\erp\mapper\sd\DeliveryMapper.class
-com\example\erp\controller\mm\BasicWarehouseTypeController.class
-com\example\erp\service\sd\OrderService.class
-com\example\erp\mapper\sd\CustomerMapper.class
-com\example\erp\tools\netty\MyChannelHandlerPool.class
-com\example\erp\controller\userInfo\UserController.class
-com\example\erp\mapper\userInfo\UserMapper.class
-com\example\erp\service\pp\BasicDateProduceService.class
-com\example\erp\tools\WebSocketServer.class
-com\example\erp\mapper\sd\ProductMapper.class
-com\example\erp\common\Result.class
-com\example\erp\service\sd\CustomerService.class
-com\example\erp\controller\mm\MaterialInventoryController.class
-com\example\erp\mapper\pp\DamageDetailsMapper.class
-com\example\erp\mapper\sd\OrderProcessDetailMapper.class
-com\example\erp\entity\pp\Device.class
-com\example\erp\tools\WebSocketServerPool.class
-com\example\erp\controller\OrderTestController.class
-com\example\erp\mapper\sd\BasicOtherMoneyMapper.class
-com\example\erp\mapper\userInfo\SysMenuMapper.class
-com\example\erp\tools\TokenTools.class
-com\example\erp\controller\mm\MaterialStoreController.class
-com\example\erp\mapper\sd\OrderDetailMapper.class
-com\example\erp\service\mm\MaterialInventoryService.class
-com\example\erp\controller\userInfo\SysMenuItemController.class
-com\example\erp\mapper\sd\ProductDetailMapper.class
-com\example\erp\entity\pp\FlowCard.class
-com\example\erp\common\Constants.class
-com\example\erp\controller\pp\WorkOrderController.class
-com\example\erp\entity\pp\DeviceMaintenance.class
-com\example\erp\tools\netty\NettyServer$1.class
-com\example\erp\mapper\mm\MaterialInventoryMapper.class
-com\example\erp\entity\userInfo\SysMenuItem.class
-com\example\erp\mapper\pp\ReportingWorkMapper.class
-com\example\erp\entity\sd\BasicData.class
-com\example\erp\entity\sd\DeliveryDetail.class
-com\example\erp\mapper\sd\BasicGlassTypeMapper.class
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 4d4748f..0000000
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,174 +0,0 @@
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\PatchLog.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\BasicDateProduceService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MybatisPlusConfig.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\DeviceMaintenanceController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\GlassType.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\PermissionBasicController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OptimizeUse.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\interceptor\JwtInterceptor.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\WorkOrderMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\WorkprogressMonthlySettlement.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DeviceMaintenance.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenu.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\OrderTestMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReworkController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\RoleController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Rework.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\CustomerService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialStoreMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BaseBom.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ProductionScheduling.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicGlassType.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\SetupBom.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServer.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\ProductController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\User.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserRoleController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\FinishedGoodsInventoryService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicDateService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\Role.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicDataController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Delivery.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\PermissionRoleMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Customer.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ReportingWork.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ProductionSchedulingMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuItemController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ReportingWorkDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportingWorkController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\FinishedGoodsInventory.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicData.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicGlassTypeController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\impl\OrderServiceImpl.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderProcessDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\UserMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysMenuItemService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysErrorService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ProductionSchedulingController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedOperateLogMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\FlowCardMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicOtherMoneyController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\TokenTools.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialInventoryController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportWorkController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialStore.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenuItem.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\DeliveryController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\RoleMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\WorkOrderController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderGlassDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReplenishService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\FlowCardService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReworkService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\OrderTest.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderOtherMoney.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportWorkService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicDateMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\OrderController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Result.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Returns.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysMenuService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\DeliveryOtherMoney.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\WorkOrderService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialStoreService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\PermissionRoleController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\dto\UserDTO.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportingWorkService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ProductDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\PermissionRoleService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouseDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\BasicWarehouseTypeService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderProcessDetailService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryOtherMoneyMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserRoleService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialInventoryMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\RoleService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyWebSocketHandler.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\FlowCard.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\PermissionBasicMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\DeviceMaintenanceService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysError.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\ServiceException.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyChannelHandlerPool.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicOtherMoney.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\InterceptorConfig.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BasicDataProduce.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicGlassTypeServise.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserInfoController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutbound.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialInventoryService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\UserRole.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MyCorsConfig.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SwaggerConfig.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Device.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\ProductService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OrderBom.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialStoreController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Order.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ProductionSchedulingService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServerPool.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\IOrderService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderGlassDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ProcessCardController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuItemMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\CacheUtil.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\FinishedGoodsInventoryController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicOtherMoneyMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicGlassTypeMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Constants.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\PatchLogMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Report.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysErrorMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\DownExcel.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\DeliveryDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\BasicWarehouseTypeController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DamageDetailsMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\FinishedOperateLog.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DamageDetails.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ReturnsDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\UserRoleMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\ErpApplication.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderOtherMoneyMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\WebSocketConfig.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\BasicDataProduceController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SaTokenConfigure.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\BasicDateProduceMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\StpInterfaceImpl.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReworkMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\CustomerMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\NettyServer.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\PermissionBasic.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialInventory.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouse.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderProcessDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\PermissionBasicService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicOtherMoneyService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\CustomerController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DeviceMaintenanceMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\GlobalExceptionHandle.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\DeliveryService.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\OrderTestController.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\PermissionRole.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\BasicWarehouseTypeMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutboundDetail.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Product.java
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index be867d2..0000000
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-com\example\erp\service\pp\ReworkServiceTest.class
-com\example\erp\ErpApplicationTests.class
-com\example\erp\service\IOrderServiceTest.class
-com\example\erp\service\sd\BasicDateServiceTest.class
-com\example\erp\service\sd\OrderServiceTest.class
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index 9845b69..0000000
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\pp\ReworkServiceTest.java
-D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\ErpApplicationTests.java
-D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\sd\OrderServiceTest.java
-D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\sd\BasicDateServiceTest.java
-D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\IOrderServiceTest.java
--
Gitblit v1.8.0