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

廖井涛

2024-08-02 9258779fdf343a98e1bc4553967fc6ade82b702f

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

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

@@ -37,7 +37,7 @@
    {field: 'buildingNumber',width:120,  title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'otherColumns.S01',width:140,  title: '编号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    //{field: 'grossAmount',width:160,  title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'height',width:140,  title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -58,7 +58,10 @@
    {field: 'edgingType',width:160,  title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

  ],

  toolbarConfig: {
    zoom: true,
    custom: true
  },

  footerMethod ({ columns, data }) {//页脚函数
    return[
@@ -79,16 +82,44 @@
let props = defineProps({
  orderId:null
})
onMounted(()=>{
  request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
    xGrid.value.reloadData(res.data)
  })
onMounted(async ()=>{
  await getColumns()
  await getDetail()
})
watch(()=>props.orderId,(newValue)=>{
  request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
      xGrid.value.reloadData(res.data)
  })
  getDetail()
})

const getColumns = async () => {
  await request.post(`/basicOtherMoney/findAllByState`).then(res=>{
    console.log(res.data)
    res.data.forEach(item => {
      let column = {
        field: `otherColumns.${item.column}`,
        width:100,
        title: item.alias,
        editRender: {
          name: 'input',
        }
      }
      //columns.push(column)
      gridOptions.columns.push(column)

    })
  })
}

const getDetail = async ()=> {
  await request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
    res.data.forEach(item => {
      item.otherColumns = JSON.parse(item.otherColumns)
    })
    xGrid.value.reloadData(res.data)
  })
}



</script>

<template>

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

@@ -114,7 +114,7 @@
      </tr>
      <tr>
        <th class="title-1">生产单号</th>
        <th colspan="3">{{data.order.orderId}}</th>
        <th colspan="3">{{data.order.orderId}}（对应单号{{data.order.batch}}）</th>
        <th class="title-1">下单日期</th>
        <th colspan="3">{{data.order.createTime}}</th>
        <th class="title-1">订单类型</th>
@@ -132,8 +132,6 @@
        <th>包装</th>
        <th colspan="3">{{data.order.packType}}</th>
      </tr>


        <tr>
          <th >序号</th>
          <th >{{company.columnName}}</th>

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

@@ -20,10 +20,6 @@

let inquiryMode = company.printLabel.getSelectFlowCard;

let isChecked= ref(true)

// let checkedValue = inquiryMode

const checkedValue = ref(inquiryMode)
//排序
let editRow = ref({

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -22,7 +22,7 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
const maxTableLen =ref(150)
const maxTableLen =ref(200)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()

 north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java

@@ -33,4 +33,9 @@
        return  Result.seccess(basicOtherMoneyService.save(alias.get("alias")));
    }

    @PostMapping("findAllByState")
    public Result findAllByState(){
        return  Result.seccess(basicOtherMoneyService.findAllByState());
    }

}

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

@@ -139,4 +139,6 @@
    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);

    List<Map<String, String>> selectPrintNotMp(String orderId);

    List<Map<String, String>> selectPrintNotMergeMp(String orderId);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java

@@ -58,4 +58,11 @@
        basicOtherMoneyMapper.insert(newBasicOtherMoney);
        return true;
    }

    public List<BasicOtherMoney> findAllByState() {
       return basicOtherMoneyMapper.selectList(
               new QueryWrapper<BasicOtherMoney>().
                       eq("state",1).
                       like("`column`","S"));
    }
}

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

@@ -544,7 +544,7 @@
                            GROUP BY order_id, order_number,ogds.group
                        ) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
                        where fc.order_id = #{orderId}
                        GROUP BY fc.process_id
                        GROUP BY fc.process_id,ogdss.technology_number
                        order by fc.process_id)
                       UNION
                       (select fc.id,
@@ -1460,4 +1460,116 @@
        GROUP BY fc.process_id, ogd.technology_number
        order by fc.process_id, ogd.technology_number
    </select>

    <select id="selectPrintNotMergeMp">
        select * from ((select fc.id,
                               fc.order_id,
                               fc.process_id,
                               o.customer_name,
                               o.project,
                               fc.order_number,
                               ogd.technology_number,
                               ogd.glass_address,
                               sum(od.quantity)         as quantity,
                               sum(ogd.total_area)      as total_area,
                               od.product_name,
                               ogd.glass_child,
                               fc.founder,
                               date(fc.splitFrame_time) as splitFrame_time,
                            /* if(fc.print_status=0,'未打印','已打印') as  print_status*/
                               fc.print_status,
                               ogd.process
                        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
                                              ogd.technology_number = fc.technology_number
                                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                                 left join sd.`order` as o on o.order_id = fc.order_id
                        where fc.order_id = #{orderId}
                        GROUP BY fc.process_id, ogd.technology_number
                        order by fc.process_id, ogd.technology_number)

                       UNION

                       (select fc.id,
                               fc.order_id,
                               fc.process_id,
                               o.customer_name,
                               o.project,
                               ogdss.technology_number,
                               ogd.glass_address,
                               ROUND(sum(fc.quantity)/(count(DISTINCT fc.technology_number)))         as quantity,
                               sum(ogd.total_area)      as total_area,
                               # SUM(ogd.child_width*child_height*fc.quantity/(count(DISTINCT ogd.technology_number))) as total_area,
                               od.product_name,
                               ogdss.concatenated_glass_child as glass_child,
                               fc.founder,
                               date(fc.splitFrame_time) as splitFrame_time,
                               fc.print_status,
                               processed_part as  process

                        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
                                              ogd.technology_number = fc.technology_number
                                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                                 left join sd.`order` as o on o.order_id = fc.order_id
                                 left join (
                            select
                                ogds.order_id,
                                ogds.order_number,
                                GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
                                ogds.glass_child,
                                GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
                                SUBSTRING(process, LOCATE('夹胶', process)) AS processed_part
                            from sd.order_glass_detail as ogds
                            where ogds.order_id = #{orderId} and LOCATE('夹胶',ogds.process)>0
                            GROUP BY order_id, order_number,ogds.group
                        ) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
                        where fc.order_id = #{orderId}
                        GROUP BY fc.process_id,ogdss.technology_number
                        order by fc.process_id)
                       UNION
                       (select fc.id,
                               fc.order_id,
                               fc.process_id,
                               o.customer_name,
                               o.project,
                               ogdss.technology_number,
                               ogd.glass_address,
                               ROUND(sum(fc.quantity)/(count(DISTINCT fc.technology_number)))         as quantity,
                               sum(ogd.total_area)      as total_area,
                               od.product_name,
                               ogdss.concatenated_glass_child as glass_child,
                               fc.founder,
                               date(fc.splitFrame_time) as splitFrame_time,
                               fc.print_status,
                               processed_part as process

                        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
                                              ogd.technology_number = fc.technology_number
                                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                                 left join sd.`order` as o on o.order_id = fc.order_id
                                 left join (
                            select
                                ogds.order_id,
                                ogds.order_number,
                                GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number,
                                ogds.glass_child,
                                GROUP_CONCAT(ogds.glass_child SEPARATOR ' ') AS concatenated_glass_child,
                                SUBSTRING(pds.process, LOCATE('中空', pds.process)) AS processed_part
                            from sd.order_glass_detail as ogds
                                     left join sd.order_detail as ods on ods.order_id=ogds.order_id and ods.order_number=ogds.order_number
                                     left join sd.product_detail as pds on pds.prod_id=ods.product_id and pds.glass_sort=ogds.technology_number
                            where ogds.order_id = #{orderId}
                            GROUP BY order_id, order_number
                        ) as ogdss on fc.order_id=ogdss.order_id and ogdss.order_number=fc.order_number
                        where fc.order_id = #{orderId}
                        GROUP BY fc.process_id
                        order by fc.process_id)

                      ) AS combined_results where process is not null and process!=""
    </select>
</mapper>

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -114,6 +114,14 @@
               and o.salesman REGEXP #{order.salesman}
           </if>

            <if test="order.creator != null and order.creator != ''">
                and o.creator REGEXP #{order.creator}
            </if>

            <if test="order.verifier != null and order.verifier != ''">
                and o.verifier REGEXP #{order.verifier}
            </if>

           <if test="order.perimeter != null and order.perimeter != ''">
               and o.perimeter REGEXP #{order.perimeter}
           </if>
@@ -202,6 +210,14 @@
                and o.salesman REGEXP #{order.salesman}
            </if>

            <if test="order.creator != null and order.creator != ''">
                and o.creator REGEXP #{order.creator}
            </if>

            <if test="order.verifier != null and order.verifier != ''">
                and o.verifier REGEXP #{order.verifier}
            </if>

            <if test="order.perimeter != null and order.perimeter != ''">
                and o.perimeter REGEXP #{order.perimeter}
            </if>