parent: 0ab64743 | 补丁 | 提交 | ignore whitespace
guoyuji
2024-04-25 205657134d435d84114c4bb7663c17d76575cbaa 
Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
5个文件已修改
90 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/application.yml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/application.yml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue


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


//子组件接收参数


const xGrid = ref()


const gridOptions = reactive({


  loading: true,


  border:  "full",//表格加边框


  keepSource: true,//保持源数据


  align: 'center',//文字居中




 north-glass-erp/src/main/resources/application.yml


@@ -11,22 +11,22 @@


      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.


      datasource:


        user_info:


          url: jdbc:mysql://localhost:3306/erp_user_info?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        sd:


          url: jdbc:mysql://localhost:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true


          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        mm:


          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        pp:


          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver




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


@@ -383,10 +383,12 @@


            d.child_width,


            d.child_height,


            e.shape,


            a.completed_quantity+a.breakage_quantity as 'quantity', -- 可报工数


            a.completed_quantity as 'completedQuantity', -- 完工数


            a.breakage_quantity as 'breakageQuantity', -- 破损数


            f.completed_quantity as thisQuantitySum ,-- 本工序完工和


            if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,


                c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),


                ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 可报工数


            ifnull(a.completed_quantity,0) as 'completedQuantity', -- 完工数


            ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 破损数


            ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和


            if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,


            <if test="nextProcess != null and nextProcess != ''">  -- 非最后一道工序


                ifnull(g.completed_quantity,0) as nextQuantitySum,  -- 后工序已完成


@@ -411,13 +413,16 @@


                as minQuantity -- 修改最小数


            </if>


            -- e.thisQuantitySum


        from


            reporting_work_detail as a


            left join reporting_work as b


                on  a.reporting_work_id = b.reporting_work_id


            left join  flow_card as c


                on c.process_id = b.process_id


                and c.technology_number = a.technology_number


        from reporting_work as b




        right join  flow_card as c


        on c.process_id = b.process_id




        left join reporting_work_detail as a


        on  a.reporting_work_id = b.reporting_work_id


        and c.order_number=a.order_number


        and c.technology_number = a.technology_number




            left join  sd.order_glass_detail as d


                on d.order_id = c.order_id


                and c.order_number = d.order_number


@@ -461,7 +466,8 @@


                  and g.order_number = a.order_number


                  and g.technology_number = a.technology_number


        </if>


        where a.reporting_work_id = #{reportingWorkId}


        where b.reporting_work_id = #{reportingWorkId}


        GROUP BY c.order_number


    </select>


<select id="selectReportingWorkMp" resultMap="reportingWorkMap">


        select rw.reporting_work_id,


@@ -574,7 +580,6 @@


        select process


        from sd.order_process_detail


        where process_id = #{processId}


          and order_number = 1


          and technology_number = 1


        order by id desc


        LIMIT 1




 north-glass-erp/target/classes/application.yml


@@ -11,22 +11,22 @@


      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.


      datasource:


        user_info:


          url: jdbc:mysql://localhost:3306/erp_user_info?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        sd:


          url: jdbc:mysql://localhost:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true


          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        mm:


          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver


        pp:


          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8


          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8


          username: root


          password: beibo.123/


          driver-class-name: com.mysql.cj.jdbc.Driver




 north-glass-erp/target/classes/mapper/pp/ReportingWork.xml


@@ -310,13 +310,10 @@


    </select>


    <select id="selectGlassProcessNum" resultType="java.lang.Integer">


        select


            if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,


               0,


               (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)


                )








        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,


           0,


           (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)


            )


        from flow_card as a


        left join sd.order_process_detail as b


        on


@@ -386,10 +383,12 @@


            d.child_width,


            d.child_height,


            e.shape,


            a.completed_quantity+a.breakage_quantity as 'quantity', -- 可报工数


            a.completed_quantity as 'completedQuantity', -- 完工数


            a.breakage_quantity as 'breakageQuantity', -- 破损数


            f.completed_quantity as thisQuantitySum ,-- 本工序完工和


            if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,


                c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),


                ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 可报工数


            ifnull(a.completed_quantity,0) as 'completedQuantity', -- 完工数


            ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 破损数


            ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和


            if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,


            <if test="nextProcess != null and nextProcess != ''">  -- 非最后一道工序


                ifnull(g.completed_quantity,0) as nextQuantitySum,  -- 后工序已完成


@@ -414,13 +413,16 @@


                as minQuantity -- 修改最小数


            </if>


            -- e.thisQuantitySum


        from


            reporting_work_detail as a


            left join reporting_work as b


                on  a.reporting_work_id = b.reporting_work_id


            left join  flow_card as c


                on c.process_id = b.process_id


                and c.technology_number = a.technology_number


        from reporting_work as b




        right join  flow_card as c


        on c.process_id = b.process_id




        left join reporting_work_detail as a


        on  a.reporting_work_id = b.reporting_work_id


        and c.order_number=a.order_number


        and c.technology_number = a.technology_number




            left join  sd.order_glass_detail as d


                on d.order_id = c.order_id


                and c.order_number = d.order_number


@@ -464,7 +466,8 @@


                  and g.order_number = a.order_number


                  and g.technology_number = a.technology_number


        </if>


        where a.reporting_work_id = #{reportingWorkId}


        where b.reporting_work_id = #{reportingWorkId}


        GROUP BY c.order_number


    </select>


<select id="selectReportingWorkMp" resultMap="reportingWorkMap">


        select rw.reporting_work_id,


@@ -577,7 +580,6 @@


        select process


        from sd.order_process_detail


        where process_id = #{processId}


          and order_number = 1


          and technology_number = 1


        order by id desc


        LIMIT 1