Merge branch 'hella_online_20241017' into master_hella

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -146,7 +146,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         style: {width:'100%'},
         min: 0,
-        precision: 6
+        precision: 0
       }
     }
   },

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -350,7 +350,7 @@ const openForm = (type: string, row?: any) => {
 const inputNumberChange = (field, val,row, index) => {
   if(field=='qty'){
     if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){
-      message.error(`${row['itemCode']}物料开票数量${row['qty']}大于库存数量${row['subSettleQty']}`)
+      message.error(`${row['itemCode']}物料开票数量${row['qty']},最大数量为${row['subSettleQty']}`)
     }
   }
   console.log('inputNumberChange',field, val,row, index)
@@ -365,7 +365,7 @@ const submitForm = async (formType, submitData) => {
   tableData.value.forEach(item=>{
     if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){
       flag = false
-      message.error(`${item['itemCode']}物料开票数量${item['qty']}大于库存数量${item['subSettleQty']}`)
+      message.error(`${item['itemCode']}物料开票数量${item['qty']},最大数量为${item['subSettleQty']}`)
     }
   })
   if(!flag){