From 9140aee230de0ef41de9682a9353fbd372e2bcaa Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 03 三月 2026 13:43:22 +0800
Subject: [PATCH] 云仓WMS接口
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 277 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 214 insertions(+), 63 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index fda3e36..1c2e00b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
@@ -68,6 +69,8 @@
@Autowired
private AsnOrderService asnOrderService;
@Autowired
+ private AsnOrderLogService asnOrderLogService;
+ @Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
private DeliveryService deliveryService;
@@ -99,6 +102,8 @@
private DictDataService dictDataService;
@Autowired
private DictTypeService dictTypeService;
+ @Autowired
+ private LocItemService locItemService;
/**
@@ -227,8 +232,18 @@
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getPoCode, queryParams.getOrderNo()));
if (Objects.isNull(wkOrders)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ Map<String, Object> map = new HashMap<>();
+ map.put("exceStatus", "-1");
+ return R.ok("鍗曟嵁涓嶅瓨鍦� 锛侊紒").add(map);
}
+
+ AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
+ if (!Objects.isNull(orderLog)) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("exceStatus", "4");
+ return R.ok("鍗曟嵁宸插畬鎴� 锛侊紒").add(map);
+ }
+
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));
WkOrderDto wkorderDto = new WkOrderDto();
@@ -399,67 +414,75 @@
if (Objects.isNull(one)) {
throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
}
- WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
- .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
- if (!Objects.isNull(order)) {
- if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
- order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
- /**鍒犻櫎鍗曟嵁鏄庣粏*/
- asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
- /**鍒犻櫎涓诲崟*/
- asnOrderService.removeById(order.getId());
- } else {
- throw new CoolException("鍗曟嵁宸叉坊鍔狅紝涓嶅彲鎵ц淇敼鎴栨坊鍔犳搷浣滐紒锛�");
+ Loc serviceOne = null;
+ if (!Objects.isNull(syncOrder.getOrgLoc())) {
+ serviceOne = locService.getOne(new LambdaQueryWrapper<Loc>().eq(!Objects.isNull(syncOrder.getOrgLoc()), Loc::getCode, syncOrder.getOrgLoc()));
+ }
+ if (!Objects.isNull(serviceOne)) {
+ //TODO 娣诲姞璋冩嫈绉诲簱鍗曞姛鑳�
+ } else {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
+ .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
+ if (!Objects.isNull(order)) {
+ if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
+ order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
+ /**鍒犻櫎鍗曟嵁鏄庣粏*/
+ asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ /**鍒犻櫎涓诲崟*/
+ asnOrderService.removeById(order.getId());
+ } else {
+ throw new CoolException("鍗曟嵁宸叉坊鍔狅紝涓嶅彲鎵ц淇敼鎴栨坊鍔犳搷浣滐紒锛�");
+ }
}
- }
- String rule = SerialRuleCode.SYS_ASN_ORDER;
- if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
- rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
- }
-
- String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
- wkOrder.setType(syncOrder.getType())
- .setWkType(one.getValue())
- .setAnfme(syncOrder.getAnfme())
- .setPoCode(syncOrder.getOrderNo())
- .setWorkQty(0.0)
- .setQty(0.0)
- .setPoId(syncOrder.getOrderId())
- .setCode(ruleCode)
- .setArrTime(syncOrder.getArrTime())
- .setId(null)
- .setCreateTime(new Date())
- .setUpdateTime(new Date())
- .setCreateBy(loginUserId)
- .setUpdateBy(loginUserId);
-
- if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
- wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
- }
-
- if (!asnOrderService.save(wkOrder)) {
- throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
- }
-
- syncOrder.getOrderItems().forEach(orderItem -> {
- Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
- map.put("orderId", wkOrder.getId());
- map.put("poId", wkOrder.getPoId());
- map.put("poCode", wkOrder.getPoCode());
- map.put("order_code", wkOrder.getCode());
- map.put("matnrCode", orderItem.getMatnr());
-
- if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
- throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ String rule = SerialRuleCode.SYS_ASN_ORDER;
+ if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
+ rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
}
- });
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, wkOrder.getId()));
- double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- wkOrder.setAnfme(sum);
- if (!asnOrderService.updateById(wkOrder)) {
- throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
+ wkOrder.setType(syncOrder.getType())
+ .setWkType(one.getValue())
+ .setAnfme(syncOrder.getAnfme())
+ .setPoCode(syncOrder.getOrderNo())
+ .setWorkQty(0.0)
+ .setQty(0.0)
+ .setPoId(syncOrder.getOrderId())
+ .setCode(ruleCode)
+ .setArrTime(syncOrder.getArrTime())
+ .setId(null)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId);
+
+ if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+ }
+
+ if (!asnOrderService.save(wkOrder)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+
+ syncOrder.getOrderItems().forEach(orderItem -> {
+ Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
+ map.put("orderId", wkOrder.getId());
+ map.put("poId", wkOrder.getPoId());
+ map.put("poCode", wkOrder.getPoCode());
+ map.put("order_code", wkOrder.getCode());
+ map.put("matnrCode", orderItem.getMatnr());
+
+ if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ wkOrder.setAnfme(sum);
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
});
}
@@ -753,9 +776,8 @@
}
/**
- * 鍩虹鐗╂枡淇℃伅鍙樻洿
- * @param baseMatParms
- * @return
+ * 鍩虹鐗╂枡淇℃伅鍙樻洿锛堝鎺ュ崗璁� 8.2锛�
+ * operateType锛�1鏂板 2淇敼 3绂佺敤 4鍚敤锛涗笉浼犳垨 1/2 鏃舵寜鏈夊垯鏇存柊銆佹棤鍒欐柊澧炪��
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -763,6 +785,21 @@
if (StringUtils.isBlank(baseMatParms.getMatnr())) {
throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
+ Integer operateType = baseMatParms.getOperateType();
+ // 3 绂佺敤 / 4 鍚敤锛氫粎鏇存柊鐘舵�侊紙status 1 姝ｅ父 0 鍐荤粨锛�
+ if (Integer.valueOf(3).equals(operateType) || Integer.valueOf(4).equals(operateType)) {
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
+ if (matnr == null) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紝鏃犳硶鎵ц绂佺敤/鍚敤锛侊紒");
+ }
+ int status = Integer.valueOf(4).equals(operateType) ? 1 : 0; // 4 鍚敤=1 姝ｅ父锛�3 绂佺敤=0 鍐荤粨
+ matnr.setStatus(status);
+ if (!matnrService.updateById(matnr)) {
+ throw new CoolException(operateType == 4 ? "鐗╂枡鍚敤澶辫触锛侊紒" : "鐗╂枡绂佺敤澶辫触锛侊紒");
+ }
+ return R.ok();
+ }
+ // 1 鏂板 / 2 淇敼 / 涓嶄紶锛氭湁鍒欐洿鏂般�佹棤鍒欐柊澧�
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
if (Objects.isNull(matnr)) {
Matnr matnr1 = new Matnr();
@@ -799,4 +836,118 @@
return R.ok();
}
+
+ @Override
+ public R inventoryDetails(InventoryDetailsParam param) {
+ LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocItem::getDeleted, 0);
+ if (!Cools.isEmpty(param.getLocId())) {
+ wrapper.eq(LocItem::getLocCode, param.getLocId());
+ }
+ if (!Cools.isEmpty(param.getMatNr())) {
+ wrapper.eq(LocItem::getMatnrCode, param.getMatNr());
+ }
+ if (!Cools.isEmpty(param.getBatch())) {
+ wrapper.eq(LocItem::getBatch, param.getBatch());
+ }
+ if (!Cools.isEmpty(param.getOrderNo())) {
+ wrapper.and(w -> w.eq(LocItem::getPlatOrderCode, param.getOrderNo()).or().eq(LocItem::getPlatWorkCode, param.getOrderNo()));
+ }
+ if (!Cools.isEmpty(param.getPlanNo())) {
+ wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
+ }
+ if (!Cools.isEmpty(param.getWareHouseId())) {
+ Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
+ if (wh != null) {
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
+ if (!locs.isEmpty()) {
+ wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
+ } else {
+ return R.ok().add(Collections.emptyList());
+ }
+ } else {
+ return R.ok().add(Collections.emptyList());
+ }
+ }
+ List<LocItem> list = locItemService.list(wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (LocItem item : list) {
+ Map<String, Object> row = new LinkedHashMap<>();
+ row.put("locId", item.getLocCode());
+ Loc loc = locService.getById(item.getLocId());
+ if (loc != null && loc.getWarehouseId() != null) {
+ Warehouse w = warehouseService.getById(loc.getWarehouseId());
+ row.put("wareHouseId", w != null ? w.getCode() : null);
+ row.put("wareHouseName", w != null ? w.getName() : null);
+ } else {
+ row.put("wareHouseId", null);
+ row.put("wareHouseName", null);
+ }
+ row.put("palletId", item.getTrackCode());
+ row.put("matNr", item.getMatnrCode());
+ row.put("makTx", item.getMaktx());
+ row.put("anfme", item.getAnfme() != null ? item.getAnfme() : 0);
+ row.put("unit", item.getUnit());
+ row.put("status", item.getStatus() != null ? item.getStatus() : 1);
+ row.put("orderType", item.getWkType());
+ row.put("orderNo", item.getPlatOrderCode());
+ row.put("planNo", item.getPlatWorkCode());
+ row.put("batch", item.getBatch());
+ result.add(row);
+ }
+ return R.ok().add(result);
+ }
+
+ @Override
+ public R inventorySummary(InventorySummaryParam param) {
+ LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocItem::getDeleted, 0).select(LocItem::getLocId, LocItem::getMatnrCode, LocItem::getMaktx, LocItem::getAnfme, LocItem::getUnit);
+ if (!Cools.isEmpty(param.getWareHouseId())) {
+ Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
+ if (wh != null) {
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
+ if (!locs.isEmpty()) {
+ wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
+ } else {
+ return R.ok().add(Collections.emptyList());
+ }
+ } else {
+ return R.ok().add(Collections.emptyList());
+ }
+ }
+ if (!Cools.isEmpty(param.getMatNr())) {
+ List<String> matNrs = Arrays.asList(param.getMatNr().split(","));
+ wrapper.in(LocItem::getMatnrCode, matNrs.stream().map(String::trim).collect(Collectors.toList()));
+ }
+ List<LocItem> list = locItemService.list(wrapper);
+ Map<String, Map<String, Object>> sumMap = new LinkedHashMap<>();
+ for (LocItem item : list) {
+ Loc loc = locService.getById(item.getLocId());
+ String whId = null;
+ String whName = null;
+ if (loc != null && loc.getWarehouseId() != null) {
+ Warehouse w = warehouseService.getById(loc.getWarehouseId());
+ whId = w != null ? w.getCode() : null;
+ whName = w != null ? w.getName() : null;
+ }
+ String key = (whId != null ? whId : "") + "|" + (item.getMatnrCode() != null ? item.getMatnrCode() : "");
+ final String finalWhId = whId;
+ final String finalWhName = whName;
+ sumMap.compute(key, (k, v) -> {
+ if (v == null) {
+ v = new LinkedHashMap<>();
+ v.put("wareHouseId", finalWhId);
+ v.put("wareHouseName", finalWhName);
+ v.put("matNr", item.getMatnrCode());
+ v.put("matTx", item.getMaktx());
+ v.put("anfme", (item.getAnfme() != null ? item.getAnfme() : 0));
+ v.put("unit", item.getUnit());
+ } else {
+ v.put("anfme", ((Number) v.get("anfme")).doubleValue() + (item.getAnfme() != null ? item.getAnfme() : 0));
+ }
+ return v;
+ });
+ }
+ return R.ok().add(new ArrayList<>(sumMap.values()));
+ }
}
--
Gitblit v1.9.1