From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/温州巨星.js | 1
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java | 6
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 1
north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue | 45 +++++++
north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue | 3
north-glass-erp/northglass-erp/src/stores/sd/companySet/上海北玻.js | 1
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue | 3
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 9
north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue | 152 ++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 23 +++
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 1
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java | 13 +-
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 6 +
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 1
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java | 2
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 37 ++++--
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 4
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 10 +
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 6
24 files changed, 289 insertions(+), 41 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
index 1db48b7..4e8ead6 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -82,13 +82,14 @@
for (const group of list.value) {
// 閬嶅巻姣忕粍涓殑鏁版嵁锛堟浛鎹� j锛�
for (const item of group.data) {
+ console.log(item)
const { quantity, newList } = item;
// 璺宠繃 quantity 涓� 0 鎴栨棤鏁堢殑鎯呭喌
+ console.log(quantity)
if (!quantity || quantity <= 0) continue;
// 澶勭悊 newList锛氱‘淇濇槸鏁扮粍锛屼笉瓒虫椂鐢ㄧ┖瀵硅薄鍏滃簳
const safeNewList = Array.isArray(newList) ? newList : [];
-
// 寰幆 quantity 娆★紝娣诲姞鏁版嵁鍒� lastList
for (let k = 0; k < quantity; k++) {
// 娣辨嫹璐� item锛岄伩鍏嶉噸澶嶅紩鐢紙鍏抽敭锛侊級
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 222227b..5ffc88d 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -92,7 +92,6 @@
//娴佺▼鍗�
request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
if (res.code == 200) {
- console.log(res.data.data)
load(res.data.data)
} else {
ElMessage.warning(res.msg)
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 c8474ee..badc31c 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -110,30 +110,41 @@
}
- // 浣跨敤涓�涓璞℃潵瀛樺偍鍚堝苟鍚庣殑缁撴灉
const mergedData = produceList.value.reduce((acc, item) => {
- const processId = item.detail[0].process_id;
+ // detail 涓虹┖鐩存帴璺宠繃
+ const firstDetail = item?.detail?.[0]
+ if (!firstDetail) return acc
- // 濡傛灉璇� process_id 灏氭湭鍦� acc 涓紝鍒濆鍖栧叾鏁扮粍
- if (!acc[processId]) {
- acc[processId] = {
+ const processId = firstDetail.process_id
+ const technologyNumber = firstDetail.technologyNumber
+
+ const key = company.printReplenishMerge
+ ? processId
+ : `${processId}_${technologyNumber}`
+
+ // 鍒濆鍖栧垎缁�
+ if (!acc[key]) {
+ acc[key] = {
+ processId,
+ technologyNumber,
processList: item.processList,
detailList: [],
detail: item.detail
- };
+ }
}
- // 鍚堝苟 detailList
- acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
+ // 鍚堝苟 detailList
+ if (Array.isArray(item.detailList) && item.detailList.length) {
+ acc[key].detailList.push(...item.detailList)
+ }
- return acc;
- }, {});
+ return acc
+ }, {})
// 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
-
- if (company.printReplenishMerge){
+ //if (company.printReplenishMerge){
produceList.value = Object.values(mergedData);
- }
+ //}
flowCardCount=produceList.value.length
handleSummary()
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
index 477a3b6..b9853c9 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
@@ -88,13 +88,12 @@
})
-
const errMap = await $grid.validate(true)
if (errMap) {
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
- //emit('getParent')
+ emit('getParent')
break
}
}
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue b/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
index 7cb8bb5..74fe908 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
@@ -24,6 +24,8 @@
orderId:null,
state:null
})
+let imgWidth = ref(null)
+let imgHeight = ref(null)
const form = reactive({
format: 'png'
@@ -40,6 +42,8 @@
}
result.value = res.data
conversionResult.value = res.data.imageBase64
+ imgWidth.value = res.data.width
+ imgHeight.value = res.data.height
})
}
@@ -107,6 +111,22 @@
ElMessage.warning(t("order.msg.pleaseUploadPicture1"))
return
}
+ if(imgHeight.value ){
+ const regex = /^(0|[1-9]\d{0,2}|1000)$/
+ if(!regex.test(imgHeight.value)){
+ ElMessage.warning(`height:0~1000`)
+ return
+ }
+ }
+
+ if(imgWidth.value ){
+ const regex = /^(0|[1-9]\d{0,2}|1000)$/
+ if(!regex.test(imgWidth.value)){
+ ElMessage.warning(`width:0~1000`)
+ return
+ }
+ }
+
loadingFormats.value = true
converting.value = true
@@ -124,7 +144,9 @@
const data ={
file:fileList.value[0].raw,
- name:fileList.value[0].raw.name
+ name:fileList.value[0].raw.name,
+ width:imgWidth.value || 1000,
+ height:imgHeight.value || 700,
}
request.post(`/orderFile/updateOrderFileByOrderNumber/${props.orderId}/${props.rowIndex.orderNumber}`,data).then(res=>{
if (res.code === '200') {
@@ -244,9 +266,27 @@
{{$t("order.msg.pleaseUploadPicture10")}} <em>{{$t("order.msg.pleaseUploadPicture11")}}</em>
</div>
<template #tip>
+ <div class="el-upload__tip" style="width: 30%;margin-left: 35%">
+ <el-row>
+ <el-col :span="12">
+ <el-input
+ v-model.number="imgWidth"
+ placeholder="瀹�"/>
+ </el-col>
+ <el-col :span="12">
+ <el-input
+ v-model.number="imgHeight"
+ placeholder="楂�"/>
+ </el-col>
+ </el-row>
+ </div>
+
+
+
<div class="el-upload__tip">
{{$t("order.msg.pleaseUploadPicture12")}}
</div>
+
</template>
</el-upload>
@@ -307,7 +347,7 @@
:src="conversionResult"
:preview-src-list="[conversionResult]"
fit="contain"
- style="max-height: 600px;"
+ :style="{width: `${imgWidth}px`, height: `${imgHeight}px`}"
>
<!-- <template #error>-->
<!-- <div class="image-slot">-->
@@ -418,6 +458,7 @@
margin: 20px 0;
display: flex;
justify-content: center;
+ overflow: auto;
}
.file-info {
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
index 63eca5d..3b5d0f2 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
index b7c32da..2d6b5fb 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index eaafeec..355bb6c 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index acfefde..266dd9f 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
index c6f70aa..8bb59f2 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
index ed51673..c4d95ee 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: true,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(澶�)',
inside:'(鍐�)',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index ba75499..72d4562 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ sizeCheck: false,//灏哄鏍￠獙锛宼rue寮�鍚紝false鍏抽棴
position:{
outside:'(鍐�)',
inside:'(澶�)',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
index af2a3bc..ab88f44 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
@@ -15,6 +15,8 @@
import PrintProcess from "@/components/pp/PrintProcess.vue";
import PrintCustomLabelXJ from "@/components/pp/PrintCustomLabelTwo.vue";
import companyInfo from "@/stores/sd/companyInfo";
+import {createTemplate} from "@/hook/createTemplateTag";
+import {hiprint} from "vue-plugin-hiprint";
//璇█鑾峰彇
const { t } = useI18n()
let router=useRouter()
@@ -24,6 +26,8 @@
const dialogTableVisible = ref(false)
const dialogTableVisibleLabel = ref(false)
+
+let lastList = ref([])
let props = defineProps({
orderId:null
@@ -86,6 +90,84 @@
}
})
+//鏍囩
+let labelRow = ref({
+ list: null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation: null,//鍐呭闈�
+ type: null,//鏍囩妯℃澘
+ lableType: null//鏍囩绫诲瀷
+})
+//閫変腑鍐呭
+let selectRecords = ref(null)
+
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions = [{}]
+
+//鍊掑彊
+let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
+//鍚堟灦鎵撳嵃
+let compound = ref(null)
+
+const printContent = ref({
+ id: 'child',
+
+})
+
+let hiprintTemplate = ref(null)
+
+const printContentLabel = ref({
+ id: 'childLabel',
+})
+
+const printContentLabelSemi = ref({
+ id: 'childLabelSemi',
+})
+
+const changeTag = () => {
+ hiprintTemplate.value = new hiprint.PrintTemplate({});
+ hiprintTemplate.value.design("#hiprint-printTemplate1",{grid:true});
+ const json = tag.value.value
+ hiprintTemplate.value.update(json)
+}
+
+const printOrder = (type) => {
+ printNumberLabel()
+ const list = tag.value.value
+ list.panels[0].printElements.forEach(element => {
+ element.options.fontFamily = 'Arial'
+ if( element.options.field !== undefined){
+ if(type===3 ){
+ element.options.hideTitle = true
+ }
+ }
+ if(type!==3){
+ element.options.hideTitle = false
+ if( element.options.field === undefined){
+ element.options.hideTitle = true
+ }
+ }
+ })
+
+ //hiprintTemplate.value.update(list)
+ let object = JSON.parse(JSON.stringify(lastList.value))
+ //鍒ゆ柇鏄惁涓鸿〃鏍�
+ let columnsNum = null
+ if(list.panels[0].printElements[0].options.field==='table'){
+ object = {table:lastList.value}
+ columnsNum = (list.panels[0].printElements[0].options.gridColumns || 1)
+ }
+ //鍒ゆ柇鏄惁鏈� 宓屽鑷畾涔夌焊寮�
+ if(tag.value.tagHeight && tag.value.tagWidth){
+ const print =createTemplate(list,object,tag.value.tagWidth,tag.value.tagHeight)
+ hiprintTemplate.value.update(print.template)
+ object = print.printData
+ }
+ hiprintTemplate.value.print(object)
+
+}
//闇�瑕佸悎骞剁殑鍒�
let column = [1,3,8]
@@ -305,9 +387,9 @@
// delete obj.print_status;
// });
let type = tag.value.name
- let faceOrientation = stateValue.value
- let lableTypes = lableType.value
- let lableTitle = lableType.text
+ let faceOrientation = ''
+ let lableTypes = 1
+ let lableTitle = ''
if ($grid) {
switch (code) {
//鎵撳嵃娴佺▼鍗�
@@ -329,7 +411,7 @@
printRow.value.printMergeVal = printMerge.value
printRow.value.like = null
printRow.value.merge = company.flowCardMerge
- printRow.value.printFc= printFc
+ printRow.value.printFc= true
printRow.value.flashback = flashback.value
printRow.value.landingSequence=landingSequence.value
printRow.value.compound = compound.value
@@ -356,7 +438,7 @@
id += selectRecords[i].id + "|"
}
}
-
+ lastList.value = []
labelRow.value.list = JSON.stringify(selectRecords)
labelRow.value.faceOrientation = faceOrientation
labelRow.value.type = tag.value.name
@@ -385,6 +467,38 @@
const handleCellDblClick = ({ row, column, cell, $event }) => {
VxeUI.clipboard.copy(row[column.property])
+}
+
+const selectRecordsData = ref({
+ printList: []
+})
+// 鐩戝惉娴佺▼鍗℃墦鍗板畬鎴愪簨浠�
+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'))
+
+ }
+ })
+}
+
+// 鐩戝惉鏍囩鎵撳嵃瀹屾垚浜嬩欢
+const printNumberLabel = () => {
+
+ selectRecordsData.value.printList = selectRecords
+ request.post(`/tagStyle/updatePrintNumber`, selectRecordsData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ } else {
+
+ ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
}
</script>
@@ -429,6 +543,7 @@
v-bind="gridOptions"
:merge-cells="mergeCells"
@cell-dblclick="handleCellDblClick"
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -534,6 +649,33 @@
height: calc(100% - 35px);
}
+: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;
+}
+
+:deep(#titleStyle .el-dialog__body){
+ height: 93%;
+ width: 100%;
+}
.vxe-grid {
/* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
-webkit-user-select: none;
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
index 785d376..1f68f16 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
@@ -28,7 +28,7 @@
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/processCard/productionScheduling' }">{{$t('processCard.scheduling')}}
</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" >{{ $t('basicData.print') }}</el-breadcrumb-item>
-<!-- <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/printProgressProcessCard' }" >{{ $t('processCard.printProgressProcessCard') }}</el-breadcrumb-item>-->
+ <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/printProgressProcessCard' }" >{{ $t('processCard.printProgressProcessCard') }}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/processCard/selectPrintProject' }" >{{$t('processCard.engineeringPrinting')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" style="display: none">{{ $t('basicData.print') }}</el-breadcrumb-item>
</el-breadcrumb>
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 47d70ab..15addfc 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
@@ -477,9 +477,11 @@
if (val<row.completedQuantityComputed){
//搴撳瓨鏁伴噺銆佸凡鍏ュ簱鏁伴噺
if (val>(row.inventory_quantity-row.received_quantity)){
- return new Error(`val
+ if (totalQuantity-val>(row.inventory_quantity-row.received_quantity)){
+ return new Error(`val
<=
${row.inventory_quantity-row.received_quantity}`)
+ }
}else {
if (val < (row.inventory_quantity-row.received_quantity)){
//瀹屽伐鎬绘暟銆佹湰娆″畬宸ユ暟銆佸凡鍏ュ簱鏁伴噺
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 092233c..8ad123e 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -85,6 +85,7 @@
otherMoneyRemarks:'',
processingNote:t('order.processingNote')+':',
createOrder:0,
+ sizeCheck:null,
creatorId:userStore.user.userId,
creator:userStore.user.userName,
})
@@ -1030,7 +1031,13 @@
'name': t('order.saveHeader')}
gridOptions.toolbarConfig.buttons.push(buttonTitle)
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
- gridOptions.toolbarConfig.buttons[1].disabled = false
+ if(!company.sizeCheck || (company.sizeCheck && titleUploadData.value.sizeCheck === 1)){
+ gridOptions.toolbarConfig.buttons[1].disabled = false
+ }
+
+
+
+
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
@@ -1383,7 +1390,19 @@
}
const gaveOrderSizeCheck = () => {
- reviewOrder(2)
+ sizeCheck()
+}
+const sizeCheck = () => {
+ request.post(`/order/sizeCheck/${titleUploadData.value.orderId}`).then(res =>{
+ if(res.data===1){
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ router.push({
+ path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+ }
+ })
}
let projects = ref([])
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 145d71e..932056b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -289,6 +289,12 @@
return Result.success(orderService.processAttributeConfig());
}
+ @ApiOperation("鏌ヨ宸ヨ壓灞炴�ч厤缃�")
+ @PostMapping("/sizeCheck/{orderId}")
+ @SaCheckPermission("createOrder.add")
+ public Result sizeCheck(@PathVariable String orderId) {
+ return orderService.sizeCheck(orderId);
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
index 1094e5b..f24ef32 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
@@ -22,10 +22,14 @@
public Result updateOrderFileByOrderNumber(
@RequestParam("file") MultipartFile file,
@RequestParam("name") String name,
+ @RequestParam("width") Float width,
+ @RequestParam("height") Float height,
@PathVariable String orderId,
@PathVariable String orderNumber) throws IOException {
- return Result.success(orderFileService.updateOrderFileByOrderNumber(file,name,orderId,orderNumber));
+ return Result.success(
+ orderFileService.updateOrderFileByOrderNumber(file,name,orderId,orderNumber,width,height)
+ );
}
@PostMapping("/getOrderFilePicture")
public Result getOrderFilePicture(@RequestBody List<Map<String,Object>> orderDetails) throws NoSuchFieldException {
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index abf8760..e8900da 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -102,6 +102,7 @@
private LocalDate updateTime;
@ExcelProperty("淇敼鐗堟湰鍙�")
private Integer version;
+ private Integer sizeCheck;
@TableField(select = false,exist = false)
private Integer goodsQuantity;
@TableField(select = false,exist = false)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java
index 944651a..9b391c9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java
@@ -18,6 +18,8 @@
private String fileData;
private String fileJson;
private String imageBase64;
+ private Float width;
+ private Float height;
private LocalDateTime createTime;
}
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 1e40d95..b1ba51e 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
@@ -741,7 +741,11 @@
Map<String, Object> itemmap = new HashMap<>();
Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
- List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity());
+ Integer printQuantity = flowCard.getPrintQuantity();
+ if (printQuantity==null){
+ printQuantity=0;
+ }
+ List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), printQuantity);
for (Map<String, Object> detail : details) {
detail.put("sumQuantity", sumQuantity);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index e15bb07..32b2d37 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -53,29 +53,26 @@
return orderFiles;
}
- public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber) throws IOException {
+ public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
//鍒ゆ柇鏄惁瑙勫畾鐨勬牸寮忓悗缂�鍚�
if(!isAllowedFile(name)){
return null;
}
-
try (InputStream is = License.class.getResourceAsStream("/lisence.xml")) {
String base64 = null;
if(name.toLowerCase().endsWith(".dwg")){
-
License license = new License();
license.setLicense(is);
-
// 璋冪敤Image绫荤殑Load鏂规硶鏉ュ姞杞借緭鍏ョ殑DWG鏂囦欢銆�
Image image = Image.load(file.getInputStream());
// 鍒涘缓CadRasterizationOptions瀹炰緥浠ュ惎鐢–AD鏍呮牸鍖栭�夐」銆�
CadRasterizationOptions rasterizationOptions = new CadRasterizationOptions();
// 璁剧疆瀹藉害
- rasterizationOptions.setPageWidth(1000);
+ rasterizationOptions.setPageWidth(width);
// 璁剧疆楂樺害
- rasterizationOptions.setPageHeight(700);
+ rasterizationOptions.setPageHeight(height);
// 璋冪敤杩欎釜setEmbedBackground鏂规硶鏉ヨ缃儗鏅壊鏄惁涓嶇瓑浜庤緭鍑烘牸寮忕殑榛樿鑳屾櫙鑹�
//rasterizationOptions.setEmbedBackground(true);
// 涓虹敓鎴愮殑鍥惧儚鍒涘缓涓�涓狿ngOptions鐨勫疄渚嬶紝骞跺皢鍏跺垎閰嶇粰ImageOptionsBase绫荤殑瀹炰緥銆�
@@ -94,10 +91,12 @@
OrderFile orderFile = new OrderFile();
orderFile.setImageBase64(base64);
- orderFile.setFileName(file.getName());
+ orderFile.setFileName(name);
orderFile.setOrderId(orderId);
orderFile.setOrderNumber(orderNumber);
orderFile.setFileData(Arrays.toString(file.getBytes()));
+ orderFile.setWidth(width);
+ orderFile.setHeight(height);
OrderFile orderFileExist = orderFileMapper
.selectOne(new LambdaQueryWrapper<OrderFile>()
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index d52563d..3a1606e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -9,7 +9,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.*;
@@ -1123,4 +1125,12 @@
map.put("data",processList);
return map;
}
+
+ public Result sizeCheck(String orderId) {
+
+ return Result.success(
+ orderMapper.update(null,
+ new UpdateWrapper<Order>().set("size_check",1).eq("order_id",orderId))
+ );
+ }
}
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 952fb3c..92c10e2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1156,19 +1156,19 @@
od.processing_note as processingNote,
width,
height,
- #{printQuantity} as quantity,
+ if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) as quantity,
CONCAT(
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
' X ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
- ' = ',#{printQuantity} ) as size,
+ ' = ',if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) ) as size,
CONCAT(
od.order_number,') ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
' X ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
- ' = ',#{printQuantity} ) as numberSize,
+ ' = ',if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) ) as numberSize,
CONCAT(
od.order_number,')',' ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
@@ -3979,7 +3979,8 @@
c.print_status,
c.print_number,
o.project,
- o.customer_name
+ o.customer_name,
+ b.process
from pp.flow_card as c
left join
--
Gitblit v1.8.0