From 8a60baad8fed90c0ff47cb97b0e79e38632020ef Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 02 九月 2024 08:15:28 +0800
Subject: [PATCH] 修改保存表头以及金额重置日志
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 5 ++++-
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 18 +++++++++++++++++-
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 7 +++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index ee2f4ce..5973b0f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -56,6 +56,7 @@
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
stockState:'',
paymentTerms:'',
@@ -166,6 +167,7 @@
titleUploadData.value=deepClone(res.data.title)
titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
+ titleUploadData.value.deliveryId=""
const today = new Date
today.setTime(today.getTime() )
titleUploadData.value.deliveryDate=today.getFullYear() +
@@ -208,7 +210,8 @@
if(res.code==200){
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
-
+ titleUploadData.value.deliveryId=str
+ console.log(titleUploadData.value)
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
@@ -421,6 +424,13 @@
if(res.code==200 && res.data==="true"){
ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ /*if(titleUploadData.value.deliveryId.trim()===""){
+ router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ }else{
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
+ }*/
}else if(res.data==="false1"){
ElMessage.warning(t('delivery.pleaseMsg1'))
}else if(res.data==="false2"){
@@ -446,6 +456,9 @@
if (res.code == 200 && res.data===true) {
ElMessage.success(t('basicData.msg.ReviewSuccess'))
router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ /*router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})*/
} else {
ElMessage.warning(t('basicData.msg.reviewFail'))
}
@@ -465,6 +478,9 @@
if (res.code == 200 && res.data===true) {
ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ /*router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})*/
} else {
ElMessage.warning(t('basicData.msg.reviewFail'))
}
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 46d5be1..fcfaf67 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
@@ -445,7 +445,8 @@
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
-
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
let order ={
title:titleUploadData.value,
}
@@ -983,6 +984,8 @@
//鏇存柊閲戦閲嶇疆
const updateMoney = () => {
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
const updateData = {
order: titleUploadData.value,
detail: xGrid.value.getTableData().fullData,
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 3a03a09..243d739 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
@@ -107,12 +107,19 @@
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
//鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
try{
+ Log log = new Log();
+ log.setOperator(order.getCreator());
+ log.setOperatorId(order.getCreatorId());
+ log.setContent(orderMap.toString());
+ log.setFunction("saveOrderTitle淇濆瓨琛ㄥご:"+order.getOrderId());
+
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
order.setCreateTime(null);
orderMapper.update(order,updateWrapper);
//淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
orderMapper.updateOrderParameter(order.getOrderId());
+ logService.saveLog(log);
}catch (Exception e){
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
--
Gitblit v1.8.0