From c2850e1679353a3978db169d965ef5fce6158677 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 11 三月 2026 10:47:08 +0800
Subject: [PATCH] 修改备料功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
index 6f37283..f3dd503 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
@@ -4,6 +4,10 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
+import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
+import com.vincent.rsf.server.api.service.InBoundService;
+import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
@@ -38,6 +42,10 @@
private LocItemService locItemService;
@Resource
private AsnOrderService asnOrderService;
+ @Resource
+ private PdaOutStockService pdaOutStockService;
+ @Resource
+ private InBoundService inBoundService;
/**
@@ -53,7 +61,7 @@
try {
WkOrder order = new WkOrder();
String orderNo = params.getString("orderNo");
- order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_OUT.type)
+ order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
// .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
.setCreateBy(getLoginUserId())
.setUpdateBy(getLoginUserId());
@@ -144,4 +152,17 @@
}
}
+ @PostMapping("/callForEmptyContainers")
+ @ApiOperation("mes鍛煎彨绌哄鍣�")
+ public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) {
+
+ return pdaOutStockService.callForEmptyContainers(containerWaveParam, 52L);
+ }
+
+ @PostMapping("/in/emptyContainer/warehousing")
+ @ApiOperation("绌哄鍣ㄥ叆搴�")
+ public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) {
+ return inBoundService.generateTasks(param, 52L);
+ }
+
}
--
Gitblit v1.9.1