Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2024-12-10 bb0b69cc11477b8d88e69e2980c9393299472ed7

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -218,6 +218,18 @@
    }
  },
  {
    tid: 'processingNote', title: '加工要求', data: '', type: 'text',
    options: {
      field: 'processingNote',
      testData: '',
      width:270,
      height: 16,
      fontSize: 11.25,
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: 'edgingType', title: '磨边类型', data: '', type: 'text',
    options: {
      field: 'edgingType',

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue

@@ -192,7 +192,7 @@
        <th colspan="5">
          <h3>销售确认单</h3>
        </th>
        <th colspan="2" style="text-align: left;font-weight: bold;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="text-align: left;font-weight: bold;" v-if="company.showDeliveryCreator">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>

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

@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'يرجى إلغاء الاختيار أولاً',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },

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

@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'There is an actual total area equal to0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },

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

@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },

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

@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue

@@ -192,6 +192,39 @@
  }
});

// 从子组件SetAmount获取磨量值，并更新表格数据
const Amount = (amountData) => {
  nextTick(() => {
    const data = gridOptions.data;
    console.log('接收到的amountData:', amountData);
    console.log('表格原始数据:', data);
    if (data) {
      try {
        const updatedData = [];
        for (let i = 0; i < data.length; i++) {
          const item = data[i];
          const updatedItem = {
            ...item,
            longGrind1: Number(amountData.quicksetTop),
            longGrind2: Number(amountData.quicksetRight),
            shortGrind1: Number(amountData.quicksetBottom),
            shortGrind2: Number(amountData.quicksetLeft)
          };
          updatedData.push(updatedItem);
        }
        gridOptions.data = updatedData;
        xGrid.value.loadData(updatedData);
      } catch (error) {
        console.error('更新表格数据时出错:', error);
        // 这里可以根据实际需求添加一些回滚操作或者提示用户的逻辑，比如显示一个错误提示框等
        ElMessage.error('更新磨量数据时出现错误，请检查输入或联系管理员');
      }
    } else {
      console.warn('表格数据为空，无法更新磨量值');
    }
  });
};


</script>

@@ -261,7 +294,7 @@
                title="设置修边"
                destroy-on-close
                style="width: 35%;height:80%;margin-top: 3vh;">
              <set-trimming/>
              <set-trimming />
            </el-dialog>

            <el-button id="button" type="primary">保存</el-button>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue

@@ -1,5 +1,6 @@
<script setup>
import {ref} from "vue";
import {defineEmits} from 'vue';

function setupComponent() {
  // 各个输入框绑定的值，初始化为0
@@ -37,6 +38,22 @@

const check = ref(true)

const emit = defineEmits(['set-amount']);
const props = defineProps({
  closeDialog: Function
});

const setAmount = () => {
  const amountData = {
    quicksetTop: quicksetTop.value,
    quicksetRight: quicksetRight.value,
    quicksetBottom: quicksetBottom.value,
    quicksetLeft: quicksetLeft.value
  };
  emit('set-amount', amountData);
  props.closeDialog(2);
};

</script>

<template>
@@ -59,7 +76,7 @@
        <el-input-number v-model="quicksetLeft" class="left" placeholder="0"
                         controls-position="right" :step="0.1" :min="0"></el-input-number>
      </div>
      <el-button type="primary" style="float: right; margin: 184px 0 0 13px;">应用</el-button>
      <el-button type="primary" style="float: right; margin: 184px 0 0 13px;" @click="setAmount">应用</el-button>
    </div>

    <div style="margin-top: -20px">

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -1063,7 +1063,35 @@


// 审核订单
const reviewOrder = (state) => {
const reviewOrder = async (state) => {
  let differentSize = null
  if(state===0){
    await request.post(`/order/selectDifferentSize/${titleUploadData.value.orderId}`).then(res =>{
      differentSize = res.data
    })
  }
  let orderGlassState = null
  if(differentSize===true){
  await  ElMessageBox.confirm(
        t('order.msg.differentSize'),
        t('order.msg.warning'),
        {
          confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
    )
        .then(async () => {

        })
        .catch(async () => {
          orderGlassState = false
        })
  }
  if (orderGlassState===false){
    return
  }

  request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}/${userStore.user.userId}/${userStore.user.userName}`).then(res =>{
    if(res.code==200){
      gridOptions.toolbarConfig.buttons[2].disabled = true

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -240,5 +240,11 @@
        return  Result.seccess(orderService.updateOrderId(map));
    }

    @ApiOperation("订单反审是否存在手动大小片")
    @PostMapping("/selectDifferentSize/{orderId}")
    public Result selectDifferentSize(@PathVariable String orderId)  {
        return  Result.seccess(orderService.selectDifferentSize(orderId));
    }


}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java

@@ -48,4 +48,6 @@
    Boolean updateOrderId(String oldOrderId,String newOrderId);

    Order selectOrderId(String orderId);

    List<Map<String,String>> selectDifferentSize(String orderId);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -797,4 +797,8 @@
        }
        return saveState;
    }

    public Boolean selectDifferentSize(String orderId) {
        return !orderMapper.selectDifferentSize(orderId).isEmpty();
    }
}

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -335,4 +335,20 @@
            o.order_id = #{orderId}

    </update>

    <select id="selectDifferentSize">

    select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
    from sd.order_glass_detail ogd
    where ogd.order_id = #{orderId}
    group by ogd.order_number,ogd.child_height,child_width)
    as a
    inner join order_detail od
        on od.order_id = a.order_id
        and od.order_number = a.order_number
        and (od.bend_radius is null or od.bend_radius = '')
    group by a.order_number
    having count(a.order_number) > 1
    </select>

</mapper>