Merge remote-tracking branch 'origin/master'

于杰

2025-08-01 37175875537a92930a19688ad1cc2c49fb415f0f

Merge remote-tracking branch 'origin/master'

 north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue

@@ -127,6 +127,7 @@
    {field: 'patchProcesses', width: 120, title: t('reportingWorks.reportingProcess'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'patchType', width: 120, title: t('reportingWorks.breakageType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'patchReason', width: 120, title: t('reportingWorks.breakageReason'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'glassChild', width: 90, title: t('reportingWorks.glassChild'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'glassAddress', width: 120, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'patchNum', width: 120, title: t('order.quantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'width', width: 80, title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue

@@ -159,6 +159,7 @@
    {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchProcesses', width: 120, title:  t('reportingWorks.reportingProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'glassChild', width: 90, title: t('reportingWorks.glassChild'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    //{field: 'building_number',width: 120, title: '楼层编号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchNum', width: 80, title: t('order.quantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},

 north-glass-erp/src/main/java/com/example/erp/dto/pp/PatchLogAddDTO.java

@@ -22,6 +22,7 @@
    private String productName;
    private Integer technologyNumber;
    private String glassAddress;
    private String glassChild;
    private Integer patchNum;
    private Double width;
    private Double height;

 north-glass-erp/src/main/java/com/example/erp/dto/pp/PatchLogDTO.java

@@ -19,6 +19,7 @@
    private String productName;
    private Integer technologyNumber;
    private String glassAddress;
    private String glassChild;
    private Integer patchNum;
    private Double width;
    private Double height;

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

@@ -24,6 +24,7 @@
        od.product_name,
        r.technology_number,
        ogd.glass_address,
        ogd.glass_child,
        r.patch_num,
        od.width,
        od.height,
@@ -94,6 +95,9 @@
            </if>
            <if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
                and ogd.glass_address regexp #{patchLog.glassAddress}
            </if>
            <if test="patchLog.glassChild != null and patchLog.glassChild != ''">
                and ogd.glass_child regexp #{patchLog.glassChild}
            </if>
            <if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
                and r.responsible_team regexp #{patchLog.responsibleTeam}
@@ -184,6 +188,9 @@
            </if>
            <if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
                and ogd.glass_address regexp #{patchLog.glassAddress}
            </if>
            <if test="patchLog.glassChild != null and patchLog.glassChild != ''">
                and ogd.glass_child regexp #{patchLog.glassChild}
            </if>
            <if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
                and r.responsible_team regexp #{patchLog.responsibleTeam}
@@ -299,7 +306,8 @@
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
               rw.quality_inspector as qualityInspector
               rw.quality_inspector as qualityInspector,
               ogd.glass_child as glassChild
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -353,6 +361,9 @@
            <if test="patchLogAddDTO.glassAddress != null and patchLogAddDTO.glassAddress != ''">
                and ogd.glass_address regexp #{patchLogAddDTO.glassAddress}
            </if>
            <if test="patchLogAddDTO.glassChild != null and patchLogAddDTO.glassChild != ''">
                and ogd.glass_child regexp #{patchLogAddDTO.glassChild}
            </if>
            <if test="patchLogAddDTO.responsibleTeam != null and patchLogAddDTO.responsibleTeam != ''">
                and dd.responsible_team regexp #{patchLogAddDTO.responsibleTeam}
            </if>