From 82065a03737fa1370eb9f4f01ab5332933baf08a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 09:23:37 +0800
Subject: [PATCH] 云仓WMS+RCS+自动入库临时方法配置
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 1051 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,041 insertions(+), 10 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 b747497..6d8b18f 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
@@ -1,33 +1,53 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.*;
+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.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.OrderType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.entity.DictType;
import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.DictDataService;
+import com.vincent.rsf.server.system.service.DictTypeService;
import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -47,13 +67,13 @@
@Autowired
private FieldsService fieldsService;
@Autowired
- private FieldsItemService fieldsItemService;
- @Autowired
private MatnrGroupService matnrGroupService;
@Autowired
private MatnrServiceImpl matnrService;
@Autowired
private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderLogService asnOrderLogService;
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
@@ -63,7 +83,42 @@
@Autowired
private LocService locService;
@Autowired
+ private OrderWorkTypeService orderWorkTypeService;
+ @Autowired
+ private OrderTypeDictService orderTypeDictService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private WarehouseService warehouseService;
+ @Autowired
+ private CompanysService companysService;
+ @Autowired
+ private TransferService transferService;
+ @Autowired
+ private TransferItemService transferItemService;
+ @Autowired
+ private LocReviseService locReviseService;
+ @Autowired
+ private ReviseLogService reviseLogService;
+ @Autowired
+ private ReviseLogItemService reviseLogItemService;
+ @Autowired
+ private CheckDiffService checkDiffService;
+ @Autowired
+ private CheckDiffItemService checkDiffItemService;
+ @Autowired
+ private DictDataService dictDataService;
+ @Autowired
+ private DictTypeService dictTypeService;
+ @Autowired
private LocItemService locItemService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WarehouseAreasItemService warehouseAreasItemService;
+ @Autowired
+ private ConfigService configService;
+
/**
* @author Ryan
@@ -72,7 +127,7 @@
* @version 1.0
*/
@Override
- @Transactional(rollbackFor = Exception.class)
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public boolean syncPurchasee(List<OrderParams> orders) {
if (orders.isEmpty()) {
throw new CoolException("鍗曟嵁鍐呭涓嶈兘涓虹┖锛侊紒");
@@ -154,6 +209,7 @@
* @param matnrs
*/
@Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public void syncMatnrs(List<BaseMatParms> matnrs) {
List<Matnr> syncMatnrs = new ArrayList<>();
if (!matnrs.isEmpty()) {
@@ -188,11 +244,20 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getCode, queryParams.getOrderNo())
- .eq(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();
@@ -211,7 +276,7 @@
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);
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page);
return R.ok().add(locStocks);
}
@@ -222,7 +287,7 @@
* @version 1.0
*/
@Override
- @Transactional(timeout = 30, rollbackFor = Exception.class)
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public R syncLocs(List<SyncLocsParams> locs) {
List<Loc> syncLocs = new ArrayList<>();
locs.forEach(loc -> {
@@ -237,5 +302,971 @@
return R.ok();
}
+ /**
+ * @author Ryan
+ * @date 2025/8/18
+ * @description: 鐗╂枡鍒嗙粍淇℃伅鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncMatGroups(List<SyncMatGroupsParams> matGroupsParams) {
+ List<MatnrGroup> syncMatGroups = new ArrayList<>();
+ matGroupsParams.forEach(matGroupsParam -> {
+ MatnrGroup matnrGroup = new MatnrGroup();
+ BeanUtils.copyProperties(matGroupsParam, matnrGroup);
+ if (Objects.isNull(matGroupsParam.getCode())) {
+ throw new CoolException("鐗╂枡鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matGroupsParam.getName())) {
+ throw new CoolException("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matGroupsParam.getParCode())) {
+ throw new CoolException("涓婄骇鐗╂枡鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ syncMatGroups.add(matnrGroup);
+ });
+ if (!matnrGroupService.saveBatch(syncMatGroups)) {
+ throw new CoolException("鐗╂枡鍒嗙粍淇濆瓨澶辫触锛侊紒");
+ }
+ return R.ok();
+ }
+ /**
+ * @author Ryan
+ * @date 2025/8/18
+ * @description: 搴撳尯淇℃伅鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncWarehouseAreas(List<LocAreasParams> areasParams) {
+ areasParams.forEach(param -> {
+ WarehouseAreas locArea = new WarehouseAreas();
+ BeanUtils.copyProperties(param, locArea);
+ WarehouseAreas warehouseAreas = warehouseAreasService
+ .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, param.getName()));
+ if (!Objects.isNull(warehouseAreas)) {
+ locArea.setWarehouseId(warehouseAreas.getId());
+ }
+ locArea.setName(param.getName())
+ .setCode(param.getCode())
+ .setId(null);
+ if (!warehouseAreasService.save(locArea)) {
+ throw new CoolException("搴撳尯淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/18
+ * @description: 浠撳簱鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncWarehouse(List<WarehouseParams> warehouses) {
+ warehouses.forEach(warehouse -> {
+ Warehouse ware = new Warehouse();
+ BeanUtils.copyProperties(warehouse, ware);
+ ware.setId(null);
+ if (!warehouseService.save(ware)) {
+ throw new CoolException("浠撳簱鍚屾淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 鍚屾浼佷笟淇℃伅
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncCompanies(List<CompaniesParam> companyParams) {
+ companyParams.forEach(param -> {
+ Companys companys = new Companys();
+ BeanUtils.copyProperties(param, companys);
+ if (Objects.isNull(companys.getCode())) {
+ throw new CoolException("浼佷笟缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()));
+ if (Objects.isNull(one)) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
+ companys.setCode(ruleCode);
+ } else {
+ throw new CoolException(one.getName() + "锛屼紒涓氬悕閲嶅锛侊紒");
+ }
+ companys.setType(CompanysType.getCustomVal(param.getType()))
+ .setId(null);
+ if (!companysService.save(companys)) {
+ throw new CoolException("浼佷笟淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/26
+ * @description: 鍗曟嵁鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ 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();
+ // 鍏煎 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() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
+ }
+ // 璁㈠崟绫诲瀷锛氭敮鎸佹暟瀛� 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.ASN_EXCE_STATUS_UN_EXCE.val
+ ,AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.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()).eq(WaitPakinItem::getDeleted, 0));
+ if (pakinCount > 0) {
+ mergeOrderWithPakin(order, syncOrder, resolvedOrderType, typeCode, loginUserId);
+ if (isDirectWaitPakin()) {
+ syncReceiptAreaByOrder(order.getId());
+ }
+ return;
+ }
+ updateOrderNoPakin(order, syncOrder, loginUserId);
+ if (isDirectWaitPakin()) {
+ syncReceiptAreaByOrder(order.getId());
+ }
+ return;
+ } else if (Integer.valueOf(2).equals(syncOrder.getOperateType())) {
+ // 浠� operateType=2 鏃惰姹傚崟鎹繀椤诲瓨鍦�
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紝鏃犳硶淇敼锛侊紒");
+ }
+ String rule = SerialRuleCode.SYS_ASN_ORDER;
+ if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) {
+ rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
+ }
+ // 鏈� 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()).eq(WaitPakinItem::getDeleted, 0));
+ 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());
+
+ // 宸茬粍鎵樺崟鎹慨鏀瑰彧鑳藉鍔犳暟閲忎笉鑳藉噺灏戞暟閲忥細浜戜粨涓嬪彂鐨勬�绘暟閲忎笉寰楀皬浜庡凡缁勬墭鎬婚噺
+ double totalPalletized = QuantityUtils.roundToScale(pakinItems.stream().mapToDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0).sum());
+ double incomingTotal = syncOrder.getOrderItems() == null ? 0.0 : syncOrder.getOrderItems().stream()
+ .mapToDouble(it -> it.getAnfme() != null ? it.getAnfme() : 0.0).sum();
+ incomingTotal = QuantityUtils.roundToScale(incomingTotal);
+ if (QuantityUtils.compare(incomingTotal, totalPalletized) < 0) {
+ throw new CoolException("宸茬粍鎵樺崟鎹慨鏀瑰彧鑳藉鍔犳暟閲忎笉鑳藉噺灏戞暟閲忥紙褰撳墠宸茬粍鎵樻�婚噺 " + totalPalletized + "锛屼笅鍙戞�婚噺 " + incomingTotal + "锛夛紒锛�");
+ }
+
+ 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);
+ Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme());
+ existing.setAnfme(newAnfme);
+ if (inc.getQty() != null) {
+ existing.setQty(QuantityUtils.roundToScale(inc.getQty()));
+ } else {
+ Double curQty = existing.getQty() != null ? existing.getQty() : 0.0;
+ if (QuantityUtils.compare(curQty, 0.0) != 0) {
+ existing.setQty(QuantityUtils.roundToScale(newAnfme));
+ }
+ }
+ 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);
+ 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);
+ }
+
+ /**
+ * 鏈粍鎵樺崟鎹殑淇敼锛氬湪鍘熷崟涓婃洿鏂颁富鍗�+鏄庣粏锛堟寜 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)) {
+ if (isDirectWaitPakin()) {
+ warehouseAreasItemService.remove(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnItemId, existing.getId()));
+ }
+ asnOrderItemService.removeById(existing.getId());
+ continue;
+ }
+ SyncOrdersItem inc = incomingByLineId.get(lineId);
+ Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme());
+ existing.setAnfme(newAnfme);
+ if (inc.getQty() != null) {
+ existing.setQty(QuantityUtils.roundToScale(inc.getQty()));
+ } else {
+ Double curQty = existing.getQty() != null ? existing.getQty() : 0.0;
+ if (QuantityUtils.compare(curQty, 0.0) != 0) {
+ existing.setQty(QuantityUtils.roundToScale(newAnfme));
+ }
+ }
+ 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);
+ 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);
+ }
+
+ /** DirectWaitPakin 鍚敤鏃讹細璁㈠崟淇敼鍚庡悓姝ユ敹璐у尯锛屾寜 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);
+ }
+ }
+
+ private boolean isDirectWaitPakin() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ return config != null && Boolean.parseBoolean(config.getVal());
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 璋冩嫈鍗曟嵁鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) {
+ Transfer transfer = new Transfer();
+ WarehouseAreas warehouseAreas = warehouseAreasService
+ .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, transferParams.getOrgAreaName()));
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("鍘熷簱鍖轰笉瀛樺湪锛侊紒");
+ }
+
+ WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, transferParams.getTarAreaName()));
+ if (Objects.isNull(warehouseAreas1)) {
+ throw new CoolException("鐩爣搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ transfer.setOrgAreaName(warehouseAreas.getName())
+ .setOrgAreaId(warehouseAreas.getId())
+ .setOrgWareName(warehouseAreas.getWarehouseId$())
+ .setOrgWareId(warehouseAreas.getWarehouseId())
+ .setTarWareName(warehouseAreas1.getWarehouseId$())
+ .setTarAreaName(warehouseAreas1.getName())
+ .setTarAreaId(warehouseAreas1.getId())
+ .setTarWareName(warehouseAreas1.getWarehouseId$())
+ .setTarWareId(warehouseAreas1.getWarehouseId())
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null))
+ .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);
+
+ if (!transferService.save(transfer)) {
+ throw new CoolException("璋冩嫈鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+
+ transferParams.getItems().forEach(item -> {
+ TransferItem transferItem = new TransferItem();
+ BeanUtils.copyProperties(item, transferItem);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ transferItem.setMatnrId(matnr.getId())
+ .setTransferId(transfer.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setTransferCode(transfer.getCode());
+
+ if (!transferItemService.save(transferItem)) {
+ throw new CoolException("璋冩嫈鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+ });
+
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 搴撳瓨璋冩暣鍗曞悓姝�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) {
+ LocRevise locRevise = new LocRevise();
+ if (Objects.isNull(reviseParams.getAreaName())) {
+ throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+ }
+ WarehouseAreas warehouseAreas = warehouseAreasService
+ .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getName, reviseParams.getAreaName()));
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ locRevise.setAreaName(warehouseAreas.getName())
+ .setType(LocReviseType.getLocRevise(reviseParams.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setAreaId(warehouseAreas.getId());
+ locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));
+
+ if (!locReviseService.save(locRevise)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曚繚瀛樺け璐ワ紒锛�");
+ }
+
+ reviseParams.getReviseItems().forEach(revise -> {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
+ ReviseLog reviseLog = new ReviseLog();
+ BeanUtils.copyProperties(loc, reviseLog);
+ reviseLog.setReviseId(locRevise.getId())
+ .setLocCode(loc.getCode())
+ .setType(Integer.parseInt(loc.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setReviseCode(locRevise.getCode());
+ if (!reviseLogService.save(reviseLog)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曚笉鑳戒负绌猴紒锛�");
+ }
+ revise.getItems().forEach(reviseItem -> {
+ ReviseLogItem logItem = new ReviseLogItem();
+ BeanUtils.copyProperties(reviseItem, logItem);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnr()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ logItem.setLocId(loc.getId())
+ .setLocCode(loc.getCode())
+ .setId(null)
+ .setMaktx(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMatnrId(matnr.getId())
+ .setReviseLogId(reviseLog.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setReviseQty(reviseItem.getAnfme());
+ if (!reviseLogItemService.save(logItem)) {
+ throw new CoolException("璋冩暣搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ });
+
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 鍗曟嵁淇敼--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncOrderUpdate(List<SyncOrderParams> orders) {
+ orders.forEach(order -> {
+ 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("璇风‘璁ゅ崟鎹細" + order.getOrderNo() + "鏄惁宸茬粡鎵ц鎴栨槸鍚﹀悓姝ワ紒锛�");
+ }
+ order.getOrderItems().forEach(orderItem -> {
+ WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
+ .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .eq(WkOrderItem::getOrderCode, wkOrder.getCode()));
+ if (!Objects.isNull(wkOrderItem)) {
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderCode, wkOrder.getCode())
+ .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, QuantityUtils.roundToScale(orderItem.getAnfme())))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ } else {
+ WkOrderItem wkOrderItem1 = new WkOrderItem();
+ BeanUtils.copyProperties(orderItem, wkOrderItem1);
+ wkOrderItem1.setOrderCode(wkOrder.getCode())
+ .setOrderId(wkOrder.getId());
+ if (!asnOrderItemService.save(wkOrderItem1)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ });
+ wkOrder.setAnfme(QuantityUtils.roundToScale(order.getAnfme()));
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("涓诲崟鎹慨鏀瑰け璐ワ紒锛�");
+ }
+ });
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/21
+ * @description: 鍒犻櫎鍗曟嵁
+ * @version 1.0
+ */
+ @Override
+ @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);
+ 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, finalWkOrder.getCode()))) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, finalWkOrder.getId()));
+ if (orderItems.isEmpty()) {
+ if (!asnOrderService.removeById(finalWkOrder.getId())) {
+ throw new CoolException("鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ Double sum = QuantityUtils.roundToScale(orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum());
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, finalWkOrder.getId())
+ .set(WkOrder::getAnfme, sum))) {
+ throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+ });
+ });
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/21
+ * @description: 璋冩嫈鍗曟槑缁嗘煡璇�
+ * @version 1.0
+ */
+ @Override
+ public R queryTransfer(QueryOrderParam queryParams) {
+ Transfer transfer = transferService.getOne(new LambdaQueryWrapper<Transfer>()
+ .in(Transfer::getCode, queryParams.getOrderNo()));
+ if (Objects.isNull(transfer)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
+ .eq(TransferItem::getTransferId, transfer.getId()));
+ TransferInfoDto wkorderDto = new TransferInfoDto();
+ wkorderDto.setTransfer(transfer).setItems(orderItems);
+ return R.ok().add(wkorderDto);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/22
+ * @description: 鐩樼偣宸紓鍗曞悓姝�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
+ List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
+ .eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
+ .in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
+ if (diffs.isEmpty()) {
+ return R.ok();
+ }
+ List<CheckDiffDto> dtos = new ArrayList<>();
+ diffs.forEach(check -> {
+ CheckDiffDto checkDto = new CheckDiffDto();
+ CheckDiff checkDiff = new CheckDiff();
+ BeanUtils.copyProperties(check, checkDiff);
+ List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getCheckId, check.getId()));
+ checkDto.setItems(items)
+ .setCheckDiff(checkDiff);
+ dtos.add(checkDto);
+ });
+
+ return R.ok().add(dtos);
+ }
+
+ /**
+ * 鍩虹鐗╂枡淇℃伅鍙樻洿锛堝鎺ュ崗璁� 8.2锛�
+ * operateType锛�1鏂板 2淇敼 3绂佺敤 4鍚敤锛涗笉浼犳垨 1/2 鏃舵寜鏈夊垯鏇存柊銆佹棤鍒欐柊澧炪��
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R matUpdate(BaseMatParms baseMatParms) {
+ 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();
+ 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)) {
+ matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
+ }
+ }
+ if (!matnrService.save(matnr1)) {
+ throw new CoolException("鐗╂枡鏂板澶辫触锛侊紒");
+ }
+ } else {
+ 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());
+ }
+ }
+ matnr.setName(baseMatParms.getMaktx())
+ .setColor(baseMatParms.getColor())
+ .setModel(baseMatParms.getModel())
+ .setSpec(baseMatParms.getSpec());
+
+ if (!matnrService.updateById(matnr)) {
+ throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
+ }
+ }
+
+ 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