diff --git a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
index 6336ecc..3ce38d0 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
@@ -135,22 +135,8 @@
</template>
<span slot="action" slot-scope="text, record">
- <a v-has="'apiLog:edit'" @click="handleEdit(record)">编辑</a>
-
- <a-divider type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleDetail(record)">详情</a>
- </a-menu-item>
- <a-menu-item v-has="'apiLog:delete'">
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a v-has="'apiLog:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
+ <a @click="handleDetail(record)">详情</a>
</span>
</a-table>
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index 10410d9..84017a7 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -89,8 +89,8 @@ public class WcsServiceImpl implements WcsService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
- @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情分配库位'", extra = "#extraJsonString", msg = "'库位编码：' + #locationCode",
- condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情分配库位'", extra = "#extraJsonString",
+ msg = "'任务ID：' + #warecellDomain.getTaskNo() + '，库位编码：' + #locationCode", condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
public Result warecellAllocation(WarecellDomain warecellDomain) {
String warehouseCode = warecellDomain.getWarehouseCode();
String zoneCode = warecellDomain.getZoneCode();
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
index b4a78fc..35aa882 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
@@ -57,6 +57,10 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
} else if (logDTO.getTag().equals("入库任务完成")) {
String message = "物料编码：{}，入库数量：{}";
operationLogList.addAll(createOperationLogs(logDTO, TaskDetail.class, "getReceiptCode", message, "getMaterialCode", "getQty"));
+ } else if (logDTO.getTag().equals("详情入库完成")) {
+ Thread.sleep(100);
+ String message = "物料编码：{}，数量：{}";
+ operationLogList.addAll(createOperationLogs(logDTO, ReceiptDetail.class, "getReceiptCode", message, "getMaterialCode", "getQty"));
} else {
String message = "物料编码：{}，数量：{}";
operationLogList.addAll(createOperationLogs(logDTO, ReceiptDetail.class, "getReceiptCode", message, "getMaterialCode", "getQty"));
@@ -72,12 +76,17 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
} else if (logDTO.getTag().equals("出库任务完成")) {
String message = "物料编码：{}，出库数量：{}";
operationLogList.addAll(createOperationLogs(logDTO, TaskDetail.class, "getShipmentCode", message, "getMaterialCode", "getQty"));
+ } else if (logDTO.getTag().equals("详情出库完成")) {
+ Thread.sleep(100);
+ String message = "物料编码：{}，数量：{}";
+ operationLogList.addAll(createOperationLogs(logDTO, ShipmentDetail.class, "getShipmentCode", message, "getMaterialCode", "getQty"));
} else {
String message = "物料编码：{}，数量：{}";
operationLogList.addAll(createOperationLogs(logDTO, ShipmentDetail.class, "getShipmentCode", message, "getMaterialCode", "getQty"));
}
}
} else {
+ Thread.sleep(200);
OperationLog operationLog = new OperationLog();
operationLog.setBizId(logDTO.getBizId());
operationLog.setOperationMsg(StringUtils.substring(logDTO.getMsg(), 0, 1000));
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 9e777ff..5f3648e 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
@@ -1066,8 +1066,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
*/
@Override
@Transactional(rollbackFor = Exception.class)
- @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务完成'", extra = "#extraJsonString",
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1",
msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", recordReturnValue = true)
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情入库完成'", extra = "#extraJsonString2", msg = "''", condition = "#receiptDetaiList.size() > 0",
+ recordReturnValue = true)
public Result completeReceiptTask(TaskHeader taskHeader) {
if (taskHeader == null) {
return Result.error("任务未找到，执行中止");
@@ -1218,7 +1220,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new ServiceException("完成入库任务时，更新入库单头失败");
}
}
- LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(taskDetailList));
+ receiptDetaiList = receiptDetaiList.stream().filter(t -> t.getStatus().equals(QuantityConstant.RECEIPT_HEADER_COMPLETED)).collect(Collectors.toList());
+ LogRecordContext.putVariable("receiptDetaiList", receiptDetaiList);
+ LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
+ LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(receiptDetaiList));
+
return Result.ok("完成入库任务");
}
@@ -1229,9 +1235,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
*/
@Override
@Transactional(rollbackFor = Exception.class)
- @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString",
+ @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
recordReturnValue = true)
+ @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情出库完成'", extra = "#extraJsonString2", msg = "''", condition = "#shipmentDetailList.size() > 0",
+ recordReturnValue = true)
public Result completeShipmentTask(TaskHeader taskHeader) {
if (taskHeader == null) {
return Result.error("完成出库任务未找到，执行中止");
@@ -1401,7 +1409,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new ServiceException("完成出库任务，更新出库单头失败");
}
}
- LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(taskDetailList));
+ // 操作记录添加
+ shipmentDetailList = shipmentDetailList.stream().filter(t -> t.getStatus().equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)).collect(Collectors.toList());
+ LogRecordContext.putVariable("shipmentDetailList", shipmentDetailList); // 操作记录添加
+ LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
+ LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(shipmentDetailList));
return Result.ok("完成出库任务");
}