diff --git a/ant-design-vue-jeecg/src/views/system/shipment/modules/QuickShipmentDetailModal.vue b/ant-design-vue-jeecg/src/views/system/shipment/modules/QuickShipmentDetailModal.vue
index a1c12c4..809b7f7 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/modules/QuickShipmentDetailModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/modules/QuickShipmentDetailModal.vue
@@ -29,11 +29,25 @@
         </a-row>
       </a-form-model>
     </a-spin>
+    <a-table ref="table" rowKey="id" size="middle" :columns="columns" :dataSource="dataSource" :pagination="false">
+      <span slot="action" slot-scope="text, record">
+        <a-input-number placeholder="" v-model="record.shipmentQty" :value="text" />
+      </span>
+
+
+      <span slot="inventoryStatus" slot-scope="inventoryStatus">
+          <a-tag :key="inventoryStatus" color="blue" :color="getStatusColor(inventoryStatus)">
+            {{ solutionInvStatus(inventoryStatus) }}
+          </a-tag>
+        </span>
+
+    </a-table>
   </j-modal>
 </template>
 
 <script>
 import { getZoneList, selectOutPort, shipmentInventoryDetail } from '@/api/api'
+import {getAction} from "@api/manage";
 
 export default {
   name: 'QuickShipmentDetailModal',
@@ -41,9 +55,10 @@ export default {
   data() {
     return {
       title: '操作',
-      width: 400,
+      width: 800,
       portList: [],
       inventoryDetailList: [],
+      dataSource: [],
       querySource: {},
       visible: false,
       model: {},
@@ -55,6 +70,53 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
+      columns: [
+        {
+          title: '物料编码',
+          dataIndex: 'materialCode',
+          align: 'center',
+          width: 124
+        },
+        {
+          title: '物料名称',
+          dataIndex: 'materialName',
+          align: 'center',
+          width: 96
+        },
+        {
+          title: '库存状态',
+          align: 'center',
+          dataIndex: 'inventoryStatus_dictText',
+          scopedSlots: {customRender: 'inventoryStatus_dictText'}
+        },
+        {
+          title: '批次',
+          dataIndex: 'batch',
+          align: 'center'
+        },
+        {
+          title: '库存数量',
+          dataIndex: 'qty',
+          align: 'center',
+          width: 80
+        },
+        {
+          title: '入库日期',
+          dataIndex: 'receiptDate',
+          align: 'center',
+          width: 180
+        },
+        {
+          title: '出库数量',
+          dataIndex: 'shipmentQty',
+          align: 'center',
+          key: 'action',
+          scopedSlots: { customRender: 'action' }
+        },
+      ],
+      url: {
+        pageByMainIds: "/inventory/inventoryDetail/pageByMainIds",
+      },
       // 选择用户查询条件配置
       selectUserQueryConfig: [],
       confirmLoading: false,
@@ -76,6 +138,7 @@ export default {
       this.model.containerCode = record[0].containerCode
       this.inventoryDetailList = record
       this.getPortList()
+      this.searchInventoryDetailList();
     },
     close() {
       this.$emit('close')
@@ -91,6 +154,19 @@ export default {
         }
       })
     },
+    searchInventoryDetailList(){
+      let params = {
+        inventoryHeaderIds:""
+      };
+      this.inventoryDetailList.forEach(x=>{
+        params.inventoryHeaderIds+=  + x.inventoryHeaderId + ","
+      })
+      debugger
+      getAction(this.url.pageByMainIds, params).then((res) => {
+        this.dataSource = res.result.records
+        this.inventoryDetailList = res.result.records
+      })
+    },
     handleOk() {
       if (this.model.outPortCode === '') {
         this.$message.warning('请选择出库口')
@@ -101,6 +177,7 @@ export default {
       shipmentInventoryDetail(this.inventoryDetailList).then(res => {
         if (res.success) {
           this.$message.success(res.message)
+          this.$emit('ok')
         } else {
           this.$message.error(res.message)
         }
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
index cf188e8..61bd6d7 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
@@ -159,6 +159,9 @@ public class InventoryDetail implements Serializable {
     private Date updateTime;
     @TableField(exist = false)
     private String toPortCode;
+    @TableField(exist = false)
+    private BigDecimal shipmentQty;
+
 
     public void setQty(BigDecimal qty) {
         if (qty.compareTo(BigDecimal.ZERO) < 0) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
index 55f9c05..a9bed60 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
@@ -327,7 +327,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
             shipmentDetail.setMaterialCode(inventoryDetail.getMaterialCode());
             shipmentDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
             shipmentDetail.setZoneCode(inventoryDetail.getZoneCode());
-            shipmentDetail.setQty(inventoryDetail.getQty());
+            shipmentDetail.setQty(inventoryDetail.getShipmentQty());
             shipmentDetail.setBatch(inventoryDetail.getBatch());
             result = shipmentDetailService.saveShipmentDetail(shipmentDetail);
             if (!result.isSuccess()) {
@@ -343,7 +343,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
             CombinationModel combinationModel = new CombinationModel();
             combinationModel.setInventoryDetail(inventoryDetail);
             combinationModel.setShipmentDetail(shipmentDetail);
-            combinationModel.setShipQty(inventoryDetail.getQty());
+            combinationModel.setShipQty(inventoryDetail.getShipmentQty());
             result = shipmentCombinationService.combination(combinationModel);
             if (!result.isSuccess()) {
                 throw new JeecgBootException("批量快速出库，配盘失败：".concat(result.getMessage()));