diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
index 4016cd0..56fd9cc 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
@@ -286,6 +286,7 @@ export default {
         '报废品': 'purple',
         '待确认	': 'grey',
         '次品': 'red',
+        '锁定': 'red',
         default: 'blue'
       };
       return colors[status] || colors.default;
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
index 02b50ec..91ff31d 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -175,6 +175,12 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
+        <span slot="containerStatus_dictText" slot-scope="containerStatus_dictText">
+            <a-tag :key="containerStatus_dictText" :color="getStatusColor(containerStatus_dictText)">
+              {{ containerStatus_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="enable_dictText" slot-scope="enable_dictText">
           <a-tag :key="enable_dictText" :color="getStatusColor(enable_dictText)">
             {{ enable_dictText }}
@@ -282,6 +288,12 @@ export default {
           dataIndex: 'containerCode'
         },
         {
+          title: '容器状态',
+          align: "center",
+          dataIndex: 'containerStatus_dictText',
+          scopedSlots: {customRender: 'containerStatus_dictText'}
+        },
+        {
           title: '库位编码',
           align: 'center',
           dataIndex: 'locationCode'
@@ -416,6 +428,7 @@ export default {
         '报废品': 'purple',
         '待确认	': 'grey',
         '次品': 'red',
+        '锁定': 'red',
         default: 'blue'
       };
       return colors[status] || colors.default;
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index f2f6a5c..feb6420 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -465,7 +465,9 @@ export default {
       }
       this.selectedRowKeys = selectedRowKeys;
       this.selectionRows = selectionRows;
-      this.flowStatus = selectionRows[0].firstStatus.toString();
+      if (selectionRows.length > 0) {
+        this.flowStatus = selectionRows[0].firstStatus.toString();
+      }
     },
     hanleBack(record) {
       backErpShipment(record).then((res) => {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 535d35f..2142e99 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -836,7 +836,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
             return Result.error("取消任务失败，有前置任务" + preTaskHeader.getId());
         }
         if (!taskHeaderService.removeById(taskId)) {
-            throw new JeecgBootException("取消任务失败, 删除任务失败");
+            throw new JeecgBootException("取消任务失败， 删除任务失败");
         }
         List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskId);
         if (taskDetailList.size() > 0) {
@@ -864,6 +864,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
                 throw new JeecgBootException(result.getMessage());
             }
         }
+        if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode())) {
+            throw new JeecgBootException("取消任务失败， 更新库存明细失败");
+        }
         log.info("完成取消任务" + taskHeader.getId());
         return result;
     }