Commit f96f6c4a915309dfd5999bae0b6b999b4595412b

Authored by 谭毅彬
1 parent d855c9e7

库存锁定BUG修复

Signed-off-by: TanYibin <5491541@qq.com>
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
... ... @@ -286,6 +286,7 @@ export default {
286 286 '报废品': 'purple',
287 287 '待确认 ': 'grey',
288 288 '次品': 'red',
  289 + '锁定': 'red',
289 290 default: 'blue'
290 291 };
291 292 return colors[status] || colors.default;
... ...
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
... ... @@ -175,6 +175,12 @@
175 175 class="j-table-force-nowrap"
176 176 @change="handleTableChange"
177 177 >
  178 + <span slot="containerStatus_dictText" slot-scope="containerStatus_dictText">
  179 + <a-tag :key="containerStatus_dictText" :color="getStatusColor(containerStatus_dictText)">
  180 + {{ containerStatus_dictText }}
  181 + </a-tag>
  182 + </span>
  183 +
178 184 <span slot="enable_dictText" slot-scope="enable_dictText">
179 185 <a-tag :key="enable_dictText" :color="getStatusColor(enable_dictText)">
180 186 {{ enable_dictText }}
... ... @@ -282,6 +288,12 @@ export default {
282 288 dataIndex: 'containerCode'
283 289 },
284 290 {
  291 + title: '容器状态',
  292 + align: "center",
  293 + dataIndex: 'containerStatus_dictText',
  294 + scopedSlots: {customRender: 'containerStatus_dictText'}
  295 + },
  296 + {
285 297 title: '库位编码',
286 298 align: 'center',
287 299 dataIndex: 'locationCode'
... ... @@ -416,6 +428,7 @@ export default {
416 428 '报废品': 'purple',
417 429 '待确认 ': 'grey',
418 430 '次品': 'red',
  431 + '锁定': 'red',
419 432 default: 'blue'
420 433 };
421 434 return colors[status] || colors.default;
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
... ... @@ -465,7 +465,9 @@ export default {
465 465 }
466 466 this.selectedRowKeys = selectedRowKeys;
467 467 this.selectionRows = selectionRows;
468   - this.flowStatus = selectionRows[0].firstStatus.toString();
  468 + if (selectionRows.length > 0) {
  469 + this.flowStatus = selectionRows[0].firstStatus.toString();
  470 + }
469 471 },
470 472 hanleBack(record) {
471 473 backErpShipment(record).then((res) => {
... ...
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&lt;TaskHeaderMapper, TaskHea
836 836 return Result.error("取消任务失败,有前置任务" + preTaskHeader.getId());
837 837 }
838 838 if (!taskHeaderService.removeById(taskId)) {
839   - throw new JeecgBootException("取消任务失败, 删除任务失败");
  839 + throw new JeecgBootException("取消任务失败 删除任务失败");
840 840 }
841 841 List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskId);
842 842 if (taskDetailList.size() > 0) {
... ... @@ -864,6 +864,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
864 864 throw new JeecgBootException(result.getMessage());
865 865 }
866 866 }
  867 + if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode())) {
  868 + throw new JeecgBootException("取消任务失败, 更新库存明细失败");
  869 + }
867 870 log.info("完成取消任务" + taskHeader.getId());
868 871 return result;
869 872 }
... ...