From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 2
north-glass-erp/northglass-erp/src/assets/main.css | 4
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2
north-glass-erp/northglass-erp/src/views/LoginView.vue | 138 ++++----
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 44 ++
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 8
north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue | 567 +++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 10
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 129 ++++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 56 +++
10 files changed, 893 insertions(+), 67 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/assets/main.css b/north-glass-erp/northglass-erp/src/assets/main.css
index b299531..20218a4 100644
--- a/north-glass-erp/northglass-erp/src/assets/main.css
+++ b/north-glass-erp/northglass-erp/src/assets/main.css
@@ -7,8 +7,8 @@
font-weight: normal;
height: 100%;
width: 100%;
- /*min-width: 1536px;
- min-height: 730px;*/
+ min-width: 1536px;
+ min-height: 730px;
}
a,
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue
new file mode 100644
index 0000000..80c14f0
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue
@@ -0,0 +1,567 @@
+<script setup>
+import request from "@/utils/request"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {useI18n} from 'vue-i18n'
+import deepClone from "@/utils/deepClone";
+import QRCode from "qrcode";
+import companyInfo from "@/stores/sd/companyInfo";
+import userInfo from "@/stores/userInfo"
+//璇█鑾峰彇
+const company = companyInfo()
+const {t} = useI18n()
+let router = useRouter()
+let produceList = ref([])
+let list = ref()
+const details = ref([])
+const user=userInfo()
+
+
+const data = ref({
+ printList: [],
+ processName:[]
+})
+
+let props = defineProps({
+ printList:null,
+ printMerge:null,
+ printLike: null,
+ mergeTechnologyNumber:null
+})
+
+//鎵撳嵃鏃堕棿
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+ + '-' + (currentTime.getMonth() + 1) + '-'
+ + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+ + currentTime.getMinutes();formattedTime
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+const printMerge = props.printMerge
+let mergeTechnologyNumber=props.mergeTechnologyNumber
+let merge=props.printMerge
+if (merge == '') {
+ merge = null
+}
+let like = props.printLike
+if (like == '') {
+ like = null
+}
+data.value.printList = JSON.parse(props.printList)
+
+let name=company.companyName
+let replenishQRCode=company.replenishQRCode
+//鍘婚櫎閲嶅瀵硅薄
+// let uniqueObjects = {};
+// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
+// data.value.printList.forEach(obj => {
+// // 鏋勫缓涓�涓敮涓�閿紝渚嬪 'NG24071502A001_1'
+// let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
+//
+// // 濡傛灉璇ラ敭涓嶅瓨鍦ㄤ簬 uniqueObjects 涓紝鍒欏皢璇ュ璞℃坊鍔犲埌 uniqueObjects 涓�
+// if (!uniqueObjects[key]) {
+// uniqueObjects[key] = obj;
+// }
+// });
+// data.value.printList = Object.values(uniqueObjects);
+let flowCardCount = null
+onMounted(() => {
+ request.post(`/processCard/getSelectPrintingConsolidated/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.data)
+ data.processName = res.data.data[0].processNameList
+ //澶勭悊鍗曠墖鍘氬害
+ for (let j = 0; j < produceList.value.length; j++) {
+ let sumWeight = 0
+ produceList.value[j].detailList.forEach((item, index) => {
+ // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
+ let separationObj = JSON.parse(item.separation);
+
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
+
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+
+ item.separation = thicknessWithoutUnit
+
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+
+ });
+ produceList.value[j].detail[0].weight = sumWeight
+ }
+ //澶勭悊鍚堝苟鎵撳嵃
+ // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
+ //
+ // produceList.value.forEach(item => {
+ // item.detail[0].technologyNumber = printMerge;
+ // });
+ //
+ // //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
+ // if (like == null) {
+ // let process = produceList.value[0].detail[0].process
+ // console.log(process)
+ // let indexOfJiaJiao = process.indexOf('澶硅兌');
+ // if (indexOfJiaJiao !== -1) {
+ // // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
+ // let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
+ // produceList.value.forEach(item => {
+ // item.detail[0].process = afterJiaJiao
+ // })
+ // }
+ //
+ // let indexOfProceList = produceList.value[0].processList
+ // let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
+ //
+ // if (getProceList !== -1) {
+ // // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
+ // produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
+ // }
+ // }
+ // }
+
+
+ produceList.value.forEach(item => {
+ let technologyNumberMerge = printMerge.split('').join(',');
+ item.detail[0].technologyNumberMerge = technologyNumberMerge
+ })
+ //澶勭悊缂栧彿鍒�
+ //瀹氫箟瀛樻斁缂栧彿鏁扮粍
+ const s01Values = [];
+ for (let i = 0; i < produceList.value.length; i++) {
+ const s01Values = [];
+ // 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
+ if (produceList.value[i].detailList[0].other_columns != null
+ || produceList.value[i].detailList[0].other_columns != undefined) {
+ produceList.value[i].detailList.forEach(element => {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
+ });
+
+ // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ produceList.value[i].detailList.forEach((detail, index) => {
+ detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
+ });
+ }
+
+ }
+
+ // 浣跨敤涓�涓璞℃潵瀛樺偍鍚堝苟鍚庣殑缁撴灉
+ const mergedData = produceList.value.reduce((acc, item) => {
+ const processId = item.detail[0].process_id;
+
+ // 濡傛灉璇� process_id 灏氭湭鍦� acc 涓紝鍒濆鍖栧叾鏁扮粍
+ if (!acc[processId]) {
+ acc[processId] = {
+ processList: item.processList,
+ detailList: [],
+ detail: item.detail
+ };
+ }
+
+ // 鍚堝苟 detailList
+ acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
+
+ return acc;
+ }, {});
+
+ // 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
+ produceList.value = Object.values(mergedData);
+
+ flowCardCount=produceList.value.length
+ handleSummary()
+ if (replenishQRCode == 2){
+ handleGetQRCodeTj()//澶╂触鎵爜鏋姤宸ラ渶瑕佸悎骞跺眰鍙蜂簩缁寸爜
+ }else{
+ handleGetQRCode()//鎷嗗垎灞傚彿浜岀淮鐮�
+ }
+
+
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+
+ }
+)
+
+
+const handleGetQRCode = async () => {
+ // 鍏ㄥ眬 Map 淇濆瓨 processId+technologyNumber 瀵瑰簲鐨勪簩缁寸爜锛堜繚鐣欐渶鍚庝竴鏉★級
+ const qrMap = new Map();
+
+ // 閬嶅巻姣忎釜 produce锛屽厛瀵� detailList 鎺掑簭
+ produceList.value.forEach(produce => {
+ produce.detailList.sort((a, b) => {
+ const processA = a.processId || a.process_id;
+ const processB = b.processId || b.process_id;
+ const techA = a.technologyNumber || a.technology_number;
+ const techB = b.technologyNumber || b.technology_number;
+
+ // 鍏堟寜 processId 鎺掑簭锛屽啀鎸� technologyNumber 鎺掑簭
+ if (processA !== processB) return processA - processB;
+ return techA - techB;
+ });
+
+ // 閬嶅巻 detailList 鐢熸垚浜岀淮鐮� map
+ produce.detailList.forEach(item => {
+ const processId = item.processId || item.process_id;
+ const techNum = item.technologyNumber || item.technology_number;
+ const key = `${processId}_${techNum}`;
+
+ // 淇濈暀鏈�鍚庝竴鏉� item
+ qrMap.set(key, { itemRef: item, processId, technologyNumber: techNum });
+ });
+ });
+
+ // 鐢熸垚浜岀淮鐮佸苟璧嬪�肩粰鏈�鍚庝竴鏉″搴旂殑 detail
+ for (const [key, value] of qrMap.entries()) {
+ const url = `${value.processId}/${value.technologyNumber}`;
+ const qrcodeData = await QRCode.toDataURL(url);
+ value.itemRef.qrcodeList = [{
+ qrcode: qrcodeData,
+ processId: value.processId,
+ technologyNumber: value.technologyNumber
+ }];
+ }
+
+ // 娓呯悊閲嶅鏉＄洰浜岀淮鐮侊紙闈炴渶鍚庝竴鏉★級
+ produceList.value.forEach(produce => {
+ produce.detailList.forEach(item => {
+ const processId = item.processId || item.process_id;
+ const techNum = item.technologyNumber || item.technology_number;
+ const key = `${processId}_${techNum}`;
+ if (qrMap.get(key).itemRef !== item) {
+ item.qrcodeList = [];
+ }
+ });
+ });
+};
+
+
+
+
+
+const handleGetQRCodeTj = async () => {
+ let technologyNumber=''
+ for (let i = 0; i < produceList.value.length; i++) {
+ const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber}`;
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber
+ });
+ }
+};
+
+
+//鏍规嵁杈撳叆鐨勬暟閲忛噸鏂版眹鎬�
+const handleSummary = () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ //鏁伴噺
+ let totalQuantity = 0;
+ //闈㈢Н
+ let totalArea = 0;
+ //閲嶉噺
+ let totalWeight = 0;
+ // 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
+ produceList.value[i].detailList.forEach(collection => {
+ totalQuantity += collection.quantity*1;
+ //姣忎釜搴忓彿闈㈢Н
+ collection.total_area=parseFloat((collection.width*collection.height*collection.quantity/1000000).toFixed(2))
+ totalArea += collection.total_area*1;
+ totalWeight += collection.width*collection.height*collection.quantity/1000000*collection.separation*2.5*1;
+ //姣忎釜搴忓彿鍛ㄩ暱
+ collection.perimeter= (collection.width*2+collection.height*2)*collection.quantity/1000
+ });
+ // 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
+ produceList.value[i].detail[0].quantity=totalQuantity
+ produceList.value[i].detail[0].gross_area=totalArea
+ produceList.value[i].detail[0].weight=totalWeight
+ }
+}
+
+
+</script>
+
+<template>
+<!-- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
+ <div id="printFlowCard">
+ <table v-for="(item,id) in produceList" id="contentTable" :key="id">
+ <thead>
+ <tr v-for="(itemFlow,index) in item.detail" :key="index">
+ <td colspan="34">
+
+ <div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
+ <div style="left: 150px">{{ company.companyName }}</div>
+ <div>鐢熶骇娴佺▼鍗�</div>
+ <div style="font-weight: bolder;display: flex;justify-content:space-between">
+ <div>
+ 琛ョ墖鍗曞彿锛歿{itemFlow.patch_id}}
+ 鎵撳嵃浜猴細{{user.user.userName}}
+ 鏃堕棿锛歿{formattedTime}}
+ </div>
+ <div>
+ <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ 娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr v-for="(items,index) in item.detail" :key="index">
+ <td class="tdNowrap" >瀹㈡埛鍚嶇О锛�</td>
+ <td colspan="2">{{ items.customer_name }}</td>
+ <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
+ <td v-if="name=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
+ <td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
+ <td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
+ </tr>
+ <tr v-for="(itemTr,index) in item.detail" :key="index">
+ <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
+ <td colspan="2">{{ itemTr.edging_type }}</td>
+ <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
+ <td colspan="8">{{ itemTr.glass_child }}</td>
+ <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
+ <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ </tr>
+ <tr>
+ <td rowspan='2'>搴忓彿</td>
+ <td rowspan='2'>缂栧彿</td>
+ <td rowspan="2">灏忕墖椤哄簭</td>
+ <td rowspan='2'>瀹�*楂�</td>
+ <td rowspan='2'>鏁伴噺</td>
+ <td rowspan='2'>闈㈢Н</td>
+ <td rowspan='2'>鍛ㄩ暱</td>
+ <td rowspan='2'>鍗婂緞/澶囨敞</td>
+ <td rowspan='2'>绫诲瀷</td>
+ <td rowspan='2'>鍘熷洜</td>
+ <td rowspan='2'>宸ュ簭</td>
+ <td rowspan='2'>鐝粍</td>
+ <td rowspan='2'>淇℃伅</td>
+ <td rowspan='2'>澶囨敞</td>
+ <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
+ </tr>
+ <tr>
+ <template v-for=" n in item.processList.length">
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ </template>
+ </tr>
+ </thead>
+ <tbody>
+ <template v-for="(itemDatile,index) in item.detailList" :key="index">
+ <!-- detailList 鏁版嵁琛� -->
+ <tr>
+ <td>{{ itemDatile.order_number }}</td>
+ <td>{{ itemDatile.s01Value }}</td>
+ <td>{{ itemDatile.technology_number }}</td>
+ <td>{{ itemDatile.child_width }}</td>
+ <td class="item" style="width: 5%;height: 100%;">
+ <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
+ </td>
+ <td>{{ itemDatile.total_area }}</td>
+ <td>{{ itemDatile.perimeter }}</td>
+ <td>{{ itemDatile.bend_radius }}</td>
+ <td>{{ itemDatile.patch_type }}</td>
+ <td>{{ itemDatile.patch_reason }}</td>
+ <td>{{ itemDatile.patch_processes }}</td>
+ <td>{{ itemDatile.responsible_team }}</td>
+ <td>{{ itemDatile.responsible_personnel }}</td>
+ <td>{{ itemDatile.remarks }}</td>
+ <template v-for=" n in item.processList.length">
+ <td></td>
+ <td></td>
+ </template>
+ </tr>
+
+ <!-- 瀵瑰簲浜岀淮鐮佽 -->
+ <tr v-if="itemDatile.qrcodeList && itemDatile.qrcodeList.length" :key="'qr-' + index">
+ <td colspan="34">
+ <span style="display: flex; flex-wrap: wrap;" v-for="(qr,index) in itemDatile.qrcodeList || []" :key="index">
+ <img style="width: 80px;height: 80px; margin-right: 5px;" :src="qr.qrcode">
+ <span style="font-weight: bolder;">{{ qr.processId }}/{{ qr.technologyNumber }}</span>
+ </span>
+ </td>
+ </tr>
+ </template>
+ </tbody>
+ <tfoot>
+ <tr style="height: 14px">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
+ 鏁伴噺锛�
+ <label>{{ itemsum.quantity }}</label>
+ 闈㈢Н锛�
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
+ 閲嶉噺锛�
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
+ </td>
+ </tr>
+ <tr v-for="(itemtextarea,index) in item.detail" :key="index">
+ <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
+ <div>
+
+ </div>
+ </td>
+
+ <td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
+ </tr>
+ <tr>
+ <td>鐢熶骇鏃ユ湡</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
+ </tr>
+ <tr>
+ <td>璐ㄦ绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2">鐢熶骇绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
+ </tr>
+ <tr>
+ <td>鍘熺墖绠卞彿</td>
+ <td colspan="29"></td>
+ </tr>
+ <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
+ <td colspan="30">
+
+ </td>
+ </tr>
+ <tr v-for="(itemtextareas,index) in item.detail" :key="index">
+ <td colspan="34" rowspan="6" style="width: 99%;height: 150px ">
+ <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px;text-align: left">{{itemtextareas.processing_note}}</textarea>
+ </div>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </div>
+
+</template>
+
+<style scoped>
+* {
+ margin: 0;
+ padding: 0;
+ text-align: center;
+}
+
+#printButton {
+ margin-top: -40px;
+ width: 100px;
+}
+
+#printFlowCard {
+ text-align: center;
+//font-weight: bolder; height: 600px;
+}
+
+#contentTable {
+ border-collapse: collapse;
+ border: 1px solid black;
+ width: 100%;
+
+}
+
+#contentTable thead {
+ font-size: 12px;
+ font-weight: bolder;
+}
+
+#contentTable thead div {
+ font-size: 14px;
+ font-weight: bolder;
+}
+
+#contentTable tr td {
+ border: 1px solid black;
+ height: 18px;
+ font-weight: bolder;
+}
+
+#contentTable tbody {
+
+}
+
+.tdNowrap {
+
+}
+
+#contentTable tfoot {
+ font-size: 11px;
+ font-weight: bolder;
+}
+
+input{
+ border: none;
+ background: none;
+}
+
+@media print {
+
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 2mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
+
+ }
+
+ tbody {
+ display: table-row-group;
+ }
+
+ table {
+ page-break-before: always;
+ }
+
+ table {
+ page-break-inside: auto;
+ }
+
+ thead {
+ display: table-header-group;
+ }
+
+ tfoot {
+ display: table-footer-group;
+ page-break-inside: avoid;
+ }
+}
+
+.qrCode img {
+ width: 100%;
+ height: 100%;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index 231e561..3b5a0df 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -124,68 +124,76 @@
<template>
<div class="mainDiv" >
<div id="main-login">
- <div id="img-div">
- <img id="img-pic" src="@/assets/img.png" alt="">
- </div>
- <div id="div-login">
- <el-select
- @change="changeLanguage"
- v-model="language"
- placeholder=" "
- style="float: right;width: 6rem">
- <el-option value="zh-CN" label="涓枃" />
- <el-option value="en-US" label="English" />
- <el-option value="ru" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
- <el-option value="ar" label="亘丕賱毓乇亘賷丞" />
- <el-option value="ko-KR" label="頃滉淡鞏�" />
- </el-select>
- <h2>{{$t('login.SysName')}}</h2>
- <el-form
- @submit.native.prevent
- ref="ruleFormRef"
- :model="userForm"
- status-icon
- :rules="rules"
- >
- <el-form-item :label="$t('login.user')+':'" prop="userId">
- <el-input
- v-model="userForm.userId"
- type="text"
- autocomplete="off"
- :prefix-icon="Avatar"
- :placeholder="$t('login.userErr')"
- />
- </el-form-item>
- <el-form-item :label="$t('login.password')+':'" prop="pass">
- <el-input
- v-model="userForm.pass"
- @blur="changeRegister"
- type="password"
- autocomplete="off"
- :prefix-icon="Lock"
- :placeholder="$t('login.pwErr')"
- />
- </el-form-item>
- <el-form-item id="submitForm">
- <el-button
- :loading="registerLoadings"
- :disabled="registerState"
- type="primary"
- @click="register"
- >{{$t('login.register')}}
- </el-button>
- <el-button
- :loading="loginLoadings"
- type="primary"
- native-type="submit"
- @click="submitForm(ruleFormRef)"
- @keyup.enter.native="keyDown(e)"
- >{{$t('login.login')}}
- </el-button>
+ <el-row style="height: 60vh;width: 70vw;" :gutter="50">
+ <el-col :span="14">
+ <div id="img-div">
+ <img id="img-pic" src="@/assets/img.png" alt="">
+ </div>
+ </el-col>
+ <el-col :span="10">
+ <div id="div-login">
+ <el-select
+ @change="changeLanguage"
+ v-model="language"
+ placeholder=" "
+ style="float: right;width: 6rem">
+ <el-option value="zh-CN" label="涓枃" />
+ <el-option value="en-US" label="English" />
+ <el-option value="ru" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
+ <el-option value="ar" label="亘丕賱毓乇亘賷丞" />
+ <el-option value="ko-KR" label="頃滉淡鞏�" />
+ </el-select>
+ <h2>{{$t('login.SysName')}}</h2>
+ <el-form
+ @submit.native.prevent
+ ref="ruleFormRef"
+ :model="userForm"
+ status-icon
+ :rules="rules"
+ >
+ <el-form-item :label="$t('login.user')+':'" prop="userId">
+ <el-input
+ v-model="userForm.userId"
+ type="text"
+ autocomplete="off"
+ :prefix-icon="Avatar"
+ :placeholder="$t('login.userErr')"
+ />
+ </el-form-item>
+ <el-form-item :label="$t('login.password')+':'" prop="pass">
+ <el-input
+ v-model="userForm.pass"
+ @blur="changeRegister"
+ type="password"
+ autocomplete="off"
+ :prefix-icon="Lock"
+ :placeholder="$t('login.pwErr')"
+ />
+ </el-form-item>
+ <el-form-item id="submitForm">
+ <el-button
+ :loading="registerLoadings"
+ :disabled="registerState"
+ type="primary"
+ @click="register"
+ >{{$t('login.register')}}
+ </el-button>
+ <el-button
+ :loading="loginLoadings"
+ type="primary"
+ native-type="submit"
+ @click="submitForm(ruleFormRef)"
+ @keyup.enter.native="keyDown(e)"
+ >{{$t('login.login')}}
+ </el-button>
- </el-form-item>
- </el-form>
- </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ </el-col>
+ </el-row>
+
+
</div>
</div>
@@ -195,7 +203,8 @@
.mainDiv{
//background-color: #1890FF;
overflow: hidden;
- min-width: 718px;
+ /*width: 100%;
+ height: 100%;*/
}
#main-login{
margin: 150px auto 0 auto;
@@ -205,7 +214,7 @@
//background-color: #f2f2f2;
}
#img-div{
- width: 55%;
+ width: 100%;
height: 100%;
display: flex;
justify-content: center;
@@ -220,10 +229,11 @@
margin-top: 5%;
background-color: #fff;
float: right;
- width: 40%;
+ width: 100%;
height: 80%;
border-radius: 12px;
min-width: 318px;
+ min-height: 318px;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19);
}
h2{
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 a203bfe..128b79a 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
@@ -22,11 +22,13 @@
//import PrintCustomLabel from '@/components/pp/PrintCustomLabelDetails.vue'
import QueuePrinter from "@/hook/queue";
import PrintCustomLabelProject from "@/components/pp/PrintCustomLabelProject.vue";
+import PrintProcessConsolidated from '@/components/pp/PrintConsolidatedReplenish.vue'
const company = companyInfo()
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const dialogTableVisible = ref(false)
+const dialogTableConsolidated = ref(false)
const dialogTableVisibleLabel = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
const printVisible= ref(false)
@@ -366,6 +368,7 @@
toolbarConfig: {
buttons: [
{code: 'print', name: t('processCard.print'), status: 'primary'},
+ {code: 'printConsolidated', name: t('processCard.mergePrinting'), status: 'primary'},
{code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
{code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
{code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
@@ -420,11 +423,38 @@
technologyNumber+=selectRecords[i].technology_number
}
}
+
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}})
dialogTableVisible.value=true
+ break
+ }
+ case 'printConsolidated': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ let technologyNumber = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ technologyNumber+=selectRecords[i].technology_number
+ } else {
+ id += selectRecords[i].id + "|"
+ technologyNumber+=selectRecords[i].technology_number
+ }
+ }
+
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal=printMerge.value
+ printRow.value.mergeTechnologyNumber=technologyNumber
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableConsolidated.value=true
break
}
@@ -799,6 +829,20 @@
style="width: 100%;height: 100%" />
</el-dialog>
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableConsolidated"
+ :title="$t('processCard.print')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContent" :icon="Printer" circle />
+ </template>
+ <print-process-consolidated id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
+ :mergeTechnologyNumber="printRow.mergeTechnologyNumber"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
+
<!-- 灏忕墖鏍囩 -->
<el-dialog
id="sizeCustomSemi"
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 15c88f5..ecf474c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -348,6 +348,16 @@
return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
}
+ @ApiOperation("鍚堝苟鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintingConsolidated/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+ public Result getSelectPrintingConsolidated(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
+ }
+
@ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
public Result getSelectPrinRework(
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index 541d41c..f9d6548 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -105,6 +105,12 @@
//琛ョ墖鐘舵��
@TableField(select = false,exist = false)
private Integer patchState;
+ //鎵规
+ @TableField(select = false,exist = false)
+ private String batch;
+ //浜у搧鍚嶇О
+ @TableField(select = false,exist = false)
+ private String productName;
//澶栭敭璁㈠崟琛�
@TableField(select = false,exist= false)
@@ -118,4 +124,6 @@
@TableField(select = false,exist= false)
private Product product;
+
+
}
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 218252f..d2bcfab 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
@@ -279,4 +279,6 @@
Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
+
+ List<Map<String, String>> getPrimaryListRefundHB(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 942c48b..98c3ac8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -1532,6 +1532,135 @@
return map;
}
+
+// public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object, String printMerge, String printLike, String mergeTechnologyNumber) {
+// if (printMerge == null) {
+// printMerge = "";
+// }
+// if (printLike == null) {
+// printLike = "";
+// }
+// Map<String, Object> map = new HashMap<>();
+// List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+// List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+// if (!flowCardList.isEmpty()) {
+// Set<String> processedKeys = new HashSet<>();
+// for (FlowCard flowCard : flowCardList) {
+// String batch = flowCard.getOrder().getBatch();
+// String glassChild = flowCard.getGlassChild();
+// Map<String, Object> itemmap = new HashMap<>();
+// //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+// itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), mergeTechnologyNumber, flowCard.getPatchReason(), flowCard.getOrderId()));
+//
+// List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getOrderNumber(), flowCard.getReportingWorkId(), flowCard.getPatchReason());
+// itemmap.put("detailList", detailList);
+// //宸ヨ壓娴佺▼
+// List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+// //宸ュ簭鍒楄〃
+// List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+// itemmap.put("processList", processList);
+// itemmap.put("processNameList", processNameList);
+// // itemmap.put("numberList", numberList);
+// list.add(itemmap);
+//
+// }
+// }
+// map.put("data", list);
+// //鍒濆鍖栧��
+// printLike = null;
+// return map;
+// }
+
+ public Map<String, Object> getSelectPrintingConsolidatedSv(Map<String, Object> object,
+ String printMerge,
+ String printLike,
+ String mergeTechnologyNumber) {
+ if (printMerge == null) printMerge = "";
+ if (printLike == null) printLike = "";
+
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ List<FlowCard> flowCardList = JSONArray.parseArray(
+ JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+
+ if (!flowCardList.isEmpty()) {
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勫悎骞� detailList
+ Map<String, List<Map<String, Object>>> keyToDetails = new LinkedHashMap<>();
+
+ // 鐢� Map 淇濆瓨姣忎釜 key 瀵瑰簲鐨勭涓�涓� flowCard锛岀敤浜庣敓鎴� itemmap 琛ㄥご绛変俊鎭�
+ Map<String, FlowCard> keyToFirstFlowCard = new HashMap<>();
+
+ for (FlowCard flowCard : flowCardList) {
+ String batch = flowCard.getBatch();
+ String glassChild = flowCard.getProductName();
+ String key = batch + "_" + glassChild;
+
+ List<Map<String, Object>> currentDetailList = flowCardMapper.getDetailListRefund(
+ flowCard.getProcessId(),
+ flowCard.getTechnologyNumber(),
+ flowCard.getOrderNumber(),
+ flowCard.getReportingWorkId(),
+ flowCard.getPatchReason()
+ );
+
+ for (Map<String, Object> detail : currentDetailList) {
+ detail.put("processId", flowCard.getProcessId());
+ detail.put("technologyNumber", flowCard.getTechnologyNumber());
+ }
+
+ // 鍚堝苟 detailList 鍒板搴� key
+ keyToDetails.computeIfAbsent(key, k -> new ArrayList<>()).addAll(currentDetailList);
+
+ // 淇濆瓨绗竴娆″嚭鐜扮殑 flowCard锛岀敤浜庣敓鎴� itemmap
+ keyToFirstFlowCard.putIfAbsent(key, flowCard);
+ }
+
+ // 閬嶅巻鍚堝苟鍚庣殑 key锛岀敓鎴� itemmap
+ for (Map.Entry<String, List<Map<String, Object>>> entry : keyToDetails.entrySet()) {
+ String key = entry.getKey();
+ List<Map<String, Object>> mergedDetailList = entry.getValue();
+
+ FlowCard firstFlowCard = keyToFirstFlowCard.get(key);
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detailList", mergedDetailList);
+
+ // 琛ㄥご琛ㄥ熬
+ itemmap.put("detail", flowCardMapper.getPrimaryListRefundHB(
+ firstFlowCard.getProcessId(),
+ String.valueOf(firstFlowCard.getTechnologyNumber()),
+ firstFlowCard.getOrderNumber(),
+ firstFlowCard.getReportingWorkId(),
+ mergeTechnologyNumber,
+ firstFlowCard.getPatchReason(),
+ firstFlowCard.getOrderId()
+ ));
+
+ // 宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(
+ firstFlowCard.getProcessId(),
+ firstFlowCard.getTechnologyNumber()
+ );
+
+ // 宸ュ簭鍒楄〃
+ List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+
+ itemmap.put("processList", processList);
+ itemmap.put("processNameList", processNameList);
+
+ list.add(itemmap);
+ }
+ }
+
+ map.put("data", list);
+ return map;
+ }
+
+
+
+
+
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
index 6f8d0f5..b8b646a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -46,7 +46,7 @@
</if>
and a.technology_number = #{technologyNumber}
and a.breakage_quantity>0
- and c.review_status = 0
+ and ifnull(c.review_status,0) = 0
</select>
</mapper>
\ No newline at end of file
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 8966a9f..3b38ced 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -3594,4 +3594,60 @@
where process_id = #{processId} and order_number = #{orderNumber} and
technology_number = #{technologyNumber} and process = #{process}
</update>
+
+ <select id="getPrimaryListRefundHB">
+ select o.customer_name,
+ o.project,
+ if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,
+ ogd.process,
+ od.edging_type,
+ ogd.glass_child,
+ od.product_name,
+ o.processing_note,
+ fc.process_id,
+ pl.patch_num as quantity,
+ round(SUM(ogd.total_area), 2) as gross_area,
+ sum(od.weight) as weight,
+ #{technologyNumber} as technologyNumber,
+ concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
+ dd.breakage_type,
+ dd.breakage_reason,
+ dd.responsible_process,
+ dd.responsible_team,
+ concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
+ dd.responsible_personnel,
+ #{mergeTechnologyNumber} as mergeTechnologyNumber,
+ pl.patch_id
+ 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
+ left join sd.product as p on p.id = od.product_id
+ left join (select ogd.order_id,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.glass_child,
+ GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
+ from sd.order_glass_detail as ogd
+ where ogd.order_id = #{orderId}
+ and ogd.order_number = #{orderNumber}
+ and position(ogd.technology_number in #{technologyNumber})
+ GROUP BY order_id, order_number) as ogdc
+ on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
+ ogdc.technology_number = ogd.technology_number
+ left join patch_log as pl on pl.process_id = fc.process_id and pl.order_sort = fc.order_number and
+ pl.technology_number = fc.technology_number
+ left join pp.reporting_work as rw on rw.order_id = fc.order_id and rw.process_id = fc.process_id
+ left join pp.damage_details as dd
+ on rw.reporting_work_id = dd.reporting_work_id and dd.order_number = fc.order_number and
+ dd.technology_number = fc.technology_number
+ where fc.process_id = #{processId}
+ and fc.order_number = #{orderNumber}
+ and fc.technology_number = #{technologyNumber}
+ and pl.reporting_work_id = #{reportingWorkId}
+ and dd.breakage_reason = #{patchReason}
+ group by fc.process_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0