From 2fa1c824c63048b49e45d867191ab3645aeaf3a4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 09:54:40 +0800
Subject: [PATCH] 补充收货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 276 +++++++++++++++++++++---------------------------------
1 files changed, 109 insertions(+), 167 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 2b0cb04..87f6f43 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
@@ -23,8 +23,8 @@
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
-import com.vincent.rsf.server.manager.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.schedules.ScheduleJobs;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -123,7 +123,11 @@
@Autowired
private TaskService taskService;
@Autowired
- private MatnrMapper matnrMapper;
+ private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
+ @Autowired
+ private ScheduleJobs scheduleJobs;
+ @Autowired
+ private OutStockService outStockService;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -169,156 +173,8 @@
assertWkOrderExceStatusUnexecuted(order, "鍙栨秷");
}
- private CusItemSyncMode resolveCusItemSyncMode() {
- Config c = configService.getOne(new LambdaQueryWrapper<Config>()
- .eq(Config::getFlag, GlobalConfigCode.CUS_ITEM_SYNC_MODE)
- .eq(Config::getDeleted, 0), false);
- if (c == null) {
- return CusItemSyncMode.NONE;
- }
- return CusItemSyncMode.fromConfig(c.getVal());
- }
-
- private static Map<String, SyncOrdersItem> buildOrderItemByMatnrCode(List<SyncOrdersItem> orderItems) {
- Map<String, SyncOrdersItem> map = new LinkedHashMap<>();
- if (orderItems == null) {
- return map;
- }
- for (SyncOrdersItem item : orderItems) {
- if (StringUtils.isBlank(item.getMatnr())) {
- continue;
- }
- map.putIfAbsent(item.getMatnr().trim(), item);
- }
- return map;
- }
-
- /**
- * 鎸夎鍥捐鏇存柊/鎻掑叆鐗╂枡涓绘暟鎹紙涓庨�氱煡妗ｆ棤鍏筹級銆�
- */
- private void applyCusItemViewRowsToMatnr(List<Map<String, Object>> viewItems, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
- if (viewItems == null || viewItems.isEmpty()) {
- return;
- }
- for (Map<String, Object> row : viewItems) {
- String itemNo = StringUtils.trimToNull(Objects.toString(row.get("item_no"), null));
- if (itemNo == null) {
- continue;
- }
- SyncOrdersItem syncItem = orderItemByCode.get(itemNo);
- String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
- String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
- String incomingName = syncItem == null ? null : StringUtils.trimToNull(syncItem.getMaktx());
- Matnr local = matnrService.getOneByCodeAndBatch(itemNo, "");
- if (local == null) {
- Matnr matnr = new Matnr();
- matnr.setCode(itemNo)
- .setBatch("")
- .setName(incomingName != null ? incomingName : itemNo)
- .setSpec(viewSpec)
- .setUnit(viewUnit)
- .setStockUnit(viewUnit)
- .setStatus(1)
- .setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setCreateTime(new Date())
- .setUpdateTime(new Date());
- matnrService.save(matnr);
- continue;
- }
- boolean nameDiff = incomingName != null
- && !StringUtils.equals(StringUtils.trimToEmpty(local.getName()), incomingName);
- boolean specDiff = !StringUtils.equals(StringUtils.trimToEmpty(local.getSpec()), viewSpec);
- boolean unitDiff = viewUnit != null
- && (!StringUtils.equals(StringUtils.trimToEmpty(local.getUnit()), viewUnit)
- || !StringUtils.equals(StringUtils.trimToEmpty(local.getStockUnit()), viewUnit));
- if (!nameDiff && !specDiff && !unitDiff) {
- continue;
- }
- Matnr update = new Matnr();
- update.setId(local.getId());
- if (nameDiff) {
- update.setName(incomingName);
- }
- if (specDiff) {
- update.setSpec(viewSpec);
- }
- if (unitDiff) {
- update.setUnit(viewUnit).setStockUnit(viewUnit);
- }
- update.setUpdateBy(loginUserId).setUpdateTime(new Date());
- matnrService.updateById(update);
- }
- }
-
- /**
- * 鎸夐厤缃鐞嗚鍥句笌鐗╂枡琛ㄣ��
- */
private void syncMatnrFromCusItemSyncViewByConfig(List<SyncOrdersItem> orderItems, Long loginUserId) {
- if (orderItems == null || orderItems.isEmpty()) {
- return;
- }
- List<String> matnrCodes = orderItems.stream()
- .map(SyncOrdersItem::getMatnr)
- .filter(StringUtils::isNotBlank)
- .map(String::trim)
- .distinct()
- .collect(Collectors.toList());
- if (matnrCodes.isEmpty()) {
- return;
- }
- CusItemSyncMode mode = resolveCusItemSyncMode();
- Map<String, SyncOrdersItem> orderItemByCode = buildOrderItemByMatnrCode(orderItems);
-
- if (mode == CusItemSyncMode.NONE) {
- syncMatnrNonForceFromView(matnrCodes, orderItemByCode, loginUserId);
- return;
- }
-
- List<Map<String, Object>> viewItems = matnrMapper.selectByCusItemSyncView(matnrCodes);
- Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
- .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
-
- for (String code : matnrCodes) {
- if (!inView.contains(code)) {
- throw new CoolException("鐗╂枡鏈湪瑙嗗浘 cus_item_sync_view 涓細" + code);
- }
- }
- applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
- }
-
- /**
- * 涓嶅己鍒讹細瑙嗗浘鑳芥煡鍒板垯鏂板/鏇存柊鐗╂枡琛紱鏌ヤ笉鍒扮殑缂栫爜鍐嶆煡鐗╂枡琛紝瀛樺湪鍒欐斁琛屻��
- */
- private void syncMatnrNonForceFromView(List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
- List<Map<String, Object>> viewItems = null;
- try {
- viewItems = matnrMapper.selectByCusItemSyncView(matnrCodes);
- } catch (Exception ex) {
- log.warn("鏌ヨ cus_item_sync_view 澶辫触锛屽皢浠呮寜鐗╂枡琛ㄦ牎楠岋細{}", ex.getMessage());
- }
- Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
- .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
- if (viewItems != null && !viewItems.isEmpty()) {
- try {
- applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
- } catch (Exception ex) {
- log.warn("鎸夎鍥惧啓鍏ョ墿鏂欎富鏁版嵁澶辫触锛歿}", ex.getMessage());
- }
- }
- for (String code : matnrCodes) {
- if (inView.contains(code)) {
- continue;
- }
- Matnr m = matnrService.getOneByCodeAndBatch(code, "");
- if (m == null) {
- throw new CoolException("瑙嗗浘鏃犺鐗╂枡涓旂墿鏂欒〃涓嶅瓨鍦細" + code);
- }
- }
+ cusBarcodeSyncMatnrService.syncFromOrderItems(orderItems, loginUserId);
}
/**
@@ -494,7 +350,9 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
- IPage<LocStockDto> locStocks = locService.getLocDetls(page);
+ BaseParam bp = pageParam.getWhere();
+ Map<String, Object> conds = bp != null && bp.getMap() != null ? bp.getMap() : Collections.emptyMap();
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page, conds);
return R.ok().add(locStocks);
}
@@ -698,10 +556,11 @@
.eq(WkOrder::getPoCode, syncOrder.getOrderInternalCode()));
if (!Objects.isNull(order)) {
assertWkOrderNoLinkedTask(order.getId());
- assertWkOrderExceStatusUnexecuted(order, "淇敼");
long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
if (pakinCount > 0) {
+ // 宸茬粍鎵樻椂浠嶆寜鍘熻鍒欓檺鍒讹細浠呮湭鎵ц鐘舵�佸彲鏀瑰崟
+ assertWkOrderExceStatusUnexecuted(order, "淇敼");
String changeSummary = computeWkOrderModifyChangeSummaryOrNull(order, syncOrder, resolvedOrderType, typeCode, true);
if (changeSummary == null) {
return "淇敼鏃犲彉鍖�";
@@ -716,7 +575,9 @@
if (changeSummary == null) {
return "淇敼鏃犲彉鍖�";
}
- updateOrderNoPakin(order, syncOrder, loginUserId);
+ // 鏈粍鎵樻椂鍏佽宸叉敹璐ф敼鍗曪紱鑷姩鏀惰揣鍦烘櫙涓嬪悓姝ヨ瀹屾垚鏁伴噺璺熻鍒掓暟閲忎竴鑷�
+ boolean alignQtyWithPlan = Objects.equals(order.getExceStatus(), AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val);
+ updateOrderNoPakin(order, syncOrder, loginUserId, alignQtyWithPlan);
if (isDirectWaitPakin()) {
syncReceiptAreaByOrder(order.getId());
}
@@ -774,7 +635,64 @@
if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
}
+ directReceiptInboundAfterCloudSync(wkOrder, loginUserId);
return "Success";
+ }
+
+ /**
+ * DirectWaitPakin 寮�鍚椂锛屼簯浠撴柊澧炲叆搴撻�氱煡鍗曟垚鍔熷悗绔嬪嵆鍐欏叆鏀惰揣鍖猴紝骞跺皢瀹屾垚鏁伴噺涓庤鍒掓暟瀵归綈锛堜笌 {@link ScheduleJobs#IgnoreReceipt} 涓�鑷达紝閬垮厤浠呬緷璧栧畾鏃朵换鍔″欢杩燂級銆�
+ */
+ private void directReceiptInboundAfterCloudSync(WkOrder wkOrder, Long loginUserId) {
+ if (!isDirectWaitPakin() || wkOrder == null || wkOrder.getId() == null) {
+ return;
+ }
+ if (!OrderType.ORDER_IN.type.equals(wkOrder.getType())) {
+ return;
+ }
+ if (OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type.equals(wkOrder.getWkType())) {
+ WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getPoId, wkOrder.getPoId())
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
+ if (one == null || !Objects.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val, one.getExceStatus())) {
+ return;
+ }
+ }
+ WarehouseAreas receiptArea = warehouseAreasService.getOne(
+ new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
+ if (receiptArea == null) {
+ log.warn("directReceiptInboundAfterCloudSync: 鏈厤缃敹璐у尯锛岃烦杩� orderId={}", wkOrder.getId());
+ return;
+ }
+ List<WkOrderItem> orderItems = asnOrderItemService.list(
+ new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ if (orderItems.isEmpty()) {
+ return;
+ }
+ for (WkOrderItem item : orderItems) {
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
+ if (matnr == null) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦細" + item.getMatnrCode());
+ }
+ try {
+ scheduleJobs.updateReceipt(receiptArea, item, wkOrder, matnr);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .set(WkOrderItem::getQty, item.getAnfme())
+ .eq(WkOrderItem::getId, item.getId()))) {
+ throw new CoolException("鏀惰揣鍗曟槑缁嗗畬鎴愭暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getQty, wkOrder.getAnfme())
+ .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+ .set(WkOrder::getUpdateBy, loginUserId)
+ .set(WkOrder::getUpdateTime, new Date())
+ .eq(WkOrder::getId, wkOrder.getId()))) {
+ throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
}
/** 涓� updateOrderNoPakin / mergeOrderWithPakin 鍐欏叆瑙勫垯涓�鑷达紱鏃犳湁鏁堝彉鏇存椂杩斿洖 null */
@@ -1030,7 +948,7 @@
/**
* 鏈粍鎵樺崟鎹殑淇敼锛氬湪鍘熷崟涓婃洿鏂颁富鍗�+鏄庣粏锛堟寜 lineId 鍖归厤锛夛紝淇濈暀 exceStatus銆乹ty銆亀orkQty锛岄伩鍏嶅垹鍗曢噸寤哄鑷村畾鏃朵换鍔″啀娆℃墽琛屻��
*/
- private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId) {
+ private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId, boolean alignQtyWithPlan) {
if (syncOrder.getOrderItems() == null || syncOrder.getOrderItems().isEmpty()) {
throw new CoolException("淇敼鏃舵槑缁嗕笉鑳戒负绌猴紒锛�");
}
@@ -1070,7 +988,9 @@
SyncOrdersItem inc = incomingByLineId.get(lineId);
Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme());
existing.setAnfme(newAnfme);
- if (inc.getQty() != null) {
+ if (alignQtyWithPlan) {
+ existing.setQty(newAnfme);
+ } else if (inc.getQty() != null) {
existing.setQty(QuantityUtils.roundToScale(inc.getQty()));
} else {
Double curQty = existing.getQty() != null ? existing.getQty() : 0.0;
@@ -1101,6 +1021,9 @@
map.put("order_code", order.getCode());
map.put("matnrCode", e.getValue().getMatnr());
map.put("platItemId", e.getKey());
+ if (alignQtyWithPlan) {
+ map.put("qty", e.getValue().getAnfme());
+ }
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -1109,9 +1032,13 @@
Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))
.stream().mapToDouble(WkOrderItem::getAnfme).sum());
order.setAnfme(sum);
- List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
- double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
- order.setQty(QuantityUtils.roundToScale(qtySum));
+ if (alignQtyWithPlan) {
+ order.setQty(sum);
+ } else {
+ List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
+ order.setQty(QuantityUtils.roundToScale(qtySum));
+ }
asnOrderService.updateById(order);
}
@@ -1553,18 +1480,32 @@
if (!Cools.isEmpty(param.getPlanNo())) {
wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
}
+ // 浠撳簱銆佹枡绠辩爜鎸夊簱浣� id 浜ら泦杩囨护
+ List<Long> allowedLocIds = null;
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 {
+ if (wh == null) {
return R.ok().add(Collections.emptyList());
}
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (!Cools.isEmpty(param.getBarcode())) {
+ LambdaQueryWrapper<Loc> lw = new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, param.getBarcode());
+ if (allowedLocIds != null) {
+ lw.in(Loc::getId, allowedLocIds);
+ }
+ List<Loc> locs = locService.list(lw);
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (allowedLocIds != null) {
+ wrapper.in(LocItem::getLocId, allowedLocIds);
}
List<LocItem> list = locItemService.list(wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -1580,6 +1521,7 @@
row.put("wareHouseId", null);
row.put("wareHouseName", null);
}
+ row.put("barcode", loc != null ? loc.getBarcode() : null);
row.put("palletId", item.getTrackCode());
row.put("matNr", item.getMatnrCode());
row.put("makTx", item.getMaktx());
--
Gitblit v1.9.1