parent: 41b3c4df | 补丁 | 提交 | ignore whitespace
廖井涛
2024-07-22 6b1f2791223f1d30b80e23bf873399718f5700e6 
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
8个文件已修改
83 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/layout/MainErpView.vue 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/layout/MainErpView.vue


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


import {onMounted, reactive, ref, watch} from "vue"


import deepClone from "@/utils/deepClone"


import userInfo from '@/stores/userInfo'


import userOrderInfo from '@/stores/sd/order/orderInfo'


import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue"


import { useI18n } from 'vue-i18n'


import i18n from "@/lang/index"


@@ -17,6 +18,9 @@


const router = useRouter()


const userStore = useUserInfoStore()


const user = userStore.user?.userName


const orderInfo = userOrderInfo()


orderInfo.clearSelectDate()




//监听异步返回代码


watch(()=>userStore.responseCode,(newVal) => {


    switch (newVal){




 north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js


@@ -21,6 +21,9 @@


        clearOrderInfo(){


            this.orderId = null


            this.reviewList = []


        },


        clearSelectDate(){


            this.selectDate=["",""]


        }


    },


    persist: true




 north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue


@@ -312,6 +312,7 @@


    {field: 'patch_processes', title:  t('reportingWorks.responsibleProcess'),width:110},


    {field: 'product_name', title: t('order.product'),width:110},


    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:110},


    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},


  ],//表头按钮




  toolbarConfig: {




 north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue


@@ -259,6 +259,7 @@


      filters: [{data: ''}],


      slots: {filter: 'num1_filter'},


      filterMethod: filterChanged


      ,width:120


    },


    {


      field: 'process_id',


@@ -266,41 +267,46 @@


      showOverflow: "ellipsis",


      filters: [{data: ''}],


      slots: {filter: 'num1_filter'},


      filterMethod: filterChanged


      filterMethod: filterChanged,


      width:130


    },


    {


      field: 'customer_name',


      title: t('customer.customerName'),


      filters: [{data: ''}],


      slots: {filter: 'num1_filter'},


      filterMethod: filterChanged


      filterMethod: filterChanged,


      width:120


    },


    {


      field: 'project',


      title:  t('order.project'),


      filters: [{data: ''}],


      slots: {filter: 'num1_filter'},


      filterMethod: filterChanged


      filterMethod: filterChanged,


      width:120


    },


    {


      field: 'order_number',


      title:  t('order.OrderNum'),


      filters: [{data: ''}],


      slots: {filter: 'num1_filter'},


      filterMethod: filterChanged


      filterMethod: filterChanged,


      width:100


    },


    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},


    {field: 'glass_address', title: t('processCard.glassAddress'),},


    {field: 'rework_num', title:  t('order.quantity'),},


    {field: 'rework_area', title:  t('order.area'),},


    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),},


    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),},


    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),},


    {field: 'rework_type', title:  t('reportingWorks.breakageType'),},


    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),},


    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),},


    {field: 'product_name', title: t('order.product'),},


    {field: 'glass_child', title: t('reportingWorks.glassChild'),},


    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",width:90},


    {field: 'glass_address', title: t('processCard.glassAddress'),width:90},


    {field: 'rework_num', title:  t('order.quantity'),width:70},


    {field: 'rework_area', title:  t('order.area'),width:70},


    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),width:90},


    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),width:120},


    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),width:100},


    {field: 'rework_type', title:  t('reportingWorks.breakageType'),width:80},


    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),width:90},


    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),width:80},


    {field: 'product_name', title: t('order.product'),width:120},


    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:120},


    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},


  ],//表头按钮




  toolbarConfig: {




 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java


@@ -64,6 +64,9 @@


    //修改时间


    private LocalDate updateTime;




    //报工编号


    private String reportingWorkId;




    //外键订单表


    @TableField(select = false,exist= false)


    private Order order;




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


@@ -122,19 +122,19 @@




    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);




    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);


    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);




    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);




    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);


    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);




    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);




    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);


    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);




    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>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);




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


}




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


@@ -442,7 +442,7 @@


                //是否传入合并层数


                if (printMerge.equals("")||printMerge.equals("null") ){


                    itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));


                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());


                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());


                    itemmap.put("detailList", detailList);


                }


                else {


@@ -451,13 +451,13 @@


                    if (printLike.equals("")||printLike.equals("null") ){


                        itemmap.put("detail", flowCardMapper.getPrimaryListMergeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));




                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());


                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());


                        itemmap.put("detailList", detailList);


                    }


                    else {


                        itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));




                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber());


                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());


                        itemmap.put("detailList", detailList);


                    }


                }


@@ -494,7 +494,7 @@


                //是否传入合并层数


                if (printMerge.equals("")||printMerge.equals("null") ){


                    itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));


                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());


                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());


                    itemmap.put("detailList", detailList);


                }


                else {


@@ -503,13 +503,13 @@


                    if (printLike.equals("")||printLike.equals("null") ){


                        itemmap.put("detail", flowCardMapper.getPrimaryListMergeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));




                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());


                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());


                        itemmap.put("detailList", detailList);


                    }


                    else {


                        itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));




                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber());


                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());


                        itemmap.put("detailList", detailList);


                    }


                }




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


@@ -781,7 +781,8 @@


               pl.patch_processes,


               od.product_name,


               ogd.glass_child,


               fc.print_status


               fc.print_status,


               pl.reporting_work_id


        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


@@ -935,7 +936,8 @@


               pl.rework_reason,


               pl.rework_processes,


               od.product_name,


               ogd.glass_child


               ogd.glass_child,


               pl.reporting_work_id


        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


@@ -945,8 +947,8 @@


                 left join rework as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and


                                           pl.order_sort = fc.order_number and


                                           pl.technology_number = fc.technology_number


        where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0


        GROUP BY fc.process_id, ogd.technology_number


        where pl.create_time between #{selectTime1} and #{selectTime2}


        GROUP BY fc.process_id, ogd.technology_number,pl.reporting_work_id


        order by pl.id desc,fc.process_id, ogd.technology_number


    </select>




@@ -1037,6 +1039,7 @@


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


          and position(fc.technology_number in #{technologyNumber})


        and pl.reporting_work_id=#{reportingWorkId}


        group by fc.process_id, fc.order_number,fc.technology_number


        order by IF(sort != NULL || sort != '', sort, fc.order_number)


    </select>


@@ -1104,6 +1107,7 @@


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


          and position(fc.technology_number in #{technologyNumber})


          and pl.reporting_work_id=#{reportingWorkId}


        group by fc.process_id, fc.order_number,fc.technology_number


        order by IF(sort != NULL || sort != '', sort, fc.order_number)


    </select>


@@ -1171,6 +1175,7 @@


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


          and position(fc.technology_number in #{technologyNumber})


          and pl.reporting_work_id=#{reportingWorkId}


        group by fc.process_id, fc.order_number,fc.technology_number


        order by IF(sort != NULL || sort != '', sort, fc.order_number)


    </select>


@@ -1237,6 +1242,7 @@


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


          and position(fc.technology_number in #{technologyNumber})


          and pl.reporting_work_id=#{reportingWorkId}


        group by fc.process_id, fc.order_number,fc.technology_number


        order by IF(sort != NULL || sort != '', sort, fc.order_number)


    </select>