From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 10
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 9
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 765 ++++++++++++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 30 +
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue | 306 +++++++++++++
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 6
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 23
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 6
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 46 ++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 116 ++++
11 files changed, 1,299 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
index 499eaaf..2c7bebb 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -37,10 +37,10 @@
const route = currentRoute.value
let type = props.type
let faceOrientation = props.faceOrientation
-if (type==="鑻辨枃鏍囩" && faceOrientation==="姝ら潰涓哄鍐呴潰"){
+if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄鍐呴潰"){
faceOrientation='INSIDE'
}
-else if (type==="鑻辨枃鏍囩" && faceOrientation==="姝ら潰涓哄澶栭潰"){
+else if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄澶栭潰"){
faceOrientation='OUTSIDE'
}
let lableType = props.lableType
@@ -100,8 +100,6 @@
}
// 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
- console.log(lastList.value,id)
- console.log(lastList.value[index].glassNumber)
lastList.value.forEach(obj => {
// 鑾峰彇鍓嶇紑鍜� orderId
const prefix = obj.processId.substring(0, 11);
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
new file mode 100644
index 0000000..a6902a6
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
@@ -0,0 +1,306 @@
+<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 companyInfo from "@/stores/sd/companyInfo"
+
+const company = companyInfo()
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let produceList = ref([])
+let labelList = ref([])
+let titleList = ref([])
+let dataList = ref([])
+let list = ref([])
+let lastList = ref([])
+
+let filterData = ref({})
+
+const data = ref({
+ printList: []
+})
+
+let props = defineProps({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+let type = props.type
+let faceOrientation = props.faceOrientation
+if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄鍐呴潰"){
+ faceOrientation='INSIDE'
+}
+else if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄澶栭潰"){
+ faceOrientation='OUTSIDE'
+}
+let lableType = props.lableType
+data.value.printList = JSON.parse(props.list)
+onMounted(() => {
+ request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/${lableType}`, data.value).then((res) => {
+ if (res.code == 200) {
+
+ produceList.value = deepClone(res.data.title)
+ list.value = deepClone(res.data.data)
+ const data = produceList.value[0].value
+ dataList = JSON.parse(`[${data}]`);
+ labelList = dataList[0]
+ for (let i = 0; i < list.value.length; i++) {
+ let count = list.value[i].data.length
+ for (let j = 0; j < count; j++) {
+ for (let k = 0; k < list.value[i].data[j].quantity; k++) {
+ lastList.value.push(list.value[i].data[j])
+ }
+ }
+ }
+
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+
+ }
+)
+
+
+
+
+
+//淇敼鐩稿悓浜у搧鍚嶇О鏍囩
+const updateProductName = (event, index,id) => {
+ // 鍒涘缓鏄犲皠瀵硅薄
+ const propertyMapping = {};
+ labelList.forEach(item => {
+ propertyMapping[item.name] = item.title;
+ });
+ // 杈撳叆鐨勫��
+ const newValue = event.target.innerText;
+ const parts = newValue.split('锛�');
+ const result = parts[1]; // 鑾峰彇鍐掑彿鍚庣殑閮ㄥ垎
+
+ // 鑾峰彇鏄犲皠涓墍鏈夌殑閿�
+ const keys = Object.keys(propertyMapping);
+
+ // 鏍规嵁 index 鑾峰彇瀵瑰簲鐨勫睘鎬у悕
+ const propertyName = keys[index];
+
+ // 濡傛灉鏄犲皠涓病鏈夎 index锛岀洿鎺ヨ繑鍥�
+ if (!propertyName) {
+ console.warn('Unsupported index:', index);
+ return;
+ }
+
+ // 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
+ lastList.value.forEach(obj => {
+ // 鑾峰彇鍓嶇紑鍜� orderId
+ const prefix = obj.processId.substring(0, 11);
+ const orderId = obj.orderId;
+ const glassNumber=lastList.value[id].glassNumber
+ // 鏍规嵁 propertyName 鏇存柊灞炴��
+ if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
+ obj.productAbbreviation = result;
+ }
+
+ if (propertyName === 'project' && orderId === obj.orderId) {
+ obj.project = result;
+ }
+ if (propertyName === 'productName' && glassNumber === obj.glassNumber){
+ obj.productName = result;
+ }
+ });
+}
+
+
+
+</script>
+
+<template>
+ <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
+ <div v-for="(item1,index) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+ <div class="row4">{{ faceOrientation }}</div>
+ <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
+ <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" contenteditable="true" @input="updateProductName($event, id,index)" v-text="item.title+'锛�'+item1[item.name]"></div>
+<!-- <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]" @keyup="updataProductName()" style="border: none;"/></div>-->
+<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>-->
+ </div>
+ <div v-html="company.printLabel.custom(item1)"></div>
+ </div>
+ </div>
+
+
+
+
+</template>
+
+<style scoped>
+* {
+ margin: 0;
+ padding: 0;
+}
+
+textarea {
+ border: none; /* 鍙栨秷榛樿杈规 */
+ padding: 0; /* 鍙栨秷榛樿鍐呰竟璺� */
+ margin: 0; /* 鍙栨秷榛樿澶栬竟璺� */
+ resize: none; /* 绂佺敤璋冩暣澶у皬鍔熻兘 */
+ font-family: Arial; /* 璁剧疆鑷畾涔夊瓧浣� */
+ font-size: 12px; /* 璁剧疆鑷畾涔夊瓧浣撳ぇ灏� */
+ line-height: 1; /* 璁剧疆琛岄珮 */
+ width: 100%; /* 璁剧疆瀹藉害涓�100% */
+ height: auto; /* 楂樺害鏍规嵁鍐呭鑷姩璋冩暣 */
+ box-sizing: border-box; /* 浣垮楂樺寘鎷唴杈硅窛鍜岃竟妗� */
+ overflow-y: hidden;
+}
+
+
+body {
+ overflow: hidden;
+ font-family: Arial;
+ font-size: 7px;
+}
+
+#printButton {
+ margin-top: -20px;
+ width: 100px;
+}
+
+.print{
+ width: 100%;
+ height: 100%;
+}
+
+/*鎴�*/
+.printFlowCard_finished {
+ /*
+ font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+ */
+ flex-wrap: nowrap;
+ display: flex;
+ flex-direction: column;
+}
+
+
+/*鎴�*/
+.entirety_finished {
+ display: flex;
+ text-align: center;
+ flex-direction: column;
+ margin-left: 10px;
+ width: 100%;
+ height: 100%;
+
+}
+
+/*div{
+ font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+}*/
+
+.row3 {
+ text-align: center;
+ /*display: flex;
+ justify-content:space-evenly;*/
+}
+
+.row3 label {
+ margin-top: 28px;
+}
+
+.contentRow {
+ font-weight: bolder;
+ display: flex;
+ text-align: center;
+ width: 100%;
+}
+
+label {
+ /*font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;*/
+}
+
+.contentRow .row1 {
+ width: 100%;
+}
+
+.entirety_finished .row4 {
+ font-weight: bolder;
+ text-align: right;
+ margin-right: 20px;
+}
+
+.contentRow .row1, .contentRow .row2 {
+ text-align: left;
+}
+
+input{
+ width: 100%;
+ border: none;
+}
+
+
+@page {
+ size: auto; /* auto is the initial value */
+ margin: 13mm 5mm 0mm 7mm; /* this affects the margin in the printer settings */
+}
+
+@media print {
+ div {
+ page-break-inside: avoid;
+ }
+
+ .entirety_finished {
+ page-break-before: always;
+ }
+
+}
+
+.printFlowCard_finished1 {
+ flex-wrap: wrap;
+ display: flex;
+ flex-direction: column;
+}
+
+
+/*鎴�*/
+.entirety_finished1 {
+ display: flex;
+ text-align: center;
+ flex-direction: column;
+ margin-left: 10px;
+ width: 337px;
+ height: 120px;
+
+}
+
+.contentRow1 {
+ font-weight: bolder;
+ display: flex;
+ text-align: center;
+ width: 100%;
+}
+
+.contentRow1 .row1 {
+ width: 30%;
+ font-weight: bolder;
+}
+
+.entirety_finished1 .row4 {
+ font-weight: bolder;
+ text-align: right;
+ margin-right: 10px;
+}
+
+.contentRow1 .row1, .contentRow1 .row2 {
+ text-align: left;
+ font-weight: bolder;
+}
+
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
index 99032c9..5b4e79a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
@@ -110,7 +110,7 @@
<div v-for="(item1,id) in lastList" :class="company.printLabel.className.semi.entiretyName()">
<div class="row4">{{ faceOrientation }}</div>
<div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()">
- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" >{{ item.title }}锛歿{ item1[item.name] }}</div>
+ <div contenteditable="true" v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" >{{ item.title }}锛歿{ item1[item.name] }}</div>
<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2">{{ item1[item.name] }}</div>-->
</div>
<div v-html="company.printLabel.customSemi(item1)"></div>
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 8c71361..58a08ed 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -135,10 +135,13 @@
const handleGetQRCode = async () => {
- console.log(produceList.value)
+ let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
-
- const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
+ technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
+ }else {
+ technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ }
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
for (let j = 0; j < technologyNumber.length; j++) {
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index c5bcd00..9061f56 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -419,6 +419,16 @@
component: () => import('../components/pp/SelectSortDetailProcessCard.vue'),
},
{
+ path: 'printFlowCardDetails',
+ name: 'printFlowCardDetails',
+ component: () => import('../views/pp/processCard/PrintFlowCardDetails.vue'),
+ },
+ {
+ path: 'printCustomLabelDetails',
+ name: 'printCustomLabelDetails',
+ component: () => import('../components/pp/PrintCustomLabelDetails.vue'),
+ },
+ {
path: '',
redirect:'/main/processCard/SelectProcessCard'
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
new file mode 100644
index 0000000..fd1d154
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -0,0 +1,765 @@
+<script setup>
+
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {useRouter} from 'vue-router'
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {VXETable} from "vxe-table";
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
+import PrintProcess from '@/components/pp/PrintProcess.vue'
+import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
+import PrintCustomLabel from '@/components/pp/PrintCustomLabelDetails.vue'
+import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
+import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
+import footSum from "@/hook/footSum"
+import companyInfo from "@/stores/sd/companyInfo"
+import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
+
+const company = companyInfo()
+
+
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+const dialogTableVisible = ref(false)
+const dialogTableVisibleLabel = ref(false)
+const dialogTableVisibleCustomLabel = ref(false)
+const printVisible = ref(false)
+let selectRecords = ref(null)
+
+const selectRecordsData = ref({
+ printList: []
+})
+
+const xGrid = ref(null)
+const xGridDetail = ref(null)
+
+//鎺掑簭
+let editRow = ref({
+ processId: null,
+ technologyNumber: null,
+ process:null
+})
+
+//鎵撳嵃
+let printRow = ref({
+ list: null,
+ printMergeVal: null,
+ like: null
+})
+
+//鏍囩
+let labelRow = ref({
+ list: null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation: null,//鍐呭闈�
+ type: null,//鏍囩妯℃澘
+ lableType: null//鏍囩绫诲瀷
+})
+
+
+const getTableRow = (row, type) => {
+ switch (type) {
+ case 'edit' : {
+ editRow.value.processId = row.process_id
+ editRow.value.technologyNumber = row.technology_number
+ editRow.value.process = row.process
+ printVisible.value = true
+
+ // router.push({path: '/sort-detail', query: {processId: row.process_id,technologyNumber:row.technology_number}})
+ break
+ }
+ }
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+ orderGlassDetail: {
+ productionId: '',
+ },
+ orderDetail: {
+ orderId: '',
+ productId: '',
+ productName: '',
+ }
+
+
+})
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceDetailList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
+//瀹ゅ唴瀹ゅ闈�
+const stateValue = ref('')
+const stateOptions = [
+ {
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
+ },
+ {
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
+ },
+]
+
+//鏍囩绫诲瀷
+let filteredOptions = []
+const lableType = ref('1')
+const lableTypeOptions = [
+ {
+ value: '1',
+ label: t('processCard.finishedProductLabel'),
+ },
+
+]
+let hidePrintLabels = company.printLabel.hideButton;
+
+if (hidePrintLabels == 'true') {
+ filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
+} else {
+ filteredOptions = lableTypeOptions;
+}
+
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions = [{}]
+
+const printContent = ref({
+ id: 'child',
+
+})
+
+
+const printContentLabel = ref({
+ id: 'childLabel',
+})
+
+const printContentLabelSemi = ref({
+ id: 'childLabelSemi',
+})
+
+//鎵撳嵃绫诲瀷
+const printType = ref()
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ dataType: [],
+})
+
+const data = ref({
+ printList: []
+})
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+
+let orderId = route.query.orderId
+data.value.printList = JSON.parse(route.query.printList)
+
+let inquiryMode = route.query.checkedValue
+// 绗竴娆″姞杞芥煡璇�
+request.post(`/processCard/selectPrintDetails/${inquiryMode}`, data.value).then((res) => {
+
+ if (res.code == 200) {
+ let newDataCollection = [];
+ for (let i = 0; i < res.data.data.length; i++) {
+ res.data.data[i].detail.forEach((item) => {
+ newDataCollection.push(item);
+ })
+ }
+
+ titleSelectJson.value.dataType = res.data.type
+ xGrid.value.reloadData(newDataCollection)
+ gridOptions.loading = false
+ hideButton()
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
+
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+
+const gridOptions = reactive({
+ loading: true,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'printFlowCard_1',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollX: {enabled: true},
+ scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
+ },
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
+ },
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: t('basicData.operate'), width: 55, slots: {default: 'button_slot'}, fixed: "left"},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'order_id',
+ title: t('order.orderId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 120
+ },
+ {
+ field: 'process_id',
+ title: t('processCard.processId'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 140
+ },
+ {
+ field: 'customer_name',
+ title: t('customer.customerName'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 120
+ },
+ {
+ field: 'project',
+ title: t('order.project'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: 120
+ },
+ {
+ field: 'order_number',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 100
+ },
+ {
+ field: 'glassNumber',
+ title: t('reportingWorks.glassNumber'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 100
+ },
+ {field: 'quantity', title: t('order.quantity'), width: 90},
+ {field: 'total_area', title: t('order.area'), width: 90},
+ {field: 'product_name', title: t('order.product'), width: 120},
+ {
+ field: 'glass_child',
+ title: t('reportingWorks.glassChild'),
+ width: 120,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'founder', title: t('processCard.founder'), width: 120},
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), width: 120},
+ {
+ field: 'process', title: t('craft.process'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 160
+ },
+ {
+ field: 'print_status',
+ title: t('processCard.printStatus'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 120
+ },
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ buttons: [
+ {code: 'print', name: t('processCard.print'), 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'},
+ // {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
+ ],
+ // import: false,
+ // export: true,
+ //print: true,
+ zoom: true,
+ custom: true
+ },
+ data: null,//琛ㄦ牸鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ const List = ["quantity", 'total_area',]
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ },
+
+
+})
+
+const gridEvents = {
+ toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ selectRecords = $grid.getCheckboxRecords()
+ // selectRecords.forEach(obj => {
+ // delete obj.print_status;
+ // });
+ let type = printType.value
+ let faceOrientation = stateValue.value
+ let lableTypes = lableType.value
+ let lableTitle = lableType.text
+ if ($grid) {
+ switch (code) {
+ case 'print': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal = printMerge.value
+ printRow.value.like = null
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableVisible.value = true
+ break
+ }
+
+ case 'printLabel': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
+
+ break
+ }
+ case 'printLabel2': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ router.push({
+ path: '/main/processCard/PrintCustomLabelSemi2',
+ query: {printList: JSON.stringify(selectRecords)}
+ })
+
+ break
+ }
+ case 'sort': {
+ const $table = xGridDetail.value
+ let data = $table.getTableData().fullData
+ let flowCardData = ref({
+ flowCard: data,
+ })
+ for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(flowCardData.value.flowCard[i].sort)) {
+ ElMessage.warning(t('basicData.msg.greater0'))
+ return; // 濡傛灉鏈変竴涓笉鏄暣鏁�
+ }
+ }
+ request.post("/processCard/printSort", flowCardData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('processCard.sortingSuccessful'))
+ router.push({
+ path: '/main/processCard/PrintFlowCard',
+ query: {orderId: orderId, random: Math.random()}
+ })
+
+ //location.reload();
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ break
+ }
+ case 'customLabel': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (type === null || type === '' || type === undefined) {
+ ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ if (lableTypes == 1) {
+
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation = faceOrientation
+ labelRow.value.type = type
+ labelRow.value.lableType = lableTypes
+ if (company.label === 1) {
+ dialogTableVisibleLabel.value = true
+ } else if (company.label === 2) {
+ router.push({
+ path: '/main/processCard/PrintCustomLabel',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords)
+ }
+ })
+ }
+
+ } else if (lableTypes == 2) {
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation = faceOrientation
+ labelRow.value.type = type
+ labelRow.value.lableType = lableTypes
+ if (company.label === 1) {
+ dialogTableVisibleCustomLabel.value = true
+ } else if (company.label === 2) {
+ router.push({
+ path: '/main/processCard/PrintCustomLabelSemi',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords)
+ }
+ })
+ }
+ } else if (lableTypes == 3) {
+ router.push({
+ path: '/main/processCard/PrintLabel1',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords)
+ }
+ })
+
+ }
+
+
+ break
+ }
+ case 'printLike': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (printMerge.value === null || printMerge.value === '') {
+ ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal = printMerge.value
+ printRow.value.like = "1"
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableVisible.value = true
+ break
+ }
+ }
+ }
+ },
+}
+
+
+const openedTable = () => {
+ let detail = ref(produceDetailList.value)
+ xGridDetail.value.reloadData(detail.value)
+ addListener(xGridDetail.value, detailGridOptions)
+}
+
+const hideButton = () => {
+ // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
+ if (hidePrintLabels == 'true') {
+ return button.code !== 'printLabel' && button.code !== 'printLabel2';
+ } else {
+ return true && button.code !== 'printLike'; // 鏄剧ず璇ユ寜閽�
+ }
+ })
+}
+
+
+// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
+const printNumber = () => {
+
+ selectRecordsData.value.printList = selectRecords
+ let printState = 0
+ request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ } else {
+
+ ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+}
+
+</script>
+
+<template>
+ <div class="main-div-customer">
+ <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
+ style="width: 90px"></el-input>
+
+ <label>{{ $t('processCard.labelStyle') }}锛�</label>
+ <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
+ style="width: 120px">
+ <el-option
+ v-for="item in titleSelectJson['dataType']"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
+
+ <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
+ <el-option
+ v-for="item in filteredOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+ <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
+ filterable style="width: 140px">
+ <el-option
+ v-for="item in stateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+
+
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+
+ </li>
+ </ul>
+ </template>
+
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+ <template #button_slot="{ row }">
+ <el-button link
+ size="small"
+ type="primary"
+ @click="getTableRow(row,'edit')">
+ {{ $t('basicData.edit') }}
+ </el-button>
+
+ </template>
+
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data"
+ type="text"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+
+
+ </vxe-grid>
+ <!-- 娴佺▼鍗℃墦鍗� -->
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ :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 @click="printNumber"/>
+ </template>
+ <print-process
+ id="child"
+ :printLike="printRow.like"
+ :printList="printRow.list"
+ :printMerge="printRow.printMergeVal"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <!-- 鎴愬搧鏍囩-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabel"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabel" :icon="Printer" circle/>
+ </template>
+ <print-custom-label id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <!-- 灏忕墖鏍囩 -->
+ <el-dialog
+ id="sizeCustomSemi"
+ v-model="dialogTableVisibleCustomLabel"
+ :title="$t('processCard.labelStyle')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-semi id="childLabelSemi"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <!-- 鎺掑簭-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="printVisible"
+ :title="$t('processCard.processCardDetails')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" :process="editRow.process"/>
+ </el-dialog>
+
+
+ </div>
+</template>
+
+<style scoped>
+.main-div-customer {
+ width: 99%;
+ height: 92%;
+}
+
+
+:deep(#sizeCheck .el-dialog__body) {
+ height: 90%;
+ width: 100%;
+}
+
+:deep(#sizePrintCalrd .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+
+:deep(#sizeCustom .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+
+:deep(#sizeCustomSemi .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+
+</style>
\ No newline at end of file
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 1885c7f..d09e33e 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
@@ -105,12 +105,19 @@
if (project==''){
project=null
}
+
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ gridOptions.toolbarConfig.buttons[2].visible=false
+ let roleId=res.data.user
+ if (roleId=='1' || roleId=='17'){
+ gridOptions.toolbarConfig.buttons[2].visible=true
+ }
+
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -217,6 +224,7 @@
buttons: [
{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
+ {code: 'detailsPrint', name: '鏄庣粏鎵撳嵃', status: 'primary'},
],
@@ -271,6 +279,26 @@
return;
}
+ case 'detailsPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+ return;
+
+ }
}
}
}
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 bfd4992..84a7bf1 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
@@ -157,14 +157,15 @@
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("SelectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@PathVariable String orderId,
@PathVariable String project,
+ @PathVariable String userId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -302,4 +303,22 @@
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
}
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/selectPrintDetails/{inquiryMode}")
+ public Result selectPrintDetails(
+ @PathVariable String inquiryMode,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
+ public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+
+ }
}
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 34da4e6..6a87333 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
@@ -155,4 +155,10 @@
Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+
+ List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+ List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+
+ String selectUserMp(String userId);
}
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 6cfe16c..39e758f 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
@@ -200,7 +200,7 @@
return map;
}
- public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard) {
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project,String userId, FlowCard flowCard) {
if ("null".equals(orderId)) {
orderId = "";
}
@@ -209,6 +209,8 @@
}
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ String roleId=flowCardMapper.selectUserMp(userId);
+ map.put("user",roleId );
return map;
}
@@ -577,6 +579,48 @@
printLike=null;
return map;
}
+
+ public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode) {
+ 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()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
+ map.put("type", flowCardMapper.selectType());
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelDetailsSv(String type, Integer lableType, Map<String, Object> object) {
+ 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()) {
+
+ if (lableType != 2){
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
+ list.add(itemmap);
+ }
+ }
+ else{
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
+ list.add(itemmap);
+ }
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
}
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 a192c67..1f1583c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -543,7 +543,7 @@
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,
+ 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}
@@ -581,7 +581,7 @@
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,
+ 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
@@ -615,7 +615,8 @@
sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
- concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
+ concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks,
+ '' as qrcode
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
@@ -1738,8 +1739,8 @@
o.project,
ogd.technology_number,
ogd.glass_address,
- sum(od.quantity) as quantity,
- sum(ogd.total_area) as total_area,
+ sum(fc.quantity) as quantity,
+ round(sum(ogd.child_width*ogd.child_height*fc.quantity/1000000) ,2) as total_area,
od.product_name,
ogd.glass_child,
fc.founder,
@@ -1787,7 +1788,7 @@
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,
+ 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}
@@ -1825,7 +1826,7 @@
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,
+ 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
@@ -1881,7 +1882,8 @@
sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
- concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
+ concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks,
+ fc.technology_number as qrcode
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
@@ -1904,4 +1906,102 @@
and position(fc.technology_number in #{technologyNumber})
group by fc.process_id limit 1
</select>
+
+ <select id="selectPrintDetailsMp">
+ select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogd.technology_number,
+ ogd.glass_address,
+ (fc.quantity) as quantity,
+ round((ogd.child_width*ogd.child_height*fc.quantity/1000000) ,2) 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,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
+ od.order_number
+ 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, od.order_number
+ order by fc.process_id,od.order_number
+ </select>
+
+ <select id="getPrintCustomDataDetails">
+ select o.order_id as orderId,
+ project,
+ customer_id as customerId,
+ o.customer_name as customerName,
+ order_type as orderType,
+ order_classify as orderClassify,
+ batch,
+ o.icon,
+ pack_type as packType,
+ delivery_date as deliveryDate,
+ al_type as alType,
+ money,
+ contract_id as contractId,
+ customer_batch customerBatch,
+ contacts,
+ delivery_address as deliveryAddress,
+ od.processing_note as processingNote,
+ width,
+ height,
+ od.quantity,
+ od.order_number as orderNumber,
+ fc.technology_number as technologyNumber,
+ od.building_number as buildingNumber,
+ od.product_name as productName,
+ od.edging_type as edgingType,
+ p.remarks,
+ c.customer_abbreviation as customerAbbreviation,
+ p.product_abbreviation as productAbbreviation,
+ fc.process_id as processId,
+ o.create_time as createTime,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS colourCeramicGlaze,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS remarks1,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS remarks2,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S06')) AS remarks3,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S07')) AS remarks4,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S08')) AS remarks5,
+ p.remarks as filmNumber,
+ od.bend_radius as bendRadius,
+ od.other_columns,
+ ogd.glass_child as glassChild,
+ ogd.glass_address as glassAddress,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number
+ left join sd.product as p on p.id = od.product_id
+ left join sd.customer as c on c.id = o.customer_id
+ left join sd.product_detail as pd on pd.prod_id = p.id and pd.sort_num = od.order_number and
+ pd.glass_sort = fc.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
+ where fc.process_id = #{processId}
+ and fc.order_number=#{orderNumber}
+ group by fc.process_id,od.order_number, width, height
+ order by fc.process_id
+ </select>
+
+ <select id="selectUserMp">
+ select role_id from
+ erp_user_info.`user` as u left join erp_user_info.user_role as ur on u.id=ur.user_id
+ where u.login_name=#{userId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0