From a56420ff2042a3f6b1e824341a717a28c692cad4 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 30 一月 2026 16:39:15 +0800
Subject: [PATCH] 查询库存明细
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 311 insertions(+), 16 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 cdbe0d6..8e1fe0c 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
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
+import com.vincent.rsf.server.api.utils.TimeConverterUtils;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
@@ -45,6 +46,8 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+
+import static com.vincent.rsf.server.manager.enums.OrderWorkType.*;
/**
* @author Ryan
@@ -107,6 +110,8 @@
private WaitPakinService waitPakinService;
@Autowired
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
+ @Autowired
+ private LocItemService locItemService;
/**
@@ -417,7 +422,7 @@
if (Objects.isNull(one)) {
throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
}
- WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ 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)) {
@@ -438,7 +443,7 @@
//閾跺骇鐗逛緵
String orderNs = null;
- if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE) ){
+ if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE)) {
StringBuffer buffer = new StringBuffer();
Object poCode = syncOrder.getOrderNo();
orderNs = poCode == null ? "" : buffer.append(poCode).toString();
@@ -448,18 +453,19 @@
.setWkType(one.getValue())
.setAnfme(syncOrder.getAnfme())
.setPoCode(syncOrder.getOrderNo())
- .setWorkQty(0.0)
- .setQty(0.0)
+ .setWorkQty(0.0)//鎵ц鏁伴噺
+ .setQty(0.0)//瀹屾垚鏁伴噺
.setPoId(syncOrder.getOrderInternalCode())
.setCode(ruleCode)
.setArrTime(syncOrder.getArrTime())
.setId(null)
- .setCreateTime(new Date())
+ .setCreateTime(new TimeConverterUtils().timestampToDate(syncOrder.getCreateTime()))
+ .setBusinessTime(new TimeConverterUtils().timestampToDate(syncOrder.getBusinessTime()))
.setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
- if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
+ if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
}
if (!asnOrderService.save(wkOrder)) {
@@ -467,10 +473,10 @@
}
AtomicReference<String> palletId = new AtomicReference<>();
syncOrder.getOrderItems().forEach(orderItem -> {
- if (Cools.isEmpty(palletId.get())){
+ if (Cools.isEmpty(palletId.get())) {
palletId.set(orderItem.getPalletId());
} else {
- if (!palletId.get().equals(orderItem.getPalletId())){
+ if (!palletId.get().equals(orderItem.getPalletId())) {
throw new CoolException("鍚屼竴涓崟鎹槑缁嗕腑鐨勬墭鐩樼爜蹇呴』涓�鑷达紒锛侊紒");
}
}
@@ -488,6 +494,22 @@
map.put("model", orderItem.getModel());
map.put("stockUnit", orderItem.getUnit());
map.put("purUnit", orderItem.getUnit());
+ map.put("baseUnit", orderItem.getBaseUnitId());
+ map.put("useOrgId", orderItem.getUseOrgId());
+ map.put("useOrgName", orderItem.getUseOrgName());
+ map.put("erpClsId", orderItem.getErpClsId());
+ map.put("priceUnitId", orderItem.getPriceUnitId());
+ map.put("inStockType", orderItem.getInStockType());
+ map.put("ownerTypeId", orderItem.getOwnerTypeId());
+ map.put("ownerId", orderItem.getOwnerId());
+ map.put("ownerName", orderItem.getOwnerName());
+ map.put("keeperTypeId", orderItem.getKeeperTypeId());
+ map.put("keeperId", orderItem.getKeeperId());
+ map.put("keeperName", orderItem.getKeeperName());
+ map.put("targetWarehouseId", orderItem.getTargetWarehouseId());
+ map.put("sourceWarehouseId", orderItem.getSourceWarehouseId());
+ map.put("createBy", loginUserId);
+ map.put("updateBy", loginUserId);
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -506,13 +528,18 @@
//缁勬墭
WaitPakinParam pakinParam = new WaitPakinParam();
pakinParam.setBarcode(palletId.get());
- CompletableFuture.runAsync(() -> {
- try {
- asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
- } catch (Exception e) {
- log.warn("璁㈠崟 {} 寮�濮嬭嚜鍔ㄧ粍鎵�", syncOrder.getOrderNo());
- }
- });
+ pakinParam.setStaNo(syncOrder.getStationId());
+
+ boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
+ if (itemsCheck) {
+ CompletableFuture.runAsync(() -> {
+ try {
+ asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
+ } catch (Exception e) {
+ log.warn("璁㈠崟 {} 寮�濮嬭嚜鍔ㄧ粍鎵�", syncOrder.getOrderNo());
+ }
+ });
+ }
}
});
}
@@ -526,7 +553,7 @@
int i = 0;
while (true) {
i++;
- if (i>5) return;
+ if (i > 5) return;
Thread.sleep(3000);
List<WarehouseAreasItem> list = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
.eq(WarehouseAreasItem::getAsnCode, orderNo));
@@ -552,6 +579,7 @@
log.error("璁㈠崟 {} 鑷姩缁勬墭澶辫触: {}", orderNo, e.getMessage(), e);
}
}
+
/**
* @author Ryan
* @date 2025/8/19
@@ -840,6 +868,7 @@
/**
* 鍩虹鐗╂枡淇℃伅鍙樻洿
+ *
* @param baseMatParms
* @return
*/
@@ -885,4 +914,270 @@
return R.ok();
}
+
+ /**
+ * 搴撳瓨鏌ヨ鏄庣粏锛堜緵open-api璋冪敤锛�
+ *
+ * @param condition 鏌ヨ鏉′欢瀹炰綋绫�
+ * @return 搴撳瓨鏄庣粏鍒楄〃
+ */
+ @Override
+ public R erpQueryInventoryDetails(InventoryQueryConditionParam condition) {
+ try {
+ // 鍙傛暟楠岃瘉
+ if (condition == null) {
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖");
+ }
+
+ // 灏咵RP鍙傛暟鏄犲皠涓篔ava瀹炰綋瀛楁鍚嶏紙椹煎嘲鏍煎紡锛夛紝PageParam浼氳嚜鍔ㄨ浆鎹负鏁版嵁搴撳瓧娈靛悕锛堜笅鍒掔嚎鏍煎紡锛�
+ Map<String, Object> queryMap = new HashMap<>();
+
+ // 浠庡疄浣撶被涓彁鍙栨煡璇㈡潯浠讹紝鏄犲皠涓烘暟鎹簱瀛楁鍚�
+ if (StringUtils.isNotBlank(condition.getLocId())) {
+ queryMap.put("locCode", condition.getLocId());
+ }
+ if (StringUtils.isNotBlank(condition.getMatNr())) {
+ queryMap.put("matnrCode", condition.getMatNr());
+ }
+ if (StringUtils.isNotBlank(condition.getPlanNo())) {
+ queryMap.put("trackCode", condition.getPlanNo());
+ }
+ if (StringUtils.isNotBlank(condition.getBatch())) {
+ queryMap.put("batch", condition.getBatch());
+ }
+
+ BaseParam baseParam = new BaseParam();
+ baseParam.syncMap(queryMap);
+ PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
+
+ QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(false);
+
+ // 璁㈠崟鍙�/宸ュ崟鍙�/MES宸ュ崟鍙�
+ if (StringUtils.isNotBlank(condition.getOrderNo())) {
+ String orderNo = condition.getOrderNo();
+ wrapper.and(w -> w.eq("plat_order_code", orderNo)
+ .or().eq("plat_work_code", orderNo));
+ }
+
+ // 鐗╂枡缁勶紙闇�瑕侀�氳繃鐗╂枡琛ㄥ叧鑱旀煡璇級
+ if (StringUtils.isNotBlank(condition.getMatGroup())) {
+ // 璋冪敤鐗╂枡Service鏌ヨ鐗╂枡缁勫搴旂殑鐗╂枡ID鍒楄〃锛堝鐢ㄥ凡鏈夋柟娉曪級
+ LambdaQueryWrapper<Matnr> matnrWrapper = new LambdaQueryWrapper<>();
+ matnrWrapper.eq(Matnr::getGroupId, condition.getMatGroup());
+ List<Matnr> matnrs = matnrService.list(matnrWrapper);
+ if (!matnrs.isEmpty()) {
+ List<Long> matnrIds = matnrs.stream().map(Matnr::getId).collect(Collectors.toList());
+ wrapper.in("matnr_id", matnrIds);
+ } else {
+ // 濡傛灉娌℃湁鎵惧埌鐗╂枡锛岃繑鍥炵┖缁撴灉
+ return R.ok().add(new ArrayList<>());
+ }
+ }
+
+ // 鍙煡璇㈡甯哥姸鎬佺殑搴撳瓨锛坰tatus=1琛ㄧず姝ｅ父锛�
+ wrapper.eq("status", 1);
+
+ pageParam.setCurrent(1);
+ pageParam.setSize(Integer.MAX_VALUE);
+ PageParam<LocItem, BaseParam> pageResult = locItemService.page(pageParam, wrapper);
+ List<LocItem> locItems = pageResult.getRecords();
+
+ if (locItems.isEmpty()) {
+ return R.ok().add(new ArrayList<>());
+ }
+
+ // 鑾峰彇鎵�鏈夐渶瑕佸叧鑱旂殑ID
+ List<Long> locIds = locItems.stream()
+ .map(LocItem::getLocId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+
+ List<Long> warehouseIds = new ArrayList<>();
+ List<Long> orderIds = locItems.stream()
+ .map(LocItem::getOrderId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+
+ // 璋冪敤LocService鏌ヨ搴撲綅淇℃伅锛堝鐢⊿ervice灞傛柟娉曪級
+ Map<Long, Loc> locMap = new HashMap<>();
+ if (!locIds.isEmpty()) {
+ List<Loc> locs = locService.listByIds(locIds);
+ locMap = locs.stream().collect(Collectors.toMap(Loc::getId, loc -> loc));
+
+ // 鏀堕泦浠撳簱ID
+ warehouseIds = locs.stream()
+ .map(Loc::getWarehouseId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ // 浠撳簱缂栫爜杩囨护
+ if (StringUtils.isNotBlank(condition.getWareHouseId())) {
+ String wareHouseId = condition.getWareHouseId();
+ LambdaQueryWrapper<Warehouse> whWrapper = new LambdaQueryWrapper<>();
+ whWrapper.eq(Warehouse::getCode, wareHouseId);
+ // 璋冪敤WarehouseService鏌ヨ浠撳簱淇℃伅锛堝鐢⊿ervice灞傛柟娉曪級
+ List<Warehouse> warehouses = warehouseService.list(whWrapper);
+ if (!warehouses.isEmpty()) {
+ Long targetWarehouseId = warehouses.get(0).getId();
+ // 杩囨护搴撲綅锛屽彧淇濈暀鐩爣浠撳簱鐨勫簱浣�
+ locMap = locMap.entrySet().stream()
+ .filter(entry -> Objects.equals(entry.getValue().getWarehouseId(), targetWarehouseId))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+ // 杩囨护locItems锛屽彧淇濈暀鐩爣浠撳簱鐨�
+ Set<Long> validLocIds = locMap.keySet();
+ locItems = locItems.stream()
+ .filter(item -> item.getLocId() != null && validLocIds.contains(item.getLocId()))
+ .collect(Collectors.toList());
+
+ warehouseIds = Collections.singletonList(targetWarehouseId);
+ } else {
+ return R.ok().add(new ArrayList<>());
+ }
+ }
+
+ // 璋冪敤WarehouseService鏌ヨ浠撳簱淇℃伅锛堝鐢⊿ervice灞傛柟娉曪級
+ Map<Long, Warehouse> warehouseMap = new HashMap<>();
+ if (!warehouseIds.isEmpty()) {
+ List<Warehouse> warehouses = warehouseService.listByIds(warehouseIds);
+ warehouseMap = warehouses.stream().collect(Collectors.toMap(Warehouse::getId, wh -> wh));
+ }
+
+ // 璋冪敤AsnOrderService鏌ヨ璁㈠崟淇℃伅锛堝鐢⊿ervice灞傛柟娉曪級
+ Map<Long, WkOrder> orderMap = new HashMap<>();
+ if (!orderIds.isEmpty()) {
+ List<WkOrder> orders = asnOrderService.listByIds(orderIds);
+ orderMap = orders.stream().collect(Collectors.toMap(WkOrder::getId, order -> order));
+ }
+
+ // 杞崲缁撴灉
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (LocItem locItem : locItems) {
+ Map<String, Object> details = convertToInventoryDetails(locItem, locMap, warehouseMap, orderMap);
+ if (details != null) {
+ result.add(details);
+ }
+ }
+
+ return R.ok().add(result);
+ } catch (Exception e) {
+ log.error("搴撳瓨鏌ヨ鏄庣粏澶辫触", e);
+ return R.error("鏌ヨ澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 杞崲涓哄簱瀛樻槑缁嗗璞�
+ */
+ private Map<String, Object> convertToInventoryDetails(LocItem locItem, Map<Long, Loc> locMap,
+ Map<Long, Warehouse> warehouseMap,
+ Map<Long, WkOrder> orderMap) {
+ Map<String, Object> details = new HashMap<>();
+
+ // 搴撲綅缂栫爜
+ details.put("locId", locItem.getLocCode());
+
+ // 浠撳簱淇℃伅
+ Loc loc = null;
+ if (locItem.getLocId() != null) {
+ loc = locMap.get(locItem.getLocId());
+ }
+
+ if (loc != null) {
+ // 鎵樼洏鐮侊紙浠庡簱浣嶇殑barcode鑾峰彇锛�
+ details.put("palletId", loc.getBarcode());
+
+ // 浠撳簱淇℃伅
+ if (loc.getWarehouseId() != null && warehouseMap.containsKey(loc.getWarehouseId())) {
+ Warehouse warehouse = warehouseMap.get(loc.getWarehouseId());
+ if (warehouse != null) {
+ details.put("wareHouseId", warehouse.getCode());
+ details.put("wareHouseName", warehouse.getName());
+ }
+ }
+ }
+
+ // 鐗╂枡淇℃伅
+ details.put("matNr", locItem.getMatnrCode());
+ details.put("makTx", locItem.getMaktx());
+ details.put("spec", locItem.getSpec());
+ details.put("anfme", locItem.getAnfme());
+ details.put("unit", locItem.getUnit());
+
+ // 搴撳瓨鐘舵�侊細1-姝ｅ父(鍙敤)锛�0-鍐荤粨
+ if (locItem.getStatus() != null) {
+ details.put("status", locItem.getStatus() == 1 ? "鍙敤" : "鍐荤粨");
+ }
+
+ // 鎵规鍙�
+ details.put("batch", locItem.getBatch());
+
+ // 璁″垝璺熻釜鍙�
+ details.put("planNo", locItem.getTrackCode());
+
+ // 璁㈠崟淇℃伅
+ if (locItem.getOrderId() != null && orderMap.containsKey(locItem.getOrderId())) {
+ WkOrder order = orderMap.get(locItem.getOrderId());
+ if (order != null) {
+ // 璁㈠崟鍙�
+ details.put("orderNo", order.getCode());
+ details.put("orderType", null);
+ // 璁㈠崟绫诲瀷锛�1-鍑哄簱鍗曪紝2-鍏ュ簱鍗曪紝3-璋冩嫈鍗�
+ // 瀛楃涓茬被鍨嬫槧灏勶細out->1(鍑哄簱鍗�), in->2(鍏ュ簱鍗�), revise->(璋冩嫈鍗�), check->(鐩樼偣鍗�))
+ if (StringUtils.isNotBlank(order.getType())) {
+ String orderTypeStr = order.getType().toLowerCase().trim();
+ switch (orderTypeStr) {
+ case "out":
+ details.put("orderType", 1);
+ break;
+ case "in":
+ details.put("orderType", 2);
+ break;
+ case "revise":
+ break;
+ case "check":
+ break;
+ default:
+ break;
+ }
+
+ //鍖呭惈 澶囨枡鍗曞叧閿瘝灏卞彉鎴�3
+ if (StringUtils.isNotBlank(order.getWkType())) {
+ String workDesc = getWorkDesc(order.getWkType());
+ if (workDesc != null && workDesc.contains("澶囨枡鍗�")) {
+ details.put("orderType", 3);
+ }
+ }
+ }
+
+ // 澶囨枡绫诲瀷锛氭牴鎹笟鍔＄被鍨嬪垽鏂�
+ // 姝ｅ父棰嗘枡(1)锛岀敓浜цˉ鏂�(2)
+ details.put("prepareType", 1);
+ if (StringUtils.isNotBlank(order.getWkType())) {
+ String workDesc = getWorkDesc(order.getWkType());
+ if (workDesc != null && workDesc.contains("鐢熶骇琛ユ枡")) {
+ details.put("prepareType", 2);
+ }
+ }
+ }
+ }
+
+ // 濡傛灉璁㈠崟鍙蜂负绌猴紝灏濊瘯浠巔latOrderCode鎴杙latWorkCode鑾峰彇
+ if (!details.containsKey("orderNo") || details.get("orderNo") == null) {
+ if (StringUtils.isNotBlank(locItem.getPlatOrderCode())) {
+ details.put("orderNo", locItem.getPlatOrderCode());
+ } else if (StringUtils.isNotBlank(locItem.getPlatWorkCode())) {
+ details.put("orderNo", locItem.getPlatWorkCode());
+ }
+ }
+
+ // 搴撳瓨缁勭粐锛堜粠useOrgId鑾峰彇锛�
+ details.put("stockOrgId", locItem.getUseOrgId());
+
+ return details;
+ }
}
--
Gitblit v1.9.1