Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-07 7c1e8749b302c1848e9e008717e6d91e9181979d

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

@@ -188,7 +188,8 @@
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'order_number',
@@ -205,6 +206,13 @@
      filterMethod: filterChanged
    },
    {
      field: 'glassNumber',
      title: t('reportingWorks.glassNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_address',
      title: t('processCard.glassAddress'),
      filters: [{data: ''}],

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

@@ -362,6 +362,10 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="20"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="23">
          <span style="display: flex;">

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

@@ -388,6 +388,10 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="20"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="23">
          <span style="display: flex;">

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

@@ -296,6 +296,7 @@
        totalArea:'TotalArea',
        childWidth:'Child Width',
        childHeight:'Child Height',
        arc:'arc',
        area:'Area',
        process:'Process',
        orderDetail:'Order Detail',

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

@@ -292,6 +292,7 @@
        totalArea:'Общий размер',
        childWidth:'Ширина монолитного стекла',
        childHeight:'Высота монолитного стекла',
        arc:'Длина дуги',
        area:'Размер монолитного стекла',
        process:'Технологический процесс',
        orderDetail:'Подробности заказа',

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

@@ -297,6 +297,7 @@
        totalArea:'总尺寸',
        childWidth:'单片宽',
        childHeight:'单片高',
        arc:'弧长',
        area:'单片尺寸',
        process:'工艺流程',
        orderDetail:'订单详情',

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

@@ -58,6 +58,7 @@
    {field: 'totalArea',width:120,  title: t('craft.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'childWidth',width:120,  title: t('craft.childWidth'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'childHeight',width:120,  title: t('craft.childHeight'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'arc',width:120,  title: t('craft.arc'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'area',width:120,  title: t('craft.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderDetail.quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'process',width:120,  title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -371,6 +372,7 @@
  request.post(`/order/getOrderCraftById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
      console.log(res.data.orderGlassDetails)

      //取消审核按钮禁用
      if(res.data.order.processReview === 2 ){

 north-glass-erp/northglass-erp/vite.config.js

@@ -15,7 +15,7 @@
    alias: {
      '@': fileURLToPath(new URL('./src', import.meta.url))
    }
  }, 
  },
  server: {
    port: 5173,//端口号
    host: true,//ip地址 或 '0.0.0.0' 或 "loaclhost"

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

@@ -472,13 +472,41 @@

    <select id="selectPrintMp">
        select *
        from ((select fc.id,
        from ((
                  select fc.id,
                         fc.order_id,
                         fc.process_id,
                         o.customer_name,
                         o.project,
                         ogd.technology_number,
                         ogd.glass_address,
                         sum(od.quantity)         as quantity,
                         sum(ogd.total_area)      as total_area,
                         od.product_name,
                         ogd.glass_child,
                         fc.founder,
                         date(fc.splitFrame_time) as splitFrame_time,
                         fc.print_status,
                         ogd.process
                  from flow_card as fc
                           left join sd.order_glass_detail as ogd
                                     on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
                                        ogd.technology_number = fc.technology_number
                           left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                           left join sd.`order` as o on o.order_id = fc.order_id
                  where fc.order_id = #{orderId}
                  GROUP BY fc.process_id, ogd.technology_number
                  order by fc.process_id, ogd.technology_number
              )
              UNION

        (select fc.id,
                      fc.order_id,
                      fc.process_id,
                      o.customer_name,
                      o.project,
                      ogdss.technology_number,
                      ogdss.concatenated_glass_child,
                      ogd.glass_address,
                      ROUND(sum(fc.quantity) / (count(DISTINCT fc.technology_number))) as quantity,
                      sum(ogd.total_area)                                              as total_area,
                      # SUM(ogd.child_width*child_height*fc.quantity/(count(DISTINCT ogd.technology_number))) as total_area,
@@ -503,10 +531,10 @@
                                          process                                           AS processed_part
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child,process) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child
               GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part
               order by fc.process_id, ogdss.technology_number)

              UNION
@@ -593,7 +621,7 @@
               order by fc.process_id)) AS combined_results
        where process is not null
          and process != ""

        GROUP BY order_id,process_id,technology_number
    </select>

    <select id="getPrimaryList">
@@ -995,11 +1023,13 @@
               fc.quantity,
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
               fc.sort,
               ogd.process
               ogd.process,
               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber
        FROM flow_card AS fc
                 LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id
            AND fc.order_number = ogd.order_number
            AND fc.technology_number = ogd.technology_number
        left join sd.order_detail as od on fc.order_id = od.order_id and fc.order_number = od.order_number
        where fc.order_id = #{orderId}
        order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.technology_number)
    </select>

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

@@ -92,6 +92,7 @@
        <result column="glass_child" property="glassChild"/>
        <result column="child_width" property="childWidth"/>
        <result column="child_height" property="childHeight"/>
        <result column="arc" property="arc"/>
        <result column="icon" property="icon"/>
        <result column="process" property="process"/>
        <result column="area" property="area"/>
@@ -130,7 +131,7 @@
           a.total_area,
           b.edging_type,
           a.child_width,
           a.child_height,
           a.child_height,a.arc,
           a.icon,
           a.area,
           b.quantity,
@@ -154,7 +155,8 @@
                a.area = #{item.area},
                a.total_area = #{item.area}*b.quantity,
                a.icon = #{item.icon},
                a.process = #{item.process}
                a.process = #{item.process},
                a.arc = #{item.arc}
            where
                a.order_id = b.order_id
                and a.order_id = #{item.orderId}

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

@@ -33,12 +33,13 @@
    </select>

    <select id="selectMaxOrderIdByYear">
        select
            ifnull(SUBSTR(max(order_id) from 5),0)
       select ifnull((select
            SUBSTR(order_id from 5)
        from
            `order` as a
        where
            year(a.create_time)  = year(NOW())
            year(a.create_time)  = year(now())
        order by  id desc limit 1),0) temp
    </select>

    <update id="updateOrderParameter">