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

huang

2024-11-27 00a4964545cebf09ba9f8f06b08699233db0141f

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

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -10,6 +10,7 @@
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
import userInfo from "@/stores/userInfo"
import {add} from '@/utils/decimal'
//语言获取
const company = companyInfo()
const {t} = useI18n()
@@ -196,7 +197,7 @@
      totalQuantity += collection.quantity * 1;
      //每个序号面积
      collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
      totalArea += collection.total_area * 1;
      totalArea = add(totalArea, collection.total_area)
      totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
      //每个序号周长
      collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
@@ -210,14 +211,14 @@

const AreaQuantitySummary = () => {


  console.log(produceList.value)
  for (let i = 0; i < produceList.value.length; i++) {
    // éåŽ†å½“前项目的 detail æ•°ç»„
    for (let j = 0; j < produceList.value[i].detail.length; j++) {
      // ç´¯åŠ æ•°é‡
      totalQuantity += produceList.value[i].detail[j].quantity;
      totalQuantity = add(totalQuantity,produceList.value[i].detail[j].quantity)
      // ç´¯åŠ é¢ç§¯
      totalArea += produceList.value[i].detail[j].gross_area;
      totalArea = add(totalArea,produceList.value[i].detail[j].gross_area)
    }
  }

@@ -316,7 +317,7 @@
          æ•°é‡ï¼š
          <label>{{ itemsum.quantity }}</label>
          é¢ç§¯ï¼š
          <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
          <label>{{ itemsum.gross_area }}</label>
          é‡é‡ï¼š
          <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
        </td>

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

@@ -35,13 +35,13 @@
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      produceList.value.forEach(item => {
        sumMoney+=item.DeliveryDetail.money
      })
      console.log(otherMoney.value)
      otherMoney1=[]
      otherMoney=deepClone(res.data.otherMoney)
      for(let i=0;i<otherMoney.length;i++){

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

@@ -38,6 +38,8 @@
    if(res.code==200){
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)

      console.log(produceList.value)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      produceList.value.forEach(item => {
@@ -208,7 +210,9 @@
        <th style="width: 10%;">面积</th>
        <th style="width: 10%;">单价</th>
        <th style="width: 12%;">金额</th>
        <th style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="company.showDeliveryCreator" style="width: 20%;" colspan="2">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">加工要求</th>
        <th v-if="!company.showDeliveryCreator" style="width: 10%;" colspan="1">备注</th>
      </tr>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
@@ -226,7 +230,9 @@
          <td>{{items.compute_gross_area}}</td>
          <td>{{items.price}}</td>
          <td>{{items.gross_amount}}</td>
          <td colspan="2">{{items.processingNote}}</td>
          <td v-if="company.showDeliveryCreator" colspan="2">{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.processingNote}}</td>
          <td v-if="!company.showDeliveryCreator" >{{items.remarks}}</td>
        </tr>
        <tr class="day-in" >
          <td style="font-size: 15px;font-weight: bold;" colspan="3">小计:</td>

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -7,6 +7,7 @@
        address:'天津宝坻区节能环保工业区天兴路西侧宝中道南侧',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -7,6 +7,7 @@
        address:'常州市天宁区郑陆镇大明南路8号',
        telephone:'022-59280088',
        fax:'022-59280066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(\d{1,4})$/,//正则四位整数
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -8,6 +8,7 @@
        address:'新疆五家渠工业园兵团新型建材工业园区工一路11号附1号',
        telephone:'13419168999',
        fax:'',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -7,6 +7,7 @@
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'189 3119 1362 èµ–厂长',
        fax:'',
        errorArea:0.3,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -681,7 +681,7 @@
<template>
  <div class="main-div-customer">
    <div class="head">
      <el-date-picker
<!--      <el-date-picker
          v-model="selectDate"
          type="daterange"
          :start-placeholder="$t('basicData.startDate')"
@@ -690,7 +690,7 @@
          value-format="YYYY-MM-DD"

      />
      <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
      <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>-->
      <div>
        <el-row>
          <el-select v-model="values" :placeholder="$t('ingredients.pleaseSelectACategory')" @change="selectInventoryWork">
@@ -707,7 +707,7 @@

    <div class="main-table">
      <vxe-grid
          max-height="100%"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -850,11 +850,11 @@
}
.head{
  width: 100%;
  height: 65px;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 60px);
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/mm/productStock/CreateProductStock.vue

@@ -341,8 +341,8 @@
</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
  <div  style="width: 100%;height: 100%">
    <div class="head">
      <el-input style="width: 200px" v-model="container" class="m-2" :placeholder="$t('productStock.pleaseEnterTheBoxNumber')">
      </el-input>
        <el-input style="width: 200px" v-model="storageRegion" class="m-2" :placeholder="$t('productStock.pleaseEnterTheStorageLocation')">
@@ -355,7 +355,7 @@

    </div>


    <div class="main-table">
    <vxe-grid
        max-height="100%"
        @filter-change="filterChanged"
@@ -407,12 +407,18 @@


    </vxe-grid>
    </div>
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue

@@ -324,7 +324,8 @@
</script>

<template>
  <div class="main-div-customer">
  <div  style="width: 100%;height: 100%">
    <div class="head">
    <el-date-picker
        v-model="selectDate"
        type="daterange"
@@ -335,7 +336,9 @@

    />
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
    </div>

    <div class="main-table">
    <vxe-grid
        max-height="100%"
        @filter-change="filterChanged"
@@ -396,11 +399,17 @@

    </vxe-grid>
  </div>
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

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

@@ -138,25 +138,8 @@
<template>
  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
  <div id="printFlowCard" >
<!--    <div id="entirety" v-for="(items,id) in produceList" >
      <div v-for="(item,index) in items.data" :key="index">
        <div class="row1">{{ item.customer_name }}</div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>
          <span>{{ item.type_name }}</span>
        </div>
        <div class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>
          <span>{{ item.remarks }}</span>
        </div>
        <div class="row6">
          <span>{{item.glass_child}}</span>
          <span>{{item.processing_note}}</span>
        </div>
      </div>
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
    <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >

      <div class="row1" v-if="item.heat_layout_id!=null">

        <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
@@ -192,6 +175,50 @@
        <span>{{item.project}}</span>&nbsp;
      </div>
    </div>




    <template v-if="type==='3'"  v-for="(item,id) in labelList">
      <div v-if="type==='3'" id="entirety" v-for="n in item.quantity" >

        <div class="row1" v-if="item.heat_layout_id!=null">

          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.process.includes('夹胶')">胶片</span>
          <span v-else-if="item.process.includes('中空')">中空</span>
          <span v-else-if="item.process.includes('百叶')">百叶</span>
          <span v-else></span>
          <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>

        </div>
        <div class="row2" v-else>
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.process.includes('夹胶')">胶片</span>
          <span v-else-if="item.process.includes('中空')">中空</span>
          <span v-else-if="item.process.includes('百叶')">百叶</span>
          <span v-else></span>
        </div>

        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row5">
          <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
          <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
        </div>
        <div class="row6">
          <span>{{item.glass_child}}</span>&nbsp;
          <span>{{item.processing_note}}</span>
        </div>
        <div class="row5">
          <span>{{item.project}}</span>&nbsp;
        </div>
      </div>
    </template>

  </div>

</template>

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -283,7 +283,7 @@
      options: [
        [
          { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
          //{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
          { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
        ]
      ]
    }
@@ -527,6 +527,34 @@
          }
          break
        }
        case 'copyAll' :{
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            let firstVal=null;
            if(result.cell.indexOf('.')>-1){
              firstVal = eval("dataList["+result.start +"]."+result.cell)
            }else {
              firstVal=dataList[result.start][result.cell];
            }
            dataList.forEach((item,index) =>{
              if(index>=result.start){
                //取消选中
                if(parseInt(firstVal)<=0){
                  xGrid.value.setCheckboxRow(item, false);
                }
                if(result.cell.indexOf('.')>-1){
                  const  columnArr = result.cell.split('.')
                  item[columnArr[0]][columnArr[1]]  = firstVal
                }else{
                  item[result.cell]  = firstVal
                }

              }
            })
          }
          break
        }
        case 'otherMoney' :{
          otherMoneyVisible.value=true
          break
@@ -559,6 +587,22 @@
  }
}

function getNestedProperty(obj, path) {
  return path.split('.').reduce(function(o, p) {
    if(o && o.hasOwnProperty(p)) {
      return o[p];
    }
  }, obj);
}

function setNestedValue(obj, path, value) {
  const keys = path.split('.');
  const lastKey = keys.pop();
  const lastObj = keys.reduce((obj, key) => obj[key], obj);
  lastObj[lastKey] = value;
}


/*数据校验*/
const validRules = ref({
  "deliveryDetail.quantity": [{

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

@@ -25,9 +25,9 @@
let sizeCheckVisible = ref(false)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
let errorArea = ref(company.errorArea)
const router = useRouter()
const route = useRoute()
const xGrid = ref()

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -58,7 +58,7 @@
        ms.json
        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
        <where>
                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
                 and mi.available_quantity>0

        </where>
        order by mi.id desc
@@ -72,7 +72,7 @@
        from
        mm.material_inventory mi
        <where>
                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
                 and mi.available_quantity>0

        </where>
        limit #{offset},#{pageSize};

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

@@ -1011,7 +1011,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               dd.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                 left join product p on od.product_id = p.id
@@ -1050,7 +1051,8 @@
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price,
               od.other_columns
               od.other_columns,
               od.remarks
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}