Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/inventoryManage/balance/index.vue

@@ -250,17 +250,17 @@ const handleSelectionPoint = async () => {
 }
 // 列表-操作按钮
 const butttondata = [
-  {
+  // {
-    label: '标签信息',
+  //   label: '标签信息',
-    name: 'bqxx',
+  //   name: 'bqxx',
-    hide: false,
+  //   hide: false,
-    type: 'primary',
+  //   type: 'primary',
-    icon: '',
+  //   icon: '',
-    color: '',
+  //   color: '',
-    link: true,
+  //   link: true,
-    float: 'right',
+  //   float: 'right',
-    hasPermi: ''
+  //   hasPermi: ''
-  },
+  // },
   defaultButtons.mainListPointBtn(null) // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -530,7 +530,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.directCreateRecord,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -804,9 +804,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    tableForm: {
+    // tableForm: {
-      disabled: true
+    //   disabled: true
-    }
+    // }
   },
   // {
   //   label: '包装号',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -384,6 +384,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
+          newRow['inventoryQty'] = item['qty']
           if(routeName.value == 'NoktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
           }else if ( routeName.value == 'HoldtookRequestMain') {
@@ -606,11 +607,11 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
-  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+  // InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
-    if(item.field == 'qty'){
+    // if(item.field == 'qty'){
-      item.tableForm.disabled = routeName.value == "HoldtookRequestMain"
+    //   item.tableForm.disabled = routeName.value == "HoldtookRequestMain"
-    }
+    // }
-  })
+  // })
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
@@ -768,6 +769,13 @@ const submitForm = async (formType, submitData) => {
   }
   formRef.value.formLoading = true
   try {
+    const cmdExists = data.subList.some(filter =>
+      parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+    );
+    if(cmdExists){
+      message.warning("数量不能大于库存数量")
+      return
+    }
     if (formType === 'create') {
       await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)
       message.success(t('common.createSuccess'))

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts

@@ -26,7 +26,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isForm: false,
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
@@ -66,6 +66,8 @@ export const PurchaseBarterRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'uom',
     sort: 'custom',
     isSearch: false,
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
   },
   {
     label: '批次',