From 034f66c1861761fea6cf553ff4ff2c9fd564b763 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 09 四月 2024 08:20:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/.idea/dataSources.local.xml | 2
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 2
north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java | 2
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue | 10 +++
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 12 +++
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 6 +-
north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml | 56 ++++++++++++++++--
north-glass-erp/target/classes/mapper/sd/OrderDetail.xml | 52 ++++++++++++++++-
8 files changed, 125 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/.idea/dataSources.local.xml b/north-glass-erp/.idea/dataSources.local.xml
index 0c4acb4..3fa20a7 100644
--- a/north-glass-erp/.idea/dataSources.local.xml
+++ b/north-glass-erp/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="dataSourceStorageLocal" created-in="IU-232.8660.185">
+ <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
<data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
<database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
<extra-name-characters>#@</extra-name-characters>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 66dbf68..2b482a9 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -20,6 +20,7 @@
const route = useRoute()
const xGrid = ref()
let cellArea = ref()
+const shapeList = ref(['鏅舰','寮傚舰'])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -120,7 +121,11 @@
{field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'computeGrossArea',width:200, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'shape',width:120, title: t('order.shape'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'shape',width:120,
+ title: t('order.shape'),
+ editRender: { name: 'input'},
+ filters:[{ data: '' }],
+ slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
{field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -801,6 +806,11 @@
<vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
+ <template #shape_edit="{ row }">
+ <vxe-select v-model="row.shape" transfer>
+ <vxe-option v-for="item in shapeList" :key="item" :value="item" :label="item" />
+ </vxe-select>
+ </template>
</vxe-grid>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index 73b4227..cfb1107 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -1,5 +1,15 @@
<script setup>
import BasicTable from "@/components/BasicTable.vue"
+import request from "@/utils/request"
+import {ref} from "vue"
+const selectData = ref(["",""])
+let data = ref({})
+request.post(`/order/getOrderReport/1/100/${selectData.value}`,data.value).then(res => {
+ if(res.code === '200'){
+ console.log(res.data)
+ }
+})
+
</script>
<template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index ebe6735..702efcb 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -3,7 +3,7 @@
import {useRouter} from "vue-router"
import {computed, reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
- import request from "@/utils/request";
+ import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {VXETable} from "vxe-table"
diff --git a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
index 31546df..9e02bbb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
+++ b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
@@ -33,7 +33,7 @@
String uri = request.uri();
Map paramMap=getUrlParams(uri);
- System.out.println("鎺ユ敹鍒扮殑鍙傛暟鏄細"+paramMap);
+ //System.out.println("鎺ユ敹鍒扮殑鍙傛暟鏄細"+paramMap);
//濡傛灉url鍖呭惈鍙傛暟锛岄渶瑕佸鐞�
if(uri.contains("?")){
String newUri=uri.substring(0,uri.indexOf("?"));
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 70dfae6..3778507 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -63,7 +63,7 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
+
from
flow_card as c
left join
@@ -96,8 +96,8 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
-
+
where a.order_id = #{orderId}
-
+
</select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
index bae8967..03429e3 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
@@ -67,12 +67,56 @@
</foreach>
</update>
-
-<!-- <select id="getOrderReport">-->
-<!-- SELECT *-->
-<!-- from order_detail as a-->
-<!-- left join sd.`order` o on o.id = a.order_id-->
-<!-- </select>-->
+ <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="order_number" property="orderNumber"/>
+
+ <result column="order_number" property="productId"/>
+ <result column="order_number" property="productName"/>
+ <result column="order_number" property="width"/>
+ <result column="order_number" property="height"/>
+ <result column="order_number" property="quantity"/>
+ <result column="order_number" property="bendRadius"/>
+ <result column="order_number" property="grossArea"/>
+ <result column="order_number" property="computeGrossArea"/>
+ <result column="order_number" property="shape"/>
+ <result column="order_number" property="edgingType"/>
+ <result column="order_number" property="processingNote"/>
+ <result column="order_number" property="remarks"/>
+ <result column="order_number" property="perimeter"/>
+ <result column="order_number" property="grossAmount"/>
+
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="order_type" property="orderType"/>
+
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="icon" property="icon"/>
+ <result column="packType" property="packType"/>
+ <result column="salesman" property="salesman"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="creator" property="creator"/>
+ <result column="verifier" property="verifier"/>
+ <result column="customer_batch" property="customerBatch"/>
+
+
+ </association>
+
+ </resultMap>
+
+
+ <select id="getOrderReport" resultMap="orderMap">
+ SELECT
+ *
+ from order_detail as a
+ left join sd.`order` as b
+ on b.order_id = a.order_id
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ limit #{offset},#{pageSize}
+
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
index 7ec4d2d..03429e3 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
@@ -67,11 +67,55 @@
</foreach>
</update>
-
- <select id="getOrderReport">
+
+ <resultMap id="orderMap" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="order_number" property="orderNumber"/>
+
+ <result column="order_number" property="productId"/>
+ <result column="order_number" property="productName"/>
+ <result column="order_number" property="width"/>
+ <result column="order_number" property="height"/>
+ <result column="order_number" property="quantity"/>
+ <result column="order_number" property="bendRadius"/>
+ <result column="order_number" property="grossArea"/>
+ <result column="order_number" property="computeGrossArea"/>
+ <result column="order_number" property="shape"/>
+ <result column="order_number" property="edgingType"/>
+ <result column="order_number" property="processingNote"/>
+ <result column="order_number" property="remarks"/>
+ <result column="order_number" property="perimeter"/>
+ <result column="order_number" property="grossAmount"/>
+
+ <association property="order" javaType="com.example.erp.entity.sd.Order">
+ <result column="order_type" property="orderType"/>
+
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="batch" property="batch"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="icon" property="icon"/>
+ <result column="packType" property="packType"/>
+ <result column="salesman" property="salesman"/>
+ <result column="delivery_address" property="deliveryAddress"/>
+ <result column="creator" property="creator"/>
+ <result column="verifier" property="verifier"/>
+ <result column="customer_batch" property="customerBatch"/>
+
+
+ </association>
+
+ </resultMap>
+
+
+ <select id="getOrderReport" resultMap="orderMap">
SELECT
- from order_detail as a
- left join sd.`order` o on o.id = a.order_id
+ *
+ from order_detail as a
+ left join sd.`order` as b
+ on b.order_id = a.order_id
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ limit #{offset},#{pageSize}
</select>
--
Gitblit v1.8.0