廖井涛
2025-02-20 bca74a9035fc2eb477780e466170c3569e4ef878
修改递增功能
2个文件已修改
21 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -630,7 +630,7 @@
            const val = getNestedProperty(dataList[result.start],result.cell)+""
            if(!/\d$/.test(val)){
              const matches = val.match(/\D/g);
              const a= val.lastIndexOf(matches[matches.length - 1])
              const b= val.lastIndexOf(matches[matches.length-1])
              const numbersArr = []
              const regex = /\d+/g
@@ -640,8 +640,10 @@
              }
              let numbers=numbersArr[numbersArr.length-1]
              var subStr1 = val.substring(numbers.index);
              const matche = subStr1.match(/(\d+)([^0-9]|$)/);
              const a= val.lastIndexOf(matche[2])
              var subStr2 = val.substring(0, numbers.index);
              var subStr3 = val.substring(a);
              var subStr3 = val.substring(a,b+1);
              let number = parseInt(subStr1)
              var reg =new RegExp(number,"g")
              dataList.forEach((item,index) =>{
@@ -649,8 +651,11 @@
                  let newStr = subStr1.replace(reg, number);
                  if(parseInt(newStr)>9){
                    newStr=parseInt(newStr)
                    if(!/\d$/.test(val)){
                      newStr=newStr+subStr3
                    }
                  }
                  setNestedValue(item,result.cell,subStr2+newStr+subStr3)
                  setNestedValue(item,result.cell,subStr2+newStr)
                  number=number+1
                }
@@ -692,7 +697,7 @@
            const val = getNestedProperty(dataList[result.start], result.cell)+""
            if(!/\d$/.test(val)){
              const matches = val.match(/\D/g);
              const a= val.lastIndexOf(matches[matches.length - 1])
              const b= val.lastIndexOf(matches[matches.length-1])
              const numbersArr = []
              const regex = /\d+/g
@@ -702,8 +707,10 @@
              }
              let numbers=numbersArr[numbersArr.length-1]
              var subStr1 = val.substring(numbers.index);
              const matche = subStr1.match(/(\d+)([^0-9]|$)/);
              const a= val.lastIndexOf(matche[2])
              var subStr2 = val.substring(0, numbers.index);
              var subStr3 = val.substring(a);
              var subStr3 = val.substring(a,b+1);
              let number = parseInt(subStr1)
              var reg =new RegExp(number,"g")
              dataList.forEach((item,index) =>{
@@ -711,8 +718,9 @@
                  let newStr = subStr1.replace(reg, number);
                  if(parseInt(newStr)>9){
                    newStr=parseInt(newStr)
                    newStr=newStr+subStr3
                  }
                  setNestedValue(item,result.cell,subStr2+newStr+subStr3)
                  setNestedValue(item,result.cell,subStr2+newStr)
                  number=number+1
                }
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -172,6 +172,7 @@
        mi.inventory_quantity AS inventoryQuantity,
        ou.not_use_count AS availableQuantity,
        ou.not_use_count AS planQuantity,
        ou.not_use_count AS outboundQuantity,
        mi.id,
        mi.inventory_organization as inventoryOrganization,
        mi.material_code AS materialCode,