Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-07-29 1bc669f980c7cdb13d96eec27053ead30f2f6aec

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -123,6 +123,10 @@
              height=0
              index+=1
              orderDetailList.value[index]=[]
              orderDetailList.value[index].push({
                type:'customer',
                customer:produceList.value[i].detail[0]
              })
            }
            orderDetailList.value[index].push({
              type:'size',

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue

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

  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data)
      produceList.value = deepClone(res.data)
      for(let i=0;i<produceList.value.length;i++){
        let produceList1= ({
@@ -192,7 +193,7 @@
              <thead>
              <tr v-if="index===0">
                <th style="width: 6%;">序号</th>
                <th style="width: 15%;">楼层编号</th>
                <th style="width: 15%;">楼层编号(箱号)</th>
                <th style="width: 17%;" colspan="1">宽X高</th>
                <th style="width: 10%;">数量</th>
                <th style="width: 10%;">面积</th>
@@ -211,7 +212,8 @@

              <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
                <td>{{items.order_number}}</td>
                <td>{{items.buildingNumber}}</td>
                <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
                <td v-else>{{items.buildingNumber}}</td>
                <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
                <td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>

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

@@ -155,7 +155,8 @@

              <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
                <td>{{items.order_number}}</td>
                <td>{{items.buildingNumber}}</td>
                <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
                <td v-else>{{items.buildingNumber}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue

@@ -198,9 +198,11 @@
  if(pageData.value[page] === undefined){
    return  0
  }
  return pageData.value[page].reduce((accumulator, currentValue) => {
  const val = pageData.value[page].reduce((accumulator, currentValue) => {
    return addAuto(accumulator,currentValue.DeliveryDetail.money,2)
  }, 0)

  return val===0?'':val
}


@@ -293,12 +295,12 @@
              style="width: 80px"
              v-if="props.type===1"
          >
            {{item.DeliveryDetail.price}}
            {{item.DeliveryDetail.price == '0' ? '' : item.DeliveryDetail.price}}
          </td>
          <td
              v-if="props.type===1"
          >
            {{item.DeliveryDetail.money}}
            {{item.DeliveryDetail.money == '0' ? '' : item.DeliveryDetail.money}}
          </td>
        </tr>


 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue

@@ -363,12 +363,12 @@
              v-if="props.type===1||props.type===3"
              style="width: 80px"
          >
            {{ items.price }}
            {{ items.price == '0' ? '' : items.price }}
          </td>
          <td
              v-if="props.type===1||props.type===3"
          >
            {{ items.money }}
            {{ items.money == '0' ? '' : items.money }}
          </td>

        </tr>
@@ -386,7 +386,7 @@
        </td>
        <td style="width: 80px"></td>
        <td v-if="props.type===1||props.type===3">
          {{ getMoneySum(pageIndex) }}
          {{ getMoneySum(pageIndex) == '0.00' ? '' : getMoneySum(pageIndex) }}
        </td>

      </tr>

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

@@ -430,9 +430,11 @@
  //points.value=[0, heightAgv, 0, 0, widthAgv, 0, widthAgv,heightAgv]

  let numbers = [point[0], point[2], point[4], point[6]]; // 示例数组
  let maxX1 = Math.max(...numbers); // 找到最大的数
  let remaining = numbers.filter(num => num !== maxX1); // 移除最大数，剩下的数组
  let maxX2 = Math.max(...remaining); // 在剩余的数中找到第二大的数
  let maxX1 = Math.max(...numbers); // 找到最大值
  let maxIndex = numbers.findIndex(num => num === maxX1); // 定位第一个匹配索引
  let remaining = [...numbers]; // 复制原数组避免突变
  remaining.splice(maxIndex, 1); // 仅移除第一个最大值实例
  let maxX2 = Math.max(...remaining); // 在剩余数组中找第二大值

  let arr=[]
  for (let i=0;i<point.length;i++){

 north-glass-erp/northglass-erp/src/router/index.js

@@ -1336,6 +1336,11 @@
      path: '/app',
      name: 'app',
      component: () => import('../views/system/app/appDownload.vue')
    },
    {
      path: '/productionScheduleCollect',
      name: 'productionScheduleCollect',
      component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
    }
    
  ]

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

@@ -862,45 +862,95 @@
  datas8.value=(maxY - minY) / big
  //points.value=[0, heightAgv, 0, 0, widthAgv, 0, widthAgv,heightAgv]

  if(point[0]*big===0){
  let numbers = [point[0], point[2], point[4], point[6]]; // 示例数组
  let maxX1 = Math.max(...numbers); // 找到最大值
  let maxIndex = numbers.findIndex(num => num === maxX1); // 定位第一个匹配索引
  let remaining = [...numbers]; // 复制原数组避免突变
  remaining.splice(maxIndex, 1); // 仅移除第一个最大值实例
  let maxX2 = Math.max(...remaining); // 在剩余数组中找第二大值

  let arr=[]
  for (let i=0;i<point.length;i++){
    let a=[]
    if(i % 2 === 0){
      a.push(point[i])
      a.push((point[i+1]))
      arr.push(a)
    }

  }
  let x=[]
  let y=[]

  let upperRight=null //右上
  let lowerRight=null //右下
  let topLeft=null //左上
  let lowerLeft=null //左下

  arr.forEach(item=>{
    if(item[0]==maxX1||item[0]==maxX2){
      x.push(item)
    }else{
      y.push(item)
    }
  })

  if(x[0][1]>x[1][1]){
    lowerRight=x[0]
    upperRight=x[1]
  }else{
    upperRight=x[0]
    lowerRight=x[1]
  }

  if(y[0][1]>y[1][1]){
    lowerLeft=y[0]
    topLeft=y[1]
  }else {
    topLeft=y[0]
    lowerLeft=y[1]
  }


  if(lowerLeft[0]*big===0){
    data5.value=0
  }else{
    data5.value=round(point[0]*big,0)
    data5.value=round(lowerLeft[0]*big,0)
  }
  if(point[1]*big===0){
  if(lowerLeft[1]*big===0){
    data6.value=0
  }else{
    data6.value=maxY-minY-round(point[1]*big,0)
    data6.value=round(maxY-minY-lowerLeft[1]*big,0)
  }
  if(point[2]*big===0){
  if(topLeft[0]*big===0){
    data1.value=0
  }else{
    data1.value=round(point[2]*big,0)
    data1.value=round(topLeft[0]*big,0)
  }
  if(point[3]*big===0){
  if(topLeft[1]*big===0){
    data2.value=0
  }else{
    data2.value=round(point[3]*big,0)
    data2.value=round(topLeft[1]*big,0)
  }
  if(point[4]*big===0){
  if(upperRight[0]*big===0){
    data3.value=0
  }else{
    data3.value=maxX-minX-round(point[4]*big,0)
    data3.value=round(maxX-minX-upperRight[0]*big,0)
  }
  if(point[5]*big===0){
  if(upperRight[1]*big===0){
    data4.value=0
  }else{
    data4.value=round(point[5]*big,0)
    data4.value=round(upperRight[1]*big,0)
  }
  if(point[6]*big===0){
  if(lowerRight[0]*big===0){
    data7.value=0
  }else{
    data7.value=maxX-minX-round(point[6]*big,0)
    data7.value=round(maxX-minX-lowerRight[0]*big,0)
  }
  if(point[7]*big===0){
  if(lowerRight[1]*big===0){
    data8.value=0
  }else{
    data8.value=maxY-minY-round(point[7]*big,0)
    data8.value=round(maxY-minY-lowerRight[1]*big,0)
  }
}


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

@@ -1200,6 +1200,7 @@
               dd.area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               dd.box_no,
               dd.price,
               od.other_columns,
               od.remarks