diff --git a/klp-ui/src/views/wms/todo/stale.vue b/klp-ui/src/views/wms/todo/stale.vue
index a427b3c9..07a229e1 100644
--- a/klp-ui/src/views/wms/todo/stale.vue
+++ b/klp-ui/src/views/wms/todo/stale.vue
@@ -2,25 +2,36 @@
-
-
-
+
+
+
+
+
+
+
+
-
+ {{ actionTypeMap[scope.row.actionType] || scope.row.actionType }}
-
+
-
+ {{ actionStatusMap[scope.row.actionStatus] || scope.row.actionStatus }}
-
-
-
+
+
+
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
+
+
+ {{ parseTime(scope.row.completeTime, '{y}-{m}-{d} {h}:{i}') }}
+
+
{
return completeAction(row.actionId, '-');
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java
index 3894186c..bf4446f3 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java
@@ -147,6 +147,16 @@ public class WmsTransferOrderItemController extends BaseController {
return toAjax(iWmsTransferOrderItemService.confirmTransfer(bo));
}
+ /**
+ * 批量确认调拨
+ */
+ @Log(title = "调拨单明细", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/batchConfirm")
+ public R batchConfirm(@Validated(AddGroup.class) @RequestBody List boList) {
+ return toAjax(iWmsTransferOrderItemService.batchConfirmTransfer(boList));
+ }
+
/**
* 取消调拨
*/
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java
index 71aa6384..99a7be7e 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java
@@ -64,6 +64,11 @@ public interface IWmsTransferOrderItemService {
*/
Boolean confirmTransfer(WmsTransferOrderItemBo bo);
+ /**
+ * 批量确认调拨
+ */
+ Boolean batchConfirmTransfer(List boList);
+
/**
* 取消调拨
*/
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
index 51ebc2bb..abbd2561 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
@@ -600,6 +600,23 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
return true;
}
+ /**
+ * 批量确认调拨
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean batchConfirmTransfer(List boList) {
+ if (boList == null || boList.isEmpty()) {
+ throw new IllegalArgumentException("调拨明细列表不能为空");
+ }
+
+ for (WmsTransferOrderItemBo bo : boList) {
+ confirmTransfer(bo);
+ }
+
+ return true;
+ }
+
/**
* 取消调拨
*/