From 723cbdddb7d06a1d12564d8d88dfe8d4984315a3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 十二月 2025 13:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 11 +-
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 8 +
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 16 +++
north-glass-erp/northglass-erp/src/lang/en.js | 3
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 2
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue | 2
north-glass-erp/northglass-erp/src/lang/zh.js | 3
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/ProductionBasicData.vue | 3
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 1
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 4
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 3
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 19 ---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue | 40 ++++++-
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 4
north-glass-erp/northglass-erp/src/lang/ar.js | 3
north-glass-erp/northglass-erp/src/lang/ru.js | 4
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddMachine.vue | 2
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 97 ++++++++++++++-----
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 9 +
north-glass-erp/northglass-erp/src/lang/kr.js | 4
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 11 +
north-glass-erp/northglass-erp/src/views/pp/machine/Machine.vue | 2
22 files changed, 169 insertions(+), 82 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 9d0ea84..4791d3a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -386,7 +386,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<td>{{ itemDatile.mapNumber }}</td>
- <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
+ <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃' || name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�' ">{{ itemDatile.building_number }}</td>
<td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
@@ -567,6 +567,20 @@
@media print {
+ /* 绂佺敤 Chrome 鑷姩椤电爜瑙﹀彂鏉′欢 */
+ * {
+ overflow: visible !important;
+ transform: none !important;
+ filter: none !important;
+ }
+
+ [style*="position: fixed"],
+ .fixed,
+ .header-fixed {
+ position: absolute !important;
+ }
+
+
@page {
size: auto; /* auto is the initial value */
margin: 4mm 5mm 10mm 5mm /* this affects the margin in the printer settings */
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index b234f5b..ba16e46 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -342,7 +342,8 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃' || name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�' ">{{ itemDatile.building_number }}</td>
+ <td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
@@ -433,9 +434,9 @@
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="34" rowspan="6" style="width: 99%;height: 150px ">
- <div v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'" style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
- </div>
- <div v-else style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <div style="width: 100%;height: 100%;text-align: left">
+ <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 31621f1..4b0bb9d 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -364,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 9844d84..ebadad0 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -364,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index a0489a3..0ed24cd 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -364,7 +364,9 @@
isOptimize:'瓴疥碃! 頃措嫻 欤茧鞚� 斓滌爜頇旊悩鞐堨姷雼堧嫟.霅橂弻毽� 靾� 鞐嗢姷雼堧嫟!',
isReportingWork:'鞛戩梾 鞁れ爜 霌彪 鞕勲霅� 欤茧鞚� 霅橂弻毽赴臧� 鞝滍暅 霅╇媹雼�.',
isStorage:'鞛呹碃 鞕勲霅� 欤茧鞚� 鞁滌姢韰� 霅橂弻毽赴臧� 攵堦皜電� 頃╇媹雼�.',
- BackSure:'頃措嫻 頂勲靹胳姢毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?'
+ BackSure:'頃措嫻 頂勲靹胳姢毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?',
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
+
},
updateOrderId:'欤茧 氩堩樃 靾橃爼',
reportingTransfer:'鞛戩梾 鞁れ爜 鞚搓磤'
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 1d880d2..94afeba 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -364,7 +364,9 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
+
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 33b193a..6ea842b 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -364,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index ee9bfc6..a13144c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -755,11 +755,7 @@
name: 'selectMachine',
component: () => import('../views/pp/machine/SelectMachine.vue'),
},
- {
- path: 'addMachine',
- name: 'addMachine',
- component: () => import('../views/pp/machine/AddMachine.vue'),
- },
+
{
path: 'maintenanceAndRepair',
name: 'maintenanceAndRepair',
@@ -941,6 +937,11 @@
component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
},
{
+ path: 'addMachine',
+ name: 'addMachine',
+ component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
+ },
+ {
path: '',
redirect:'/main/productionBasicData/selectProductionBasicData'
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
index 1ae9af7..72c9f56 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
@@ -66,7 +66,7 @@
[
{code: 'selectTrimming', name: '璁剧疆缁熶竴淇竟',prefixIcon: 'vxe-icon-edit'},
{code: 'Exports', name: '鏁版嵁瀵煎嚭', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
- {code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
+ {code: 'addRow', name: '娣诲姞鍘熺墖', prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
],
]
},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
index 29fe2c2..d07842f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
@@ -253,6 +253,12 @@
return bestFit;
};
+const isSelected = (layoutIndex, rectIndex) => {
+ return focusIndex.value &&
+ focusIndex.value.layoutIndex === layoutIndex &&
+ focusIndex.value.rectIndex === rectIndex;
+};
+
//鐗堝浘鍐呭鏍峰紡鍔犺浇
const layoutContainerStyle = (layoutIndex) => {
const layout = layouts.value[layoutIndex];
@@ -304,9 +310,10 @@
//鐗堝浘鍐呭灏忕墖鏍峰紡鍔犺浇
const rectStyle = (glassDetail, layoutIndex) => {
const layout = layouts.value[layoutIndex];
- const scale = Math.min(0.25
- );
- return {
+ const scale = Math.min(0.25);
+ const isSelectedRect = isSelected(layoutIndex, layout.glassDetails.indexOf(glassDetail));
+
+ let style = {
position: 'absolute',
left: `${glassDetail.x * scale}px`,
top: `${glassDetail.y * scale}px`,
@@ -318,13 +325,21 @@
draggable: !glassDetail.isRemain,
zIndex: glassDetail.isRemain ? 1 : 2
};
+
+ // 濡傛灉琚�変腑锛屽垯娣诲姞鍐呬晶绾㈡
+ if (isSelectedRect) {
+ style.boxShadow = 'inset 0 0 0 2px red';
+ }
+
+ return style;
};
const rectStyle1 = (glassDetail, layoutIndex) => {
const layout = layouts.value[layoutIndex];
- const scale = Math.min(0.25
- );
- return {
+ const scale = Math.min(0.25);
+ const isSelectedRect = isSelected(layoutIndex, layout.glassDetails.indexOf(glassDetail));
+
+ let style = {
position: 'absolute',
left: `${glassDetail.x * scale}px`,
top: `${glassDetail.y * scale}px`,
@@ -336,6 +351,13 @@
draggable: !glassDetail.isRemain,
zIndex: glassDetail.isRemain ? 1 : 2
};
+
+ // 濡傛灉琚�変腑锛屽垯娣诲姞鍐呬晶绾㈡
+ if (isSelectedRect) {
+ style.boxShadow = 'inset 0 0 0 2px red';
+ }
+
+ return style;
};
//鐐瑰嚮灏忕墖
@@ -352,12 +374,13 @@
const handleRectRightClick = (layoutIndex, rectIndex) => {
const glassDetail = layouts.value[layoutIndex].glassDetails[rectIndex];
if (glassDetail.isRemain) return;
+ document.querySelectorAll('.context-menu').forEach(el => el.remove());
const contextMenu = document.createElement('div');
contextMenu.className = 'context-menu';
contextMenu.style.position = 'absolute';
contextMenu.style.left = `${event.clientX}px`;
- contextMenu.style.bottom = `${event.clientY}px`;
+ contextMenu.style.top = `${event.clientY}px`;
contextMenu.style.backgroundColor = '#fff';
contextMenu.style.border = '1px solid #ccc';
contextMenu.style.padding = '5px';
@@ -488,12 +511,13 @@
const handleGrayRectRightClick = (layoutIndex, rectIndex,glassDetails) => {
//const glassDetail = glassDetails[rectIndex];
if (!glassDetails.isRemain) return;
+ document.querySelectorAll('.context-menu').forEach(el => el.remove());
const contextMenu = document.createElement('div');
contextMenu.className = 'context-menu';
contextMenu.style.position = 'absolute';
contextMenu.style.left = `${event.clientX}px`;
- contextMenu.style.bottom = `${event.clientY}px`;
+ contextMenu.style.top = `${event.clientY}px`;
contextMenu.style.backgroundColor = '#fff';
contextMenu.style.border = '1px solid #ccc';
contextMenu.style.padding = '5px';
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/Machine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/Machine.vue
index 24a56e9..f6600c6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/Machine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/Machine.vue
@@ -20,7 +20,7 @@
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/machine/selectMachine' }">{{$t('machine.equipmentSituation')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/machine/addMachine' }">{{$t('machine.equipmentAddition')}}</el-breadcrumb-item>
+<!-- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/machine/addMachine' }">{{$t('machine.equipmentAddition')}}</el-breadcrumb-item>-->
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/machine/maintenanceAndRepair' }">{{$t('machine.maintenanceAndRepair')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/machine/addMaintenanceAndRepair' }">{{$t('machine.maintenanceAndRepairAddition')}}</el-breadcrumb-item>
<el-breadcrumb-item style="display: none" />
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddMachine.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
rename to north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddMachine.vue
index 766c591..ae871f5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddMachine.vue
@@ -142,7 +142,7 @@
ElMessage.success(t('basicData.msg.saveSuccess'))
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
router.push({
- path: '/main/machine/AddMachine',
+ path: '/main/productionBasicData/AddMachine',
query: {random: Math.random()}
})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/ProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/ProductionBasicData.vue
index 7d240e7..1ca2b27 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/ProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/ProductionBasicData.vue
@@ -23,7 +23,8 @@
<el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/productionBasicData/addBreakageType' }">{{$t('productionBasicData.newTypeOfSecondaryDamageAdded')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/productionBasicData/addBreakageReason' }">{{$t('productionBasicData.reasonForSecondaryFailureAdded')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/productionBasicData/addTeamGroup' }">{{$t('productionBasicData.teamAdditionAndAddition')}}</el-breadcrumb-item>
-<!-- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/productionBasicData/AddMaintenanceAndRepair' }">鐝粍浜哄憳鏂板鏂板</el-breadcrumb-item>-->
+ <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/productionBasicData/addMachine' }">{{$t('machine.equipmentAddition')}}</el-breadcrumb-item>
+ <!-- <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/productionBasicData/AddMaintenanceAndRepair' }">鐝粍浜哄憳鏂板鏂板</el-breadcrumb-item>-->
<el-breadcrumb-item style="display: none" />
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
index d35cc78..6c23854 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -429,7 +429,6 @@
}
printRow.value.list = JSON.stringify(selectRecords)
- console.log(printRow.value.list)
printRow.value.printMergeVal=printMerge.value
printRow.value.mergeTechnologyNumber=technologyNumber
// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 929ad0f..9ba8da4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -621,7 +621,7 @@
}
}
},
- cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
+ cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑娆＄牬鐣岄潰
const { row } = params
brokenRow.value = row
if(brokenRow.value.damageDetails=== undefined){
@@ -899,7 +899,10 @@
}
}
}
-const openedBrokenTable = () => {
+const openedBrokenTable = async () => {
+ await nextTick()
+ console.log('breakageType:', titleSelectJson.value.breakageType)
+ console.log('breakageReason:', titleSelectJson.value.breakageReason)
//addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
@@ -1929,7 +1932,7 @@
</template>
<!-- 鍒虹牬绫诲瀷breakageType -->
<template #breakageType="{ row }">
- <vxe-select v-model="row.breakageType "
+ <vxe-select v-model="row.breakageType"
clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
@@ -1940,7 +1943,7 @@
<!--娆＄牬鍘熷洜-->
<template #breakageReason="{ row }">
- <vxe-select v-model="row.breakageReason "
+ <vxe-select v-model="row.breakageReason"
clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
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 d1aa40e..b11c52f 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
@@ -460,12 +460,18 @@
pageNum.value=1
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
- gridOptions.loading=false
+
orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
orderInfo.searchOrderFilter.data = filterData.value
}else{
ElMessage.warning(res.msg)
}
+ }).catch(e => {
+ xGrid.value.clearFilter()
+ orderInfo.searchOrderFilter.data = {}
+ ElMessage.error(t('searchOrder.msgList.filterError'))
+ }).finally(()=>{
+ gridOptions.loading=false
})
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
index b40de5a..cb889b9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -67,8 +67,8 @@
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getSelectWarehousingList")
- public Result getSelectWarehousingList(@RequestBody String processId){
- return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(processId));
+ public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
+ return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
}
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index 6fb966c..4c98910 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -54,7 +54,7 @@
@ExcelProperty("璁㈠崟绫诲瀷")
private String orderType;
@ExcelProperty("鍦ㄥ埗鍝佸帤搴�")
- private String thicknessSum;
+ private Double thicknessSum;
@ExcelProperty("骞虫柟姣背")
- private String thicknessArea;
+ private Double thicknessArea;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index e6ebc62..d3e2920 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -204,24 +204,7 @@
});
}
map.put("Detail",details );
-// }else {
-// //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
-// List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
-// if(process.equals("涓┖")){
-// String orderId = reportingWorkMapper.selectOrderid(processIdStr);
-// details.forEach( detail -> {
-// Integer glassId = orderGlassDetailMapper.
-// getMinIdByGroup(orderId,
-// String.valueOf(detail.get("order_number")),
-// String.valueOf(detail.get("group")));
-// int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
-// if(listGlassId !=glassId){
-// detail.put("rowClass","latter");
-// }
-// });
-// }
-// map.put("Detail",details );
-// }
+
}
}
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 6f700d2..db97e93 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1816,7 +1816,8 @@
pl.patch_reason,
pl.patch_processes,
pl.responsible_team,
- pl.responsible_personnel
+ pl.responsible_personnel,
+ od.building_number
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
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 2472f3c..6658d93 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -2168,7 +2168,7 @@
layer,
o_width,
o_height,
- rack_no
+ REPLACE(REPLACE(rack_no, '+', ''), '#', '')
ORDER BY
o_width,
o_height
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 57bd80a..898dad1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1704,6 +1704,7 @@
</select>
<select id="teamOutputMp" resultMap="teamOutputMap">
+
SELECT
t.*,
-- 鐜荤拑鎬诲帤搴︼紙mm锛�
@@ -1839,7 +1840,7 @@
</if>
HAVING 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
ORDER BY
t.this_process,
@@ -1852,39 +1853,84 @@
<select id="exportTeamOutputMp">
SELECT
+ t.*,
+ -- 鐜荤拑鎬诲帤搴︼紙mm锛�
+ (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt
+ ) AS thicknessSum,
+ ROUND(
+ (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt2
+ ) * t.area,
+ 2
+ ) AS thicknessArea
+ FROM
+ (
+ SELECT
rw.reporting_work_time,
rw.this_process,
rw.teams_groups_name,
o.project,
+ o.order_id,
rw.process_id,
fc.order_number,
- MAX( ogd.child_width ) as width,
- MAX( ogd.child_height ) as height,
+ MAX(ogd.child_width) AS width,
+ MAX(ogd.child_height) AS height,
od.edging_type,
- rwd.completed_quantity as completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
+ rwd.completed_quantity AS completed_quantity,
+ ROUND(MAX(ogd.child_width) * MAX(ogd.child_height) * rwd.completed_quantity / 1000000, 2) AS area,
od.product_name,
- JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS code,
rw.reviewed,
rw.examine_time,
rw.device_name,
o.order_type,
- -- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
- WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
- ELSE MAX( ogd.glass_child )
+ WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
END AS workProcessName,
o.batch
FROM
- reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
- left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
- 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=ogd.order_id and od.order_number=ogd.order_number
- left join sd.`order` as o on o.order_id=od.order_id
- where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
- rw.reporting_work_time >= #{date[0]}
+ pp.reporting_work AS rw
+ LEFT JOIN pp.reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN pp.flow_card AS fc
+ ON fc.order_id = rw.order_id
+ AND fc.process_id = rw.process_id
+ AND fc.order_number = rwd.order_number
+ AND fc.technology_number = rwd.technology_number
+ 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 = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN sd.`order` AS o
+ ON o.order_id = od.order_id
+ WHERE
+ o.create_order > 0
+ AND rw.reviewed_state >= 0
+ AND rwd.completed_quantity > 0
+ AND rw.reporting_work_time >= #{date[0]}
AND rw.reporting_work_time < #{date[1]}
- and position(#{process} in rw.this_process)
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="process != null and process != ''">
+ AND rw.this_process = #{process}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise>
+ </otherwise>
+ </choose>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -1897,7 +1943,7 @@
</when>
<otherwise>
GROUP BY
- <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
ogd.`group`,
</if>
rw.reporting_work_id,
@@ -1907,12 +1953,13 @@
rwd.order_number
</otherwise>
</choose>
+ ) t
ORDER BY
- rw.this_process,
- rw.process_id,
- rwd.order_number,
- rw.reporting_work_time,
- rw.teams_groups_name
+ t.this_process,
+ t.process_id,
+ t.order_number,
+ t.reporting_work_time,
+ t.teams_groups_name
</select>
<select id="teamOutputPageTotal">
@@ -2059,7 +2106,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
@@ -2828,7 +2875,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
--
Gitblit v1.8.0