parent: eee2b579 | 补丁 | 提交 | show whitespace
廖井涛
2025-07-18 585335a28844a969e3efe55389e5b9862513575b 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
6个文件已修改
130 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/Report.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue


@@ -400,7 +400,7 @@


      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">


        <td colspan="31">


          <span style="display: flex;">


            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 20%">


            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 250px">


            <div class='qrCode' style="width: 80px;height: 80px;">


            <img :src=qrCodeItems.qrcode>


          </div>




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


@@ -129,8 +129,8 @@


}




const quantitySum = ( row,column )=>{


  const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0


  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0


  const reportWorkQuantity = row.reportWorkQuantity[column.title] || ''


  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || ''


  if(reportWorkQuantity===reportWorkQuantityCount){


    return reportWorkQuantity


  }




 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue


@@ -127,15 +127,15 @@


  const rawStart = new Date(form.date1[0]);


  const rawEnd = new Date(form.date1[1]);


  // 如果时间部分是 00:00，则设置为 08:00


  if (rawStart.getHours() === 8 || rawStart.getMinutes() === 0) {


  if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {


    rawStart.setHours(8, 0, 0, 0);


  }


  if (rawEnd.getHours() === 8 || rawEnd.getMinutes() === 0) {


  if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {


    rawEnd.setHours(8, 0, 0, 0);


  }


  const startTime = formatDateTime(rawStart);


  const endPlusOne = new Date(rawEnd);


  endPlusOne.setDate(endPlusOne.getDate() + 1);


  endPlusOne.setDate(endPlusOne.getDate());


  const newEndTime = formatDateTime(endPlusOne);


  const selectProcesses = procseeValue.value;


  form.date1 = [startTime, newEndTime];


@@ -171,15 +171,16 @@


  const rawStart = new Date(form.date1[0]);


  const rawEnd = new Date(form.date1[1]);


  // 如果时间部分是 00:00，则设置为 08:00


  if (rawStart.getHours() === 8 || rawStart.getMinutes() === 0) {


  if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {


    rawStart.setHours(8, 0, 0, 0);


  }


  if (rawEnd.getHours() === 8 || rawEnd.getMinutes() === 0) {


  if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {


    rawEnd.setHours(8, 0, 0, 0);


  }




  const startTime = formatDateTime(rawStart);


  const endPlusOne = new Date(rawEnd);


  endPlusOne.setDate(endPlusOne.getDate() + 1);


  endPlusOne.setDate(endPlusOne.getDate());


  const newEndTime = formatDateTime(endPlusOne);


  const selectProcesses = procseeValue.value;


  form.date1 = [startTime, newEndTime];


@@ -246,15 +247,15 @@


  const rawStart = new Date(form.date1[0]);


  const rawEnd = new Date(form.date1[1]);


  // 如果时间部分是 00:00，则设置为 08:00


  if (rawStart.getHours() === 8 || rawStart.getMinutes() === 0) {


  if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {


    rawStart.setHours(8, 0, 0, 0);


  }


  if (rawEnd.getHours() === 8 || rawEnd.getMinutes() === 0) {


  if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {


    rawEnd.setHours(8, 0, 0, 0);


  }


  const startTime = formatDateTime(rawStart);


  const endPlusOne = new Date(rawEnd);


  endPlusOne.setDate(endPlusOne.getDate() + 1);


  endPlusOne.setDate(endPlusOne.getDate());


  const newEndTime = formatDateTime(endPlusOne);


  form.date1 = [startTime, newEndTime];


  request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {




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


@@ -1114,6 +1114,23 @@


               width,


               height,


               #{printQuantity}  as quantity,


               CONCAT(


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',#{printQuantity} )      as size,




               CONCAT(


                   od.order_number,')      ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',#{printQuantity} )      as numberSize,


            CONCAT(


            od.order_number,')','   ',


            TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


            ' X ',


            TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))))      as numberSizeQuantity,


               od.order_number                                       as orderNumber,


               fc.technology_number                                  as technologyNumber,


               od.building_number                                    as buildingNumber,


@@ -1123,6 +1140,7 @@


               c.customer_abbreviation                               as customerAbbreviation,


               p.product_abbreviation                                as productAbbreviation,


               fc.process_id                                         as processId,


               SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


               o.create_time                                         as createTime,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -1137,7 +1155,12 @@


               od.other_columns,


               ogd.glass_child                                       as glassChild,


               ogd.glass_address                                     as glassAddress,


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color,


                '文本' as custom1,


                '文本' as custom2,


                '文本' as custom3,


                '文本' as custom4,


                '文本' as custom5


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join flow_card as fc on o.order_id = fc.order_id and


@@ -1185,6 +1208,7 @@


               c.customer_abbreviation                               as customerAbbreviation,


               p.product_abbreviation                                as productAbbreviation,


               fc.process_id                                         as processId,


               SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


               o.create_time                                         as createTime,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -1285,6 +1309,7 @@


               c.customer_abbreviation                               as customerAbbreviation,


               p.product_abbreviation                                as productAbbreviation,


               fc.process_id                                         as processId,


               SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


               o.create_time                                         as createTime,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -1301,13 +1326,22 @@


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',pl.patch_num   )      as size,




               CONCAT(


                       od.order_number,')  ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',pl.patch_num   )      as numberSize


                       ' = ',pl.patch_num )      as numberSize,


               CONCAT(


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width   AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height    AS CHAR))))      as numberSizeQuantity,


               '文本' as custom1,


               '文本' as custom2,


               '文本' as custom3,


               '文本' as custom4,


               '文本' as custom5


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join flow_card as fc on o.order_id = fc.order_id and


@@ -1967,6 +2001,11 @@


               ogd.glass_address                                     as glassAddress,


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color,


               CONCAT(


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),


                       ' = ',fc.quantity )      as size,


               CONCAT(


                       od.order_number,')      ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width   AS CHAR))),


                       ' X ',


@@ -1976,7 +2015,12 @@


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width   AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height    AS CHAR))))      as numberSizeQuantity


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height    AS CHAR))))      as numberSizeQuantity,


        '文本' as custom1,


               '文本' as custom2,


               '文本' as custom3,


               '文本' as custom4,


               '文本' as custom5


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join flow_card as fc on o.order_id = fc.order_id and


@@ -2174,6 +2218,7 @@


               c.customer_abbreviation                               as customerAbbreviation,


               p.product_abbreviation                                as productAbbreviation,


               CONCAT(fc.process_id, '/', fc.technology_number)      as processId,


               SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


               o.create_time                                         as createTime,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -2193,13 +2238,22 @@


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),


                       ' = ',pl.patch_num   )      as size,




               CONCAT(


                       od.order_number,')  ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),


                       ' = ',pl.patch_num   )      as numberSize


                       ' = ',pl.patch_num )      as numberSize,


               CONCAT(


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width   AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height    AS CHAR))))      as numberSizeQuantity,


               '文本' as custom1,


               '文本' as custom2,


               '文本' as custom3,


               '文本' as custom4,


               '文本' as custom5


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join flow_card as fc on o.order_id = fc.order_id and


@@ -2592,6 +2646,7 @@


            c.customer_abbreviation                               as customerAbbreviation,


            p.product_abbreviation                                as productAbbreviation,


            fc.process_id                                 as processId,


            SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


            o.create_time                                         as createTime,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -2752,6 +2807,7 @@


            c.customer_abbreviation                               as customerAbbreviation,


            p.product_abbreviation                                as productAbbreviation,


            fc.process_id                                 as processId,


            SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


            o.create_time                                         as createTime,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -2814,6 +2870,7 @@


            c.customer_abbreviation                               as customerAbbreviation,


            p.product_abbreviation                                as productAbbreviation,


            fc.process_id                                 as processId,


            SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


            o.create_time                                         as createTime,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -3110,6 +3167,11 @@


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',#{printQuantity} )      as numberSize,


               CONCAT(


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width   AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height    AS CHAR))))      as numberSizeQuantity,


            od.order_number                                       as orderNumber,


            ogd.technology_number                                  as technologyNumber,


            od.building_number                                    as buildingNumber,


@@ -3119,6 +3181,7 @@


            c.customer_abbreviation                               as customerAbbreviation,


            p.product_abbreviation                                as productAbbreviation,


            ''                                         as processId,


            SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


            o.create_time                                         as createTime,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,


            JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -3373,6 +3436,11 @@


               ogd.glass_address                                     as glassAddress,


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color,


               CONCAT(


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',fc.quantity )      as size,


               CONCAT(


                       od.order_number,')      ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width   AS CHAR))),


                       ' X ',


@@ -3382,7 +3450,12 @@


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width   AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height    AS CHAR))))      as numberSizeQuantity


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height    AS CHAR))))      as numberSizeQuantity,


                       '文本' as custom1,


                       '文本' as custom2,


                       '文本' as custom3,


                       '文本' as custom4,


                       '文本' as custom5


        from sd.order as o


            left join sd.order_detail as od on o.order_id = od.order_id


            left join flow_card as fc on o.order_id = fc.order_id and




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


@@ -1433,6 +1433,7 @@


        rw.reviewed,


        rw.examine_time,


        rw.device_name,


        --         GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName


        CASE


        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')


        ELSE MAX( ogd.glass_child )


@@ -1444,9 +1445,9 @@


        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=ogd.order_id and od.order_number=ogd.order_number


        left join sd.`order` as o on o.order_id=od.order_id


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0


        and date(rw.reporting_work_time) >= #{date[0]}


        and date(rw.reporting_work_time) &lt;= #{date[1]}


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and


        rw.reporting_work_time >= #{date[0]}


        AND rw.reporting_work_time &lt;  #{date[1]}


        and position(#{process} in rw.this_process)


        <choose>


            <when test="laminating == ''">




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


@@ -298,15 +298,13 @@




    <select id="historyTeamsMp">


        SELECT


            bdp.id,


            bdp.basic_type,


            bd.id,


            bd.basic_type,


            rw.teams  as basic_name,


            bd.basic_name,bd.id AS basic_category,


            rw.process


        FROM


            sd.basic_data AS bd


                LEFT JOIN `basic_data_produce` AS bdp


                          ON bd.id = bdp.basic_category


                right join (


                select distinct process,teams from


                    (   select distinct rw.this_process as  process,rw.teams_groups_name as teams


@@ -315,8 +313,6 @@


                    ) as t


            ) as  rw


                           on rw.process=bd.basic_name


        WHERE


            bdp.basic_type = 'teamsgroups'


        GROUP BY rw.process,rw.teams


    </select>




@@ -326,10 +322,9 @@


            bd.basic_name AS basic_category


        FROM


            sd.basic_data AS bd


                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category




        WHERE


            bd.basic_category = 'process'


          AND bdp.basic_type = 'teamsgroups'


          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))


    </select>