From 850d7ae98608119495c2cf5408d376ef12253eca Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 14:38:23 +0800
Subject: [PATCH] 提交 相关参数
---
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/northglass-erp/src/stores/sd/companySet/金华天成.js | 1 +
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/components/sd/order/OrderSizeCheck.vue | 3 +--
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 1 +
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/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/northglass-erp/src/stores/sd/companySet/上海北玻.js | 1 +
12 files changed, 46 insertions(+), 4 deletions(-)
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/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/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 64c5d54..2c44ee0 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
@@ -83,6 +83,7 @@
otherMoneyRemarks:'',
processingNote:t('order.processingNote')+':',
createOrder:0,
+ sizeCheck:null,
creatorId:userStore.user.userId,
creator:userStore.user.userName,
})
@@ -1005,7 +1006,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
@@ -1357,7 +1364,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/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/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 7075172..0138fbf 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.*;
@@ -1113,4 +1115,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))
+ );
+ }
}
--
Gitblit v1.8.0