From b003a49794f49a329e2702918ecfc8d14b371d0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 04 三月 2026 14:51:25 +0800
Subject: [PATCH] 云仓WMS接口流程
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 589 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 508 insertions(+), 81 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 21cd108..ca580c6 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.*;
@@ -18,6 +19,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
@@ -68,6 +70,8 @@
@Autowired
private AsnOrderService asnOrderService;
@Autowired
+ private AsnOrderLogService asnOrderLogService;
+ @Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
private DeliveryService deliveryService;
@@ -75,6 +79,10 @@
private DeliveryItemService deliveryItemService;
@Autowired
private LocService locService;
+ @Autowired
+ private OrderWorkTypeService orderWorkTypeService;
+ @Autowired
+ private OrderTypeDictService orderTypeDictService;
@Autowired
private WarehouseAreasService warehouseAreasService;
@Autowired
@@ -99,6 +107,12 @@
private DictDataService dictDataService;
@Autowired
private DictTypeService dictTypeService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WarehouseAreasItemService warehouseAreasItemService;
/**
@@ -225,11 +239,20 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getCode, queryParams.getOrderNo())
- .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
+ .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();
@@ -394,73 +417,323 @@
public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
if (!syncOrders.isEmpty()) {
syncOrders.forEach(syncOrder -> {
+ if (StringUtils.isBlank(syncOrder.getOrderInternalCode())) {
+ throw new CoolException("鍗曟嵁鍐呯爜涓嶈兘涓虹┖锛侊紒");
+ }
+ // 鏄庣粏 lineId锛堝搴� platItemId锛変笉鑳戒负绌猴紝涓斿悓涓�璁㈠崟鍐呬笉鑳介噸澶�
+ if (syncOrder.getOrderItems() != null) {
+ Set<String> lineIds = new HashSet<>();
+ for (SyncOrdersItem item : syncOrder.getOrderItems()) {
+ if (StringUtils.isBlank(item.getPlatItemId())) {
+ throw new CoolException("鏄庣粏 lineId 涓嶈兘涓虹┖锛侊紒");
+ }
+ String lineId = item.getPlatItemId().trim();
+ if (!lineIds.add(lineId)) {
+ throw new CoolException("鍚屼竴璁㈠崟鍐呮槑缁� lineId 涓嶈兘閲嶅锛�" + lineId);
+ }
+ }
+ }
WkOrder wkOrder = new WkOrder();
- DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
- .eq(DictData::getValue, syncOrder.getWkType()), false);
- if (Objects.isNull(one)) {
+ // 鍏煎 wkType 浼犳暟瀛楋紙绫诲瀷鐮侊級鎴栦腑鏂囷紙鏄剧ず鍚嶏級锛氬厛鎸� label 鍙嶆煡 type锛屽惁鍒欐寜鍘熷�煎綋 type
+ String wkTypeInput = syncOrder.getWkType();
+ String typeCode = StringUtils.isBlank(wkTypeInput) ? null : orderWorkTypeService.getTypeByLabel(wkTypeInput);
+ if (typeCode == null) {
+ typeCode = wkTypeInput;
+ }
+ if (StringUtils.isBlank(typeCode) || orderWorkTypeService.getLabelByType(typeCode) == null) {
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("鍗曟嵁宸叉坊鍔狅紝涓嶅彲鎵ц淇敼鎴栨坊鍔犳搷浣滐紒锛�");
+ // 璁㈠崟绫诲瀷锛氭敮鎸佹暟瀛� 1/2/3銆佷腑鏂囥�屽嚭搴撳崟銆�/銆屽叆搴撳崟銆�/銆岃皟鎷ㄥ崟銆嶆垨鍐呴儴鐮� out/in/transfer锛堟潵鑷瓧鍏革級
+ String typeInput = syncOrder.getType();
+ String resolvedOrderType = orderTypeDictService.resolveType(typeInput);
+ if (typeInput != null && !typeInput.trim().isEmpty() && resolvedOrderType == null) {
+ throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 璁㈠崟绫诲瀷涓嶅瓨鍦紒锛�");
+ }
+ 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 {
+ // operateType=2 瀛樺湪鍒欎慨鏀广�佷笉瀛樺湪鍒欐姤閿欙紱operateType=1 瀛樺湪鍒欎慨鏀广�佷笉瀛樺湪鍒欐柊澧�
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getPoCode, syncOrder.getOrderInternalCode()));
+ if (!Objects.isNull(order)) {
+ // 浠呮湭鎵ц鐘舵�佸彲琚� order/add 淇敼锛堝叆搴撴湭鎵ц銆佸嚭搴撲换鍔″垵濮嬶級
+ List<Short> editableStatus = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+ if (!editableStatus.contains(order.getExceStatus())) {
+ throw new CoolException("浠呮湭鎵ц鐘舵�佺殑鍗曟嵁鍙慨鏀癸紒锛�");
+ }
+ // 瀛樺湪鍒欎慨鏀癸紙1 鍜� 2 鍧囪蛋姝ゅ锛夛紝缁勬墭鏍￠獙鍦� mergeOrderWithPakin/updateOrderNoPakin 鍐�
+ long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getAsnId, order.getId()));
+ if (pakinCount > 0) {
+ // 宸茬粍鎵橈細鎸� lineId锛坧latItemId锛夊悎骞讹紝鏍￠獙鏁伴噺涓庡垹闄�
+ mergeOrderWithPakin(order, syncOrder, resolvedOrderType, typeCode, loginUserId);
+ // 鏀惰揣鍖哄凡鍋滅敤 // syncReceiptAreaByOrder(order.getId());
+ return; // 鏈崟宸插鐞嗭紝璺宠繃涓嬫柟鈥滄柊寤轰富鍗�+鏄庣粏鈥�
+ }
+ // 鏈粍鎵橈細鍦ㄥ師鍗曚笂鏇存柊涓诲崟+鏄庣粏锛屼繚鐣� exceStatus/qty/workQty锛岄伩鍏嶅啀娆¤Е鍙戝畾鏃朵换鍔″鑷撮噸澶嶆敹璐�
+ updateOrderNoPakin(order, syncOrder, loginUserId);
+ // 鏀惰揣鍖哄凡鍋滅敤 // syncReceiptAreaByOrder(order.getId());
+ return;
+ } else if (Integer.valueOf(2).equals(syncOrder.getOperateType())) {
+ // 浠� operateType=2 鏃惰姹傚崟鎹繀椤诲瓨鍦�
+ 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 (!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 (resolvedOrderType != null && resolvedOrderType.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("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ // 鏈� orderNo 鍒欑洿鎺ヤ綔涓� WMS 鍗曞彿 code锛屽惁鍒欐寜瑙勫垯鐢熸垚锛沺o_code 瀛樺崟鎹唴鐮侊紙orderInternalCode 宸叉牎楠岄潪绌猴級
+ String wmsCode = StringUtils.isNotBlank(syncOrder.getOrderNo()) ? syncOrder.getOrderNo() : SerialRuleUtils.generateRuleCode(rule, null);
+ String poCodeVal = syncOrder.getOrderInternalCode();
+ wkOrder.setType(resolvedOrderType != null ? resolvedOrderType : syncOrder.getType())
+ .setWkType(typeCode)
+ .setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme()))
+ .setPoCode(poCodeVal)
+ .setWorkQty(0.0)
+ .setQty(0.0)
+ .setPoId(syncOrder.getOrderId())
+ .setCode(wmsCode)
+ .setArrTime(syncOrder.getArrTime())
+ .setStationId(syncOrder.getStationId())
+ .setId(null)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId);
+
+ if (resolvedOrderType != null && resolvedOrderType.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 = QuantityUtils.roundToScale(orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum());
+ wkOrder.setAnfme(sum);
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
});
}
return R.ok();
}
+
+ /**
+ * 宸茬粍鎵樺崟鎹殑淇敼鍚堝苟锛氭寜 lineId锛坧latItemId锛夊尮閰嶃��
+ * 瑙勫垯锛氱粍鎵樻暟閲忎笉浼氬洜鏀瑰崟鑰屽彉锛涘凡缁勬墭 100 鏃讹紝淇敼涓� 99 浼氭姤閿欙紝淇敼涓� 101 鍏佽涓斿鍑虹殑 1 鍙啀缁勬墭銆�
+ */
+ private void mergeOrderWithPakin(WkOrder order, SyncOrderParams syncOrder, String resolvedOrderType, String typeCode, Long loginUserId) {
+ if (syncOrder.getOrderItems() != null) {
+ for (SyncOrdersItem it : syncOrder.getOrderItems()) {
+ if (StringUtils.isBlank(it.getPlatItemId())) {
+ throw new CoolException("鏄庣粏 lineId 涓嶈兘涓虹┖锛侊紒");
+ }
+ }
+ }
+ List<WkOrderItem> existingItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()));
+ Map<Long, Double> palletizedByItemId = pakinItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ palletizedByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+
+ Map<String, SyncOrdersItem> incomingByLineId = new HashMap<>();
+ if (syncOrder.getOrderItems() != null) {
+ for (SyncOrdersItem it : syncOrder.getOrderItems()) {
+ incomingByLineId.put(it.getPlatItemId().trim(), it);
+ }
+ }
+
+ Set<String> existingLineIds = existingItems.stream()
+ .map(e -> StringUtils.isNotBlank(e.getPlatItemId()) ? e.getPlatItemId().trim() : null)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ for (WkOrderItem existing : existingItems) {
+ String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null;
+ double palletized = palletizedByItemId.getOrDefault(existing.getId(), 0.0);
+ if (lineId == null || !incomingByLineId.containsKey(lineId)) {
+ if (palletized > 0) {
+ throw new CoolException("璇ユ槑缁嗗凡缁勬墭锛岄渶瑙ｉ櫎缁勬墭鍚庢墠鑳藉垹闄わ紒锛�");
+ }
+ } else {
+ SyncOrdersItem inc = incomingByLineId.get(lineId);
+ Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : 0.0);
+ // 宸茬粍鎵樻暟閲忎笉鍙橈細鏀瑰皬锛堝 100 鏀逛负 99锛夋姤閿欙紱鏀瑰ぇ锛堝 100 鏀逛负 101锛夊厑璁革紝澶氬嚭鐨勫彲鍐嶇粍鎵�
+ if (QuantityUtils.compare(newAnfme, palletized) < 0) {
+ throw new CoolException("璇ユ槑缁嗘暟閲忎笉鑳藉皬浜庡凡缁勬墭鏁伴噺锛堝凡缁勬墭 " + palletized + "锛夛紝闇�瑙ｉ櫎缁勬墭鍚庢墠鑳戒慨鏀癸紒锛�");
+ }
+ }
+ }
+
+ order.setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme() != null ? syncOrder.getAnfme() : 0.0));
+ if (syncOrder.getArrTime() != null) {
+ order.setArrTime(syncOrder.getArrTime());
+ }
+ if (StringUtils.isNotBlank(syncOrder.getStationId())) {
+ order.setStationId(syncOrder.getStationId());
+ }
+ order.setUpdateBy(loginUserId);
+ order.setUpdateTime(new Date());
+ asnOrderService.updateById(order);
+
+ for (WkOrderItem existing : existingItems) {
+ String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null;
+ if (lineId == null || !incomingByLineId.containsKey(lineId)) {
+ asnOrderItemService.removeById(existing.getId());
+ continue;
+ }
+ SyncOrdersItem inc = incomingByLineId.get(lineId);
+ existing.setAnfme(QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme()));
+ existing.setMaktx(inc.getMaktx());
+ existing.setSpec(inc.getSpec());
+ existing.setModel(inc.getModel());
+ existing.setStockUnit(inc.getUnit());
+ existing.setBatch(inc.getBatch());
+ existing.setPlanNo(inc.getPlanNo());
+ existing.setPalletId(inc.getPalletId());
+ existing.setUpdateBy(loginUserId);
+ existing.setUpdateTime(new Date());
+ asnOrderItemService.updateById(existing);
+ }
+
+ for (Map.Entry<String, SyncOrdersItem> e : incomingByLineId.entrySet()) {
+ String key = e.getKey();
+ if (!existingLineIds.contains(key)) {
+ Map<String, Object> map = new ObjectMapper().convertValue(e.getValue(), Map.class);
+ map.put("orderId", order.getId());
+ map.put("poId", order.getPoId());
+ map.put("poCode", order.getPoCode());
+ map.put("order_code", order.getCode());
+ map.put("matnrCode", e.getValue().getMatnr());
+ map.put("platItemId", key);
+ if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ }
+
+ Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))
+ .stream().mapToDouble(WkOrderItem::getAnfme).sum());
+ order.setAnfme(sum);
+ asnOrderService.updateById(order);
+ }
+
+ /**
+ * 鏈粍鎵樺崟鎹殑淇敼锛氬湪鍘熷崟涓婃洿鏂颁富鍗�+鏄庣粏锛堟寜 lineId 鍖归厤锛夛紝淇濈暀 exceStatus銆乹ty銆亀orkQty锛岄伩鍏嶅垹鍗曢噸寤哄鑷村畾鏃朵换鍔″啀娆℃墽琛屻��
+ */
+ private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId) {
+ if (syncOrder.getOrderItems() == null || syncOrder.getOrderItems().isEmpty()) {
+ throw new CoolException("淇敼鏃舵槑缁嗕笉鑳戒负绌猴紒锛�");
+ }
+ Map<String, SyncOrdersItem> incomingByLineId = new HashMap<>();
+ for (SyncOrdersItem it : syncOrder.getOrderItems()) {
+ if (StringUtils.isBlank(it.getPlatItemId())) {
+ throw new CoolException("鏄庣粏 lineId 涓嶈兘涓虹┖锛侊紒");
+ }
+ incomingByLineId.put(it.getPlatItemId().trim(), it);
+ }
+ List<WkOrderItem> existingItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ Set<String> existingLineIds = existingItems.stream()
+ .map(e -> StringUtils.isNotBlank(e.getPlatItemId()) ? e.getPlatItemId().trim() : null)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ order.setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme() != null ? syncOrder.getAnfme() : 0.0));
+ if (syncOrder.getArrTime() != null) {
+ order.setArrTime(syncOrder.getArrTime());
+ }
+ if (StringUtils.isNotBlank(syncOrder.getStationId())) {
+ order.setStationId(syncOrder.getStationId());
+ }
+ order.setUpdateBy(loginUserId);
+ order.setUpdateTime(new Date());
+ asnOrderService.updateById(order);
+
+ for (WkOrderItem existing : existingItems) {
+ String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null;
+ if (lineId == null || !incomingByLineId.containsKey(lineId)) {
+ // 鏀惰揣鍖哄凡鍋滅敤 // warehouseAreasItemService.remove(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnItemId, existing.getId()));
+ asnOrderItemService.removeById(existing.getId());
+ continue;
+ }
+ SyncOrdersItem inc = incomingByLineId.get(lineId);
+ existing.setAnfme(QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme()));
+ existing.setMaktx(inc.getMaktx());
+ existing.setSpec(inc.getSpec());
+ existing.setModel(inc.getModel());
+ existing.setStockUnit(inc.getUnit());
+ existing.setBatch(inc.getBatch());
+ existing.setPlanNo(inc.getPlanNo());
+ existing.setPalletId(inc.getPalletId());
+ existing.setUpdateBy(loginUserId);
+ existing.setUpdateTime(new Date());
+ asnOrderItemService.updateById(existing);
+ }
+
+ for (Map.Entry<String, SyncOrdersItem> e : incomingByLineId.entrySet()) {
+ if (existingLineIds.contains(e.getKey())) {
+ continue;
+ }
+ Map<String, Object> map = new ObjectMapper().convertValue(e.getValue(), Map.class);
+ map.put("orderId", order.getId());
+ map.put("poId", order.getPoId());
+ map.put("poCode", order.getPoCode());
+ map.put("order_code", order.getCode());
+ map.put("matnrCode", e.getValue().getMatnr());
+ map.put("platItemId", e.getKey());
+ if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+
+ Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))
+ .stream().mapToDouble(WkOrderItem::getAnfme).sum());
+ order.setAnfme(sum);
+ asnOrderService.updateById(order);
+ }
+
+ /** 鏀惰揣鍖哄凡鍋滅敤锛屾柟娉曟暣浣撴敞閲�
+ * 璁㈠崟淇敼鍚庡悓姝ユ敹璐у尯锛氭寜 asnItemId 灏嗘敹璐у尯璁板綍鐨� anfme 鏇存柊涓鸿鍗曟槑缁嗙殑 anfme銆�
+ */
+// private void syncReceiptAreaByOrder(Long orderId) {
+// List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId));
+// if (orderItems.isEmpty()) {
+// return;
+// }
+// List<WarehouseAreasItem> areaItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnId, orderId));
+// Map<Long, Double> itemAnfme = orderItems.stream().collect(Collectors.toMap(WkOrderItem::getId, i -> i.getAnfme() != null ? i.getAnfme() : 0.0, (a, b) -> b));
+// for (WarehouseAreasItem area : areaItems) {
+// if (area.getAsnItemId() == null || !itemAnfme.containsKey(area.getAsnItemId())) {
+// continue;
+// }
+// Double anfme = itemAnfme.get(area.getAsnItemId());
+// if (area.getAnfme() != null && area.getAnfme().equals(anfme)) {
+// continue;
+// }
+// area.setAnfme(anfme);
+// warehouseAreasItemService.updateById(area);
+// }
+// }
/**
* @author Ryan
@@ -633,7 +906,7 @@
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
.eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
- .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
+ .set(WkOrderItem::getAnfme, QuantityUtils.roundToScale(orderItem.getAnfme())))) {
throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
}
} else {
@@ -646,7 +919,7 @@
}
}
});
- wkOrder.setAnfme(order.getAnfme());
+ wkOrder.setAnfme(QuantityUtils.roundToScale(order.getAnfme()));
if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("涓诲崟鎹慨鏀瑰け璐ワ紒锛�");
}
@@ -664,31 +937,56 @@
@Transactional(timeout = 60, rollbackFor = Exception.class)
public R syncOrderDelete(List<SyncOrderParams> orders) {
orders.forEach(order -> {
+ // operateType=3锛氬瓨鍦ㄥ垯鍒ゆ柇鏄惁鍙互鍙栨秷锛涗富瑕佹牎楠屽崟鎹唴鐮�(orderInternalCode)锛宱rderNo 鏌ュ埌 1 鏉＄户缁紝鏌ュ埌澶氭潯鍒欐姤閿欏己璋冧娇鐢� orderInternalCode
+ WkOrder wkOrder = null;
+ if (StringUtils.isNotEmpty(order.getOrderInternalCode())) {
+ wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getPoCode, order.getOrderInternalCode()));
+ }
+ if (wkOrder == null && StringUtils.isNotEmpty(order.getOrderNo())) {
+ List<WkOrder> list = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, order.getOrderNo()));
+ if (list.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紝鏃犳硶鍙栨秷锛侊紒");
+ }
+ if (list.size() > 1) {
+ throw new CoolException("鍗曞彿瀵瑰簲澶氭潯鍗曟嵁锛岃浣跨敤鍗曟嵁鍐呯爜(orderInternalCode)鍞竴鎸囧畾鍚庡啀鍙栨秷锛侊紒");
+ }
+ wkOrder = list.get(0);
+ }
+ if (wkOrder == null) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紝鏃犳硶鍙栨秷锛侊紒璇锋彁渚涘崟鎹唴鐮�(orderInternalCode)鎴栧崟鍙�(orderNo)銆�");
+ }
+ final WkOrder finalWkOrder = wkOrder;
+ // 宸茬粍鎵樹笉鍙彇娑�
+ long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getAsnId, finalWkOrder.getId()));
+ if (pakinCount > 0) {
+ throw new CoolException("鍗曟嵁宸茬粍鎵橈紝浠呮湭缁勬墭鐘舵�佸彲鍙栨秷锛岃鍏堣В闄ょ粍鎵橈紒锛�");
+ }
+ // 浠呮湭鎵ц鐘舵�佸彲鍙栨秷锛堝叆搴撴湭鎵ц銆佸嚭搴撲换鍔″垵濮嬶級
List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
- WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .in(WkOrder::getExceStatus, list)
- .eq(WkOrder::getCode, order.getOrderNo()));
- if (Objects.isNull(wkOrder)) {
- throw new CoolException("璁㈠崟锛�" + wkOrder.getCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
+ if (!list.contains(finalWkOrder.getExceStatus())) {
+ throw new CoolException("浠呮湭鎵ц鐘舵�佺殑鍗曟嵁鍙彇娑堬紒锛�");
}
order.getOrderItems().forEach(orderItem -> {
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
.eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
- .eq(WkOrderItem::getOrderCode, wkOrder.getCode()))) {
+ .eq(WkOrderItem::getOrderCode, finalWkOrder.getCode()))) {
throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, finalWkOrder.getId()));
if (orderItems.isEmpty()) {
- if (!asnOrderService.removeById(wkOrder.getId())) {
+ if (!asnOrderService.removeById(finalWkOrder.getId())) {
throw new CoolException("鍗曟嵁鍒犻櫎澶辫触锛侊紒");
}
} else {
- Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ Double sum = QuantityUtils.roundToScale(orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum());
if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .eq(WkOrder::getId, wkOrder.getId())
+ .eq(WkOrder::getId, finalWkOrder.getId())
.set(WkOrder::getAnfme, sum))) {
throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
}
@@ -749,9 +1047,8 @@
}
/**
- * 鍩虹鐗╂枡淇℃伅鍙樻洿
- * @param baseMatParms
- * @return
+ * 鍩虹鐗╂枡淇℃伅鍙樻洿锛堝鎺ュ崗璁� 8.2锛�
+ * operateType锛�1鏂板 2淇敼 3绂佺敤 4鍚敤锛涗笉浼犳垨 1/2 鏃舵寜鏈夊垯鏇存柊銆佹棤鍒欐柊澧炪��
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -759,19 +1056,35 @@
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)) {
- BeanUtils.copyProperties(baseMatParms, matnr);
- matnr.setCode(baseMatParms.getMatnr());
- matnr.setName(baseMatParms.getMaktx());
+ Matnr matnr1 = new Matnr();
+ BeanUtils.copyProperties(baseMatParms, matnr1);
+ matnr1.setCode(baseMatParms.getMatnr());
+ matnr1.setName(baseMatParms.getMaktx());
if (!Objects.isNull(baseMatParms.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
- if (Objects.isNull(matnrGroup)) {
- matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
+ if (!Objects.isNull(matnrGroup)) {
+ matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
}
- if (!matnrService.save(matnr)) {
+ if (!matnrService.save(matnr1)) {
throw new CoolException("鐗╂枡鏂板澶辫触锛侊紒");
}
} else {
@@ -794,4 +1107,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