修改保存表头以及金额重置日志

廖井涛

2024-09-02 8a60baad8fed90c0ff47cb97b0e79e38632020ef

修改保存表头以及金额重置日志

 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'))
            }

 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,

 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);