廖井涛
2024-07-04 a15dba424e67b4773a546246c396b83d3b820d98
提交重复订单提示
4个文件已修改
23 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -131,7 +131,10 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.type_name }}</span>
          <span v-if="item.type_name.includes('中空')">中空</span>
          <span v-else-if="item.type_name.includes('夹层')">夹层</span>
          <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
          <span v-else></span>
        </div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>&nbsp;
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -806,9 +806,17 @@
const selectOrder = (order) => {
  request.post(`/order/selectOrder`,order).then((res) => {
    if(res.code==200){
      if(res.data.data>0){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  ${t('order.msg.calculationAreaPrompt5')}`,
      let orderId=''
      console.log(res.data.data)
      if(res.data.data.length>0){
        for (let i=0;i<res.data.data.length;i++){
          orderId+=res.data.data[i].orderId+'|'
          console.log(orderId)
        }
      }
      if(orderId!=''){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')},
                  ${orderId+t('order.msg.calculationAreaPrompt5')}`,
            t('order.msg.warning'),
            {
              confirmButtonText: t('basicData.confirmButtonText'),
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -27,5 +27,5 @@
    Integer cancelOrder(String id);
    Integer selectOrder(@Param("order") Order order);
    List<Order> selectOrder(@Param("order") Order order);
}
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -6,7 +6,7 @@
    <select id="selectOrder">
        select
            count(*)
            *
        from
            sd.`order` as o
        where