提交义乌提出修改新增功能

guoyujie

昨天 c29b3a5a67e2856b6209488cd204b8f1fb643312

提交义乌提出修改新增功能

 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"

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -284,6 +284,7 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
        }

    },

 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:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'

        }

    },

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -284,6 +284,7 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
        }

    },

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -293,6 +293,7 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
        }

    },

 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>



 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()}})
        },
      })
    }
  })
}


 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)

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