Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts

@@ -302,22 +302,26 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
+  {
-  //   label: '从库存状态',
+    label: '从库存状态',
-  //   field: 'fromInventoryStatus',
+    field: 'fromInventoryStatus',
-  //   sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
-  //   table: {
+    dictClass: 'string',
-  //     width: 150
+    sort: 'custom',
-  //   },
+    table: {
-  // },
+      width: 150
-  // {
+    },
-  //   label: '到库存状态',
+  },
-  //   field: 'toInventoryStatus',
+  {
-  //   sort: 'custom',
+    label: '到库存状态',
-  //   table: {
+    field: 'toInventoryStatus',
-  //     width: 150
+    dictType: DICT_TYPE.INVENTORY_STATUS,
-  //   },
+    dictClass: 'string',
-  // },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '从器具号',
   //   field: 'fromContainerNumber',

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -435,7 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['4']),
+        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
         type: 'primary',
         icon: '',
         color: '',