From c29b3a5a67e2856b6209488cd204b8f1fb643312 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 06 六月 2025 16:03:30 +0800
Subject: [PATCH] 提交义乌提出修改新增功能
---
north-glass-erp/northglass-erp/src/lang/en.js | 4 +
north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue | 4 -
north-glass-erp/northglass-erp/src/lang/ar.js | 1
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 15 +++++++
north-glass-erp/northglass-erp/src/lang/ru.js | 1
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 29 ++++++++++++++
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 2 +
north-glass-erp/northglass-erp/src/lang/zh.js | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 11 ++++-
9 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
index ded2875..1a37430 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -942,9 +942,25 @@
const printOrder = (type) => {
const list = hiprintTemplate.value.getJson()
+
list.panels[0].printElements.forEach(element => {
element.options.fontFamily = 'Arial'
+ if(element.printElementType.title!==''){
+ element.printElementType.title1=element.printElementType.title
+ element.options.title1 = element.options.title
+ }
+
+ if(type===3){
+ element.printElementType.title=''
+ element.options.title=''
+ }else{
+ element.printElementType.title=element.options.title1
+ element.options.title=element.options.title1
+ }
+
})
+ hiprintTemplate.value.update(list)
+
let object = lastList.value
//鍒ゆ柇鏄惁涓鸿〃鏍�
let columnsNum = null
@@ -960,6 +976,17 @@
hiprintTemplate.value.print(object)
}
+}
+const closeDialog = () => {
+ const list = hiprintTemplate.value.getJson()
+ list.panels[0].printElements.forEach(element => {
+ element.options.fontFamily = 'Arial'
+ if (element.printElementType.title === '') {
+ element.printElementType.title = element.printElementType.title1
+ element.options.title = element.options.title1
+ }
+ })
+ hiprintTemplate.value.update(list)
}
const selectRecordsData = ref({
@@ -1066,10 +1093,12 @@
v-model="dialogTableVisibleLabel"
:title="$t('processCard.printLabel')"
destroy-on-close
+ @close="closeDialog"
style="width: 80%;height:75% ">
<template #header="{ close, titleId, titleClass }">
<el-button @click="printOrder(2);printNumber()" :icon="View" circle/>
<el-button @click="printOrder(1);printNumber()" :icon="Printer" circle/>
+ <el-button @click="printOrder(3);printNumber()" >鏃犳爣棰�</el-button>
</template>
<print-custom-label id="childLabel"
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 1eb4865..792a70b 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -284,6 +284,7 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
}
},
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index d52e51b..2a38e11 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -170,7 +170,7 @@
order:{
page:{
selectOrder:'Order Home Page',
- createOrder:'Create',
+ create: 'Create',
orderReport:'Order Detail Report',
orderSummaryReport:'Order Summary Report',
orderDetailsSummary:'Order Detail Summary',
@@ -284,6 +284,8 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+
}
},
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index b53f73d..1899d19 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -284,6 +284,7 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
}
},
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 1e74830..8b83fcc 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -293,6 +293,7 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
}
},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue b/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
index 6e29133..ab063e3 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
@@ -661,7 +661,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
>
- <template>
<el-card style="max-width: 480px">
<template #header>
<div class="card-header">
@@ -669,9 +668,8 @@
</div>
</template>
<p v-for="o in 4" :key="o" class="text item">{{ '鐢ㄦ枡 ' + o +":xx鍏�" }}</p>
- <template #footer>Footer content</template>
+ <template #footer>鍚堣xx鍏�</template>
</el-card>
- </template>
</el-dialog>
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 510e686..fe17018 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
@@ -2,7 +2,7 @@
import {nextTick, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
-import {ElMessage, ElMessageBox} from "element-plus"
+import {Action, ElMessage, ElMessageBox} from "element-plus"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import useUserInfoStore from '@/stores/userInfo'
@@ -1077,6 +1077,19 @@
}else {
ElMessage.error(res.msg)
}
+ }).catch(()=>{
+ if(titleUploadData.value.orderId.trim()!==""){
+ ElMessageBox.alert(t('order.msg.updateOrderError'), 'Title', {
+ // if you want to disable its autofocus
+ // autofocus: false,
+ confirmButtonText: 'OK',
+ callback: (action: Action) => {
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+ },
+ })
+ }
})
}
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 a326716..555de90 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
@@ -99,6 +99,8 @@
private LocalDate createTime;
@ExcelProperty("淇敼鏃ユ湡")
private LocalDate updateTime;
+ @ExcelProperty("淇敼鐗堟湰鍙�")
+ private Integer version;
@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/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 7d3b21e..1e8777e 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
@@ -214,9 +214,16 @@
//淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
- public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
-
+ public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) throws Exception {
+ Order oldOrder = orderMapper.selectOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId,order.getOrderId()));
+ if(oldOrder.getProcessReview()==2){
+ throw new ServiceException(Constants.Code_600,"璇ヨ鍗曞凡缁忓鏍革紝鏃犳硶淇敼");
+ }
+ if(!Objects.equals(oldOrder.getVersion(), order.getVersion())){
+ throw new ServiceException(Constants.Code_600,"璇ヨ鍗曞凡缁忎慨鏀癸紝璇峰埛鏂伴〉闈�");
+ }
order.setCreateTime(null);
+ order.setVersion(order.getVersion()+1);
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
orderMapper.update(order,updateWrapper);
--
Gitblit v1.8.0