From f1148a16d18e7d0f095fbd2341410104de665fc1 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 14:39:54 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 598 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 585 insertions(+), 13 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 e01e3ff..1f5f9cb 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,36 +1,48 @@
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.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
-import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
-import com.vincent.rsf.server.api.controller.erp.params.WkOrderDto;
+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.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.SerialRuleCode;
-import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
+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
@@ -50,8 +62,6 @@
@Autowired
private FieldsService fieldsService;
@Autowired
- private FieldsItemService fieldsItemService;
- @Autowired
private MatnrGroupService matnrGroupService;
@Autowired
private MatnrServiceImpl matnrService;
@@ -66,7 +76,30 @@
@Autowired
private LocService locService;
@Autowired
- private LocItemService locItemService;
+ 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;
+
/**
* @author Ryan
@@ -75,7 +108,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("鍗曟嵁鍐呭涓嶈兘涓虹┖锛侊紒");
@@ -157,6 +190,7 @@
* @param matnrs
*/
@Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public void syncMatnrs(List<BaseMatParms> matnrs) {
List<Matnr> syncMatnrs = new ArrayList<>();
if (!matnrs.isEmpty()) {
@@ -192,7 +226,7 @@
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getCode, queryParams.getOrderNo())
- .eq(WkOrder::getType, queryParams.getType()));
+ .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -207,16 +241,554 @@
/**
* @author Ryan
* @date 2025/8/15
- * @description: 鍚屾搴撲綅淇℃伅
+ * @description: 鏌ヨ搴撲綅淇℃伅
* @version 1.0
*/
@Override
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);
}
+ /**
+ * @author Ryan
+ * @date 2025/8/18
+ * @description: 搴撲綅鍚屾
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncLocs(List<SyncLocsParams> locs) {
+ List<Loc> syncLocs = new ArrayList<>();
+ locs.forEach(loc -> {
+ Loc loc1 = new Loc();
+ BeanUtils.copyProperties(loc, loc1);
+ loc1.setCode(loc.getLocCode()).setId(null);
+ syncLocs.add(loc1);
+ });
+ if (!locService.saveBatch(syncLocs)) {
+ 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 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 -> {
+ WkOrder wkOrder = new WkOrder();
+ DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
+ .eq(DictData::getLabel, syncOrder.getWkType()), false);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
+ }
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
+ .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
+ if (!Objects.isNull(order)) {
+ if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
+ order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
+ /**鍒犻櫎鍗曟嵁鏄庣粏*/
+ asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ /**鍒犻櫎涓诲崟*/
+ asnOrderService.removeById(order.getId());
+ } else {
+ throw new CoolException("鍗曟嵁宸叉坊鍔狅紝涓嶅彲鎵ц淇敼鎴栨坊鍔犳搷浣滐紒锛�");
+ }
+ }
+ 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(OrderWorkType.getWorkType(syncOrder.getWkType()))
+ .setAnfme(syncOrder.getAnfme())
+ .setPoCode(syncOrder.getOrderNo())
+ .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.getOrdersItems().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());
+
+ if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ wkOrder.setAnfme(sum);
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ });
+ }
+ return R.ok();
+ }
+
+ /**
+ * @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.getOrdersItems().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, 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(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 -> {
+ 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() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
+ }
+ order.getOrdersItems().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()))) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ if (orderItems.isEmpty()) {
+ if (!asnOrderService.removeById(wkOrder.getId())) {
+ throw new CoolException("鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, wkOrder.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);
+ }
+
+ /**
+ * 鍩虹鐗╂枡淇℃伅鍙樻洿
+ * @param baseMatParms
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R matUpdate(BaseMatParms baseMatParms) {
+ if (StringUtils.isBlank(baseMatParms.getMatnr())) {
+ throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ 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());
+ 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 (!matnrService.save(matnr)) {
+ 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();
+ }
}
--
Gitblit v1.9.1