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

guoyuji

2024-07-22 074b0f269121090ea7a9e9c1df03023528122727

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

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

@@ -50,7 +50,9 @@
  remarks3:'备注3',
  remarks4:'备注4',
  filmNumber:'膜号',
  bendRadius:'order.bendRadius'
  bendRadius:'order.bendRadius',
  glassChild:'reportingWorks.glassChild',
  glassAddress:'replenish.sliceMarking'




 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue

@@ -140,6 +140,7 @@
  flex-wrap: wrap;
  font-size: 10px;
  display: flex;
  justify-content:space-between;
}



 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -135,4 +135,6 @@
    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);

    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);

    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -379,7 +379,7 @@
            else{
                for (FlowCard flowCard : flowCardList) {
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
                    itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
                    list.add(itemmap);
                }
            }

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

@@ -747,7 +747,8 @@
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S06' )) AS remarks3,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
                p.remarks as filmNumber
                p.remarks as filmNumber,
                od.bend_radius as bendRadius
        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
@@ -1239,4 +1240,61 @@
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>

    <select id="getPrintCustomDataSemi">
        select o.order_id           as orderId,
               project,
               customer_id          as customerId,
               o.customer_name        as customerName,
               order_type           as orderType,
               order_classify       as orderClassify,
               batch,
               o.icon,
               pack_type            as packType,
               delivery_date        as deliveryDate,
               al_type              as alType,
               money,
               contract_id          as contractId,
               customer_batch          customerBatch,
               contacts,
               delivery_address     as deliveryAddress,
               od.processing_note   as processingNote,
               width,
               height,
               od.quantity,
               od.order_number      as orderNumber,
               fc.technology_number as technologyNumber,
               od.building_number   as buildingNumber,
               od.product_name      as productName,
               od.edging_type       as edgingType,
               p.remarks,
               c.customer_abbreviation as customerAbbreviation,
               p.product_abbreviation as productAbbreviation,
               fc.process_id as processId,
               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,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S03' )) AS colourCeramicGlaze,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S04' )) AS remarks1,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S05' )) AS remarks2,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S06' )) AS remarks3,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
               p.remarks as filmNumber,
               od.bend_radius as bendRadius,
               ogd.glass_child as glassChild,
               ogd.glass_address as glassAddress
        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
                                              od.order_number = fc.order_number
                 left join sd.product as p on p.id=od.product_id
                 left join sd.customer as c on c.id = o.customer_id
                 left join sd.product_detail as pd  on pd.prod_id=p.id and pd.sort_num=od.order_number
        left join sd.order_glass_detail ogd on ogd.order_id=o.order_id and ogd.order_number=od.order_number and ogd.technology_number=fc.technology_number
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by od.order_number,ogd.technology_number, width, height
        order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
    </select>
</mapper>