From 4e40afebef0f4eaa846f9c02bd3243c863d0a0e7 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:10:38 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java | 115 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 49 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..de0d155 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,8 @@
try {
WkOrder order = new WkOrder();
String orderNo = params.getString("orderNo");
- order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_OUT.type)
+ boolean out = params.getBoolean("out");
+ order.setCode(orderNo).setPoCode(orderNo).setType(out?OrderType.ORDER_PRE.type:OrderType.ORDER_PRE_NOT_OUT.type)
// .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
.setCreateBy(getLoginUserId())
.setUpdateBy(getLoginUserId());
@@ -78,11 +87,6 @@
qty = item.getDouble("anfme");
}
map.put("anfme", qty);
-// map.put("unit", item.getString("unit"));
-// map.put("splrCode", item.getString("splrCode"));
-// map.put("splrName", item.getString("splrName"));
-// map.put("splrBatch", item.getString("splrBatch"));
-// map.put("platItemId", item.getString("platItemId"));
items.add(map);
}
@@ -94,49 +98,49 @@
return result;
}
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, "O").eq(Loc::getAreaId, 22).last("limit 1"));
- if (loc == null) {
- return R.error("娌℃湁鍙敤搴撲綅");
- }
- String palletId = "AA" + String.format("%06d", (int) (Math.random() * 1000000));
-
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject item = jsonArray.getJSONObject(i);
- loc.setBarcode(palletId);
- loc.setUseStatus("F");
- locService.updateById(loc);
-
- LocItem locItem = new LocItem();
- String matnrCode = item.getString("matNr");
- if (matnrCode == null) {
- matnrCode = item.getString("matNr");
- }
- Double qty = item.getDouble("anfme");
- if (qty == null) {
- qty = item.getDouble("anfme");
- }
- locItem.setLocId(loc.getId())
- .setLocCode(loc.getCode())
- .setOrderId(order.getId())
- .setType(OrderType.ORDER_OUT.type)
-// .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type))
-// .setMatnrId(item.getLong("matnrId"))
- .setMatnrCode(matnrCode)
-// .setMaktx(item.getString("maktx"))
- .setQty(qty)
- .setAnfme(qty)
-// .setUnit(item.getString("unit"))
- .setBarcode(palletId)
- .setStatus(1)
- .setDeleted(0)
- .setCreateTime(new Date());
- if (params.getInteger("prepareType") == 1) {
- locItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type));
- } else {
- locItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type));
- }
- locItemService.save(locItem);
- }
+// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, "O").eq(Loc::getAreaId, 22).last("limit 1"));
+// if (loc == null) {
+// return R.error("娌℃湁鍙敤搴撲綅");
+// }
+// String palletId = "AA" + String.format("%06d", (int) (Math.random() * 1000000));
+//
+// for (int i = 0; i < jsonArray.size(); i++) {
+// JSONObject item = jsonArray.getJSONObject(i);
+// loc.setBarcode(palletId);
+// loc.setUseStatus("F");
+// locService.updateById(loc);
+//
+// LocItem locItem = new LocItem();
+// String matnrCode = item.getString("matNr");
+// if (matnrCode == null) {
+// matnrCode = item.getString("matNr");
+// }
+// Double qty = item.getDouble("anfme");
+// if (qty == null) {
+// qty = item.getDouble("anfme");
+// }
+// locItem.setLocId(loc.getId())
+// .setLocCode(loc.getCode())
+// .setOrderId(order.getId())
+// .setType(OrderType.ORDER_OUT.type)
+//// .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type))
+//// .setMatnrId(item.getLong("matnrId"))
+// .setMatnrCode(matnrCode)
+//// .setMaktx(item.getString("maktx"))
+// .setQty(qty)
+// .setAnfme(qty)
+//// .setUnit(item.getString("unit"))
+// .setBarcode(palletId)
+// .setStatus(1)
+// .setDeleted(0)
+// .setCreateTime(new Date());
+// if (params.getInteger("prepareType") == 1) {
+// locItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type));
+// } else {
+// locItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type));
+// }
+// locItemService.save(locItem);
+// }
return R.ok().add(order.getId());
} catch (Exception e) {
@@ -144,4 +148,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