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

chenlu

2024-12-26 55b944790d85c2ee319b96c438b2a02f4908750c

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

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

@@ -364,7 +364,6 @@
    }
  };
  const currentRoute = router.currentRoute.value;
  console.log('当前路由信息:', currentRoute);
  const isRoutesEqual = currentRoute.name === targetRoute.name &&
      currentRoute.params.projectNo === targetRoute.params.projectNo &&
      currentRoute.params.thickNess === targetRoute.params.thickNess &&

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

@@ -43,6 +43,7 @@
  },

  columns: [
    {type:'seq',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'order_number', title: '订序', width: 70},
    {field: 'child_width', width: 100, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num2_filter'}},
    {
@@ -190,7 +191,6 @@
        [
          {code: 'setAmount', name: '设置统一磨量',},
          {code: 'displayProcessCard', name: '显示流程卡',},
          {code: 'hideProcessCard', name: '隐藏流程卡',},
          {code: 'setShape', name: '设置图形',},
          {code: 'Export', name: '数据导出', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
          {code: 'safeDXF', name: '图形另存为DXF',},
@@ -210,14 +210,12 @@

})
const processCardColumns = reactive([
  {field: 'process_id', title: '流程卡', width: 200},
  {field: 'project', title: '项目名', width: 150},
  {field: 'order_number', title: '项目名', width: 150},
  {field: 'width', title: '宽', width: 150},
  {field: 'height', title: '高', width: 150},
  {field: 'technology_number', title: '层', width: 150},
  {field: 'layout_status', title: '总层数', width: 150},
  {field: 'quantity', title: '数量', width: 150},
  { field: 'process_id', title: '流程卡', width: 200, align: 'center' },
  { field: 'project', title: '项目名', width: 150, align: 'center' },
  { field: 'order_number', title: '订序', width: 100, align: 'center' },
  { field: 'sizes', title: '尺寸', width: 200, align: 'center' },
  { field: 'layer', title: '层', width: 100, align: 'center' },
  { field: 'quantity', title: '数量', width: 100, align: 'center' }
]);

// 右键菜单
@@ -236,20 +234,9 @@
    successMsg: '操作成功！',
    gridRef: xGrid,
    requiresRow: false,
    showMessage: () => {
    displayProcess: () => {
      getProcessCard();
      processCardDialogVisible.value = true;
      ElMessage.info('操作成功！');
    }
  },
  {
    code: 'hideProcessCard',
    successMsg: '操作成功！',
    gridRef: xGrid,
    requiresRow: false,
    showMessage: () => {
      processCardDialogVisible.value = false;
      ElMessage.info('此功能暂未完善，暂时无法执行隐藏流程卡操作。');
    }
  },
  {
@@ -308,7 +295,11 @@
          if (config.code === 'setAmount') {
            config.openAmount();
            ElMessage.success(config.successMsg);
          } else if (['displayProcessCard', 'hideProcessCard', 'setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
          } else if ( config.code === 'displayProcessCard' ) {
            config.displayProcess();
            ElMessage.success(config.successMsg);
          }
          else if (['setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
            config.showMessage();
          }
        }).catch(() => {
@@ -384,7 +375,6 @@
const processCardData = ref(null);
//流程卡
const getProcessCard = () => {
  const projectNo = ref('P24120301')
  request.post(`/glassOptimize/getProcessCard/${projectNo.value}`).then((res) => {
    if (Number(res.code) === 200) {
      processCardData.value = res.data.data;
@@ -548,9 +538,9 @@
    <el-dialog
        v-model="processCardDialogVisible"
        title="流程卡数据"
        width="80%"
        width="65%"
        heigth="600px"
        style="height: 80%;"
        style="height: 500px;"
    >
      <vxe-grid
          height="100%"

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

@@ -323,11 +323,10 @@
            return
          }

          /*const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('order.msg.projectCheck'))
            return
          }*/
          const project = titleUploadData.value.project
          if(project === null || project === undefined ){
            titleUploadData.value.project=''
          }
          const customer = titleUploadData.value.customerId
          if(customer === null || customer === undefined || customer === ''){
            ElMessage.error(t('order.msg.customerCheck'))

 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -94,22 +94,21 @@
        SELECT
            fc.process_id,
            fc.order_number,
            fc.technology_number,
            fc.quantity,
            fc.layout_status,
            CONCAT(fc.technology_number, '/', COUNT(fc.technology_number)) AS layer,
            so.project,
            sd.child_width AS width,
            sd.child_height AS height
            CONCAT(sd.child_width, ' × ', sd.child_height) AS sizes
        FROM
            pp.flow_card AS fc
                INNER JOIN sd.order AS so ON fc.order_id = so.order_id
                INNER JOIN sd.order_glass_detail AS sd ON sd.order_id = so.order_id AND fc.order_id = sd.order_id
                        AND fc.order_number = sd.order_number
        WHERE
            fc.project_no = #{projectNo}
        GROUP BY
            fc.order_id,
            fc.order_number,
            fc.technology_number ;
            fc.technology_number,
            fc.order_number
    </select>

    <!--库存信息-->