From 9258779fdf343a98e1bc4553967fc6ade82b702f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 02 八月 2024 10:09:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 4
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 4 -
north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue | 49 ++++++++++--
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 16 ++++
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java | 5 +
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java | 7 +
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 114 ++++++++++++++++++++++++++++
9 files changed, 185 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
index 424565e..50a8289 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
@@ -37,7 +37,7 @@
{field: 'buildingNumber',width:120, title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'otherColumns.S01',width:140, title: '缂栧彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
//{field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -58,7 +58,10 @@
{field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
],
-
+ toolbarConfig: {
+ zoom: true,
+ custom: true
+ },
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
return[
@@ -79,16 +82,44 @@
let props = defineProps({
orderId:null
})
-onMounted(()=>{
- request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
- xGrid.value.reloadData(res.data)
- })
+onMounted(async ()=>{
+ await getColumns()
+ await getDetail()
})
watch(()=>props.orderId,(newValue)=>{
- request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
- xGrid.value.reloadData(res.data)
- })
+ getDetail()
})
+
+const getColumns = async () => {
+ await request.post(`/basicOtherMoney/findAllByState`).then(res=>{
+ console.log(res.data)
+ res.data.forEach(item => {
+ let column = {
+ field: `otherColumns.${item.column}`,
+ width:100,
+ title: item.alias,
+ editRender: {
+ name: 'input',
+ }
+ }
+ //columns.push(column)
+ gridOptions.columns.push(column)
+
+ })
+ })
+}
+
+const getDetail = async ()=> {
+ await request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
+ res.data.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
+ xGrid.value.reloadData(res.data)
+ })
+}
+
+
+
</script>
<template>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index a8b9c1a..fc181fe 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -114,7 +114,7 @@
</tr>
<tr>
<th class="title-1">鐢熶骇鍗曞彿</th>
- <th colspan="3">{{data.order.orderId}}</th>
+ <th colspan="3">{{data.order.orderId}}锛堝搴斿崟鍙穥{data.order.batch}}锛�</th>
<th class="title-1">涓嬪崟鏃ユ湡</th>
<th colspan="3">{{data.order.createTime}}</th>
<th class="title-1">璁㈠崟绫诲瀷</th>
@@ -132,8 +132,6 @@
<th>鍖呰</th>
<th colspan="3">{{data.order.packType}}</th>
</tr>
-
-
<tr>
<th >搴忓彿</th>
<th >{{company.columnName}}</th>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 4f35746..f7c1c9d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -20,10 +20,6 @@
let inquiryMode = company.printLabel.getSelectFlowCard;
-let isChecked= ref(true)
-
-// let checkedValue = inquiryMode
-
const checkedValue = ref(inquiryMode)
//鎺掑簭
let editRow = ref({
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 e379b69..af56bfc 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
@@ -22,7 +22,7 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
-const maxTableLen =ref(150)
+const maxTableLen =ref(200)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
index 72fb09b..c9ad891 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
@@ -33,4 +33,9 @@
return Result.seccess(basicOtherMoneyService.save(alias.get("alias")));
}
+ @PostMapping("findAllByState")
+ public Result findAllByState(){
+ return Result.seccess(basicOtherMoneyService.findAllByState());
+ }
+
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 2cee2e4..f487359 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -139,4 +139,6 @@
List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
List<Map<String, String>> selectPrintNotMp(String orderId);
+
+ List<Map<String, String>> selectPrintNotMergeMp(String orderId);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
index 4dd26b8..ee61c06 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
@@ -58,4 +58,11 @@
basicOtherMoneyMapper.insert(newBasicOtherMoney);
return true;
}
+
+ public List<BasicOtherMoney> findAllByState() {
+ return basicOtherMoneyMapper.selectList(
+ new QueryWrapper<BasicOtherMoney>().
+ eq("state",1).
+ like("`column`","S"));
+ }
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 273513c..a35c17b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -544,7 +544,7 @@
GROUP BY order_id, order_number,ogds.group
) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
where fc.order_id = #{orderId}
- GROUP BY fc.process_id
+ GROUP BY fc.process_id,ogdss.technology_number
order by fc.process_id)
UNION
(select fc.id,
@@ -1460,4 +1460,116 @@
GROUP BY fc.process_id, ogd.technology_number
order by fc.process_id, ogd.technology_number
</select>
+
+ <select id="selectPrintNotMergeMp">
+ select * from ((select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ fc.order_number,
+ ogd.technology_number,
+ ogd.glass_address,
+ sum(od.quantity) as quantity,
+ sum(ogd.total_area) as total_area,
+ od.product_name,
+ ogd.glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time,
+ /* if(fc.print_status=0,'鏈墦鍗�','宸叉墦鍗�') as print_status*/
+ fc.print_status,
+ ogd.process
+ 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)
+
+ UNION
+
+ (select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogdss.technology_number,
+ ogd.glass_address,
+ ROUND(sum(fc.quantity)/(count(DISTINCT fc.technology_number))) as quantity,
+ sum(ogd.total_area) as total_area,
+ # SUM(ogd.child_width*child_height*fc.quantity/(count(DISTINCT ogd.technology_number))) as total_area,
+ od.product_name,
+ ogdss.concatenated_glass_child as glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time,
+ fc.print_status,
+ processed_part as process
+
+ 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
+ left join (
+ select
+ ogds.order_id,
+ ogds.order_number,
+ GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
+ ogds.glass_child,
+ GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
+ SUBSTRING(process, LOCATE('澶硅兌', process)) AS processed_part
+ from sd.order_glass_detail as ogds
+ where ogds.order_id = #{orderId} and LOCATE('澶硅兌',ogds.process)>0
+ GROUP BY order_id, order_number,ogds.group
+ ) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
+ where fc.order_id = #{orderId}
+ GROUP BY fc.process_id,ogdss.technology_number
+ order by fc.process_id)
+ UNION
+ (select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogdss.technology_number,
+ ogd.glass_address,
+ ROUND(sum(fc.quantity)/(count(DISTINCT fc.technology_number))) as quantity,
+ sum(ogd.total_area) as total_area,
+ od.product_name,
+ ogdss.concatenated_glass_child as glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time,
+ fc.print_status,
+ processed_part as process
+
+ 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
+ left join (
+ select
+ ogds.order_id,
+ ogds.order_number,
+ GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
+ ogds.glass_child,
+ GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
+ SUBSTRING(pds.process, LOCATE('涓┖', pds.process)) AS processed_part
+ from sd.order_glass_detail as ogds
+ left join sd.order_detail as ods on ods.order_id=ogds.order_id and ods.order_number=ogds.order_number
+ left join sd.product_detail as pds on pds.prod_id=ods.product_id and pds.glass_sort=ogds.technology_number
+ where ogds.order_id = #{orderId}
+ GROUP BY order_id, order_number
+ ) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
+ where fc.order_id = #{orderId}
+ GROUP BY fc.process_id
+ order by fc.process_id)
+
+ ) AS combined_results where process is not null and process!=""
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 8715439..402aeac 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -114,6 +114,14 @@
and o.salesman REGEXP #{order.salesman}
</if>
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
+
<if test="order.perimeter != null and order.perimeter != ''">
and o.perimeter REGEXP #{order.perimeter}
</if>
@@ -202,6 +210,14 @@
and o.salesman REGEXP #{order.salesman}
</if>
+ <if test="order.creator != null and order.creator != ''">
+ and o.creator REGEXP #{order.creator}
+ </if>
+
+ <if test="order.verifier != null and order.verifier != ''">
+ and o.verifier REGEXP #{order.verifier}
+ </if>
+
<if test="order.perimeter != null and order.perimeter != ''">
and o.perimeter REGEXP #{order.perimeter}
</if>
--
Gitblit v1.8.0