diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index 03634b036..75aa7aa68 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -302,22 +302,26 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '从库存状态',
-  //   field: 'fromInventoryStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '到库存状态',
-  //   field: 'toInventoryStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '从器具号',
   //   field: 'fromContainerNumber',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index bf4d22be7..1b906d432 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/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: '',