From b7d3b5954bc0f811c85b0c4efb9c2095ddef9a99 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 26 八月 2025 11:10:10 +0800 Subject: [PATCH] 单据同步功能优化 单据修改接口优化 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java | 4 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 181 ++++++++++++++++++------------------ rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java | 12 -- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java | 22 +++ rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 39 +++++++ rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 8 6 files changed, 155 insertions(+), 111 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java index 6fc3a82..aa18dcf 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java @@ -97,8 +97,8 @@ @ApiOperation("鍚屾鍗曟嵁") @OperationLog("鍗曟嵁鍚屾") @PostMapping("/sync/checks") - public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) { - if (Objects.isNull(syncOrders)) { + public R syncCheckResult(@RequestBody List<SyncOrderParams> syncOrders) { + if (Objects.isNull(syncOrders) || syncOrders.isEmpty()) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } return receiveMsgService.syncCheckOrder(syncOrders, getLoginUserId()); @@ -160,8 +160,8 @@ @ApiOperation("鍗曟嵁淇敼") @OperationLog("鍗曟嵁淇敼") @PostMapping("/sync/orders/update") - public R syncOrderUpdate(@RequestBody SyncOrderParams orders) { - if (Objects.isNull(orders)) { + public R syncOrderUpdate(@RequestBody List<SyncOrderParams> orders) { + if (Objects.isNull(orders) || orders.isEmpty()) { return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } return receiveMsgService.syncOrderUpdate(orders); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java index b0524d5..1b352a2 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java @@ -1,11 +1,14 @@ package com.vincent.rsf.server.api.controller.erp.params; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; import java.util.List; @Data @@ -15,9 +18,22 @@ private static final long serialVersionUID = 1L; - @ApiModelProperty("鍗曟嵁绫诲瀷{in: 鏀惰揣鍏ュ簱鍗曪紝 out锛氬嚭搴撳崟锛宑heck: 鐩樼偣鍗�,}") - private String type; + @ApiModelProperty("涓氬姟绫诲瀷") + private String wkType; + + @ApiModelProperty("鍗曞彿") + private String orderNo; + + @ApiModelProperty("璁㈠崟ID") + private Long orderId; + + @ApiModelProperty("鏁伴噺") + private Double anfme; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") + private Date arrTime; @ApiModelProperty("鍗曟嵁鏄庣粏淇℃伅") - private List<SyncOrdersItem> items; + private List<SyncOrdersItem> ordersItems; } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java index e902599..2a743ad 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java @@ -18,18 +18,6 @@ @ApiModelProperty("鐩樼偣鍗曟槑缁咺D") private Long id; - @ApiModelProperty("璁㈠崟ID") - private Long orderId; - - @ApiModelProperty("璁㈠崟鐘舵�亄in: 鍏ュ簱鍗�, out: 鍑哄簱鍗�, check: 鐩樼偣鍗晑") - private String orderType; - - @ApiModelProperty("涓氬姟绫诲瀷") - private String wkType; - - @ApiModelProperty("ASN鍗曞彿") - private String orderCode; - @ApiModelProperty("鐗╂枡鏍囪瘑") private Long matnrId; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java index df4989e..91015cf 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java @@ -96,7 +96,7 @@ * @description: 鍗曟嵁鍚屾--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗� * @version 1.0 */ - R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId); + R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId); /** * @author Ryan @@ -120,7 +120,7 @@ * @description: 鍗曟嵁淇敼--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗� * @version 1.0 */ - R syncOrderUpdate(SyncOrderParams orders); + R syncOrderUpdate(List<SyncOrderParams> orders); /** * @author Ryan 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 23c1c0a..f2dbde9 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 @@ -19,12 +19,19 @@ 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.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.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; @@ -84,6 +91,10 @@ private CheckDiffService checkDiffService; @Autowired private CheckDiffItemService checkDiffItemService; + @Autowired + private DictDataService dictDataService; + @Autowired + private DictTypeService dictTypeService; /** @@ -368,58 +379,49 @@ return R.ok(); } - + /** + * @author Ryan + * @date 2025/8/26 + * @description: 鍗曟嵁鍚屾 + * @version 1.0 + */ @Override @Transactional(timeout = 60, rollbackFor = Exception.class) - public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) { - List<SyncOrdersItem> ordersItems = syncOrders.getItems(); - Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode)); - listMap.keySet().forEach(orderCode -> { - WkOrder wkOrder = new WkOrder(); - String ruleCode = null; - if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) { - ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null); - } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) { - ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null); - } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) { - ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null); - } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) { - ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null); - } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) { - ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null); - } - - SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get(); - Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum(); - wkOrder.setType(syncOrders.getType()) - .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType())) - .setAnfme(anfmes) - .setPoCode(orderCode) - .setPoId(ordersItem.getId()) - .setCode(ruleCode) - .setId(null) - .setCreateTime(new Date()) - .setUpdateTime(new Date()) - .setCreateBy(loginUserId) - .setUpdateBy(loginUserId); - - if (!asnOrderService.save(wkOrder)) { - throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒"); - } - - listMap.get(orderCode).forEach(order -> { - WkOrderItem wkOrderItem = new WkOrderItem(); - BeanUtils.copyProperties(order, wkOrderItem); - wkOrderItem.setOrderCode(wkOrder.getCode()) - .setOrderId(wkOrder.getId()) - .setId(null); - - if (!asnOrderItemService.save(wkOrderItem)) { - throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"); + 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.setType(OrderWorkType.getOrderType(syncOrder.getWkType())) + .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType())) + .setAnfme(syncOrder.getAnfme()) + .setCode(syncOrder.getOrderNo()) + .setArrTime(syncOrder.getArrTime()) + .setId(null) + .setCreateTime(new Date()) + .setUpdateTime(new Date()) + .setCreateBy(loginUserId) + .setUpdateBy(loginUserId); + if (!asnOrderService.save(wkOrder)) { + throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒"); + } + List<SyncOrdersItem> ordersItems = syncOrder.getOrdersItems(); + ordersItems.forEach(item -> { + WkOrderItem wkOrderItem = new WkOrderItem(); + BeanUtils.copyProperties(item, wkOrderItem); + wkOrderItem.setOrderCode(wkOrder.getCode()) + .setOrderId(wkOrder.getId()) + .setId(null); + if (!asnOrderItemService.save(wkOrderItem)) { + throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); }); - }); - + } return R.ok(); } @@ -573,41 +575,31 @@ */ @Override @Transactional(timeout = 60, rollbackFor = Exception.class) - public R syncOrderUpdate(SyncOrderParams orders) { - //鍏ュ簱鍗曚慨鏀� - if (orders.getType().equals(OrderType.ORDER_IN.type)) { - orders.getItems().forEach(orderItem -> { - WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() - .eq(WkOrder::getType, OrderType.ORDER_IN.type) - .eq(WkOrder::getCode, orderItem.getOrderCode())); - if (Objects.isNull(order)) { - throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); - } - + 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 -> { if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>() - .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()) + .eq(WkOrderItem::getOrderCode, order.getOrderNo()) .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode()) - .eq(WkOrderItem::getSplrBatch, orderItem.getBatch()) + .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("鍗曟嵁淇敼澶辫触锛侊紒"); } - - List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() - .eq(WkOrderItem::getOrderId, order.getId())); - if (orderItems.isEmpty()) { - throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); - } - - Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum(); - order.setAnfme(summed); - - if (!asnOrderService.updateById(order)) { - throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒"); - } }); - } else { - - } + wkOrder.setAnfme(order.getAnfme()); + if (!asnOrderService.updateById(wkOrder)) { + throw new CoolException("涓诲崟鎹慨鏀瑰け璐ワ紒锛�"); + } + }); return null; } @@ -621,25 +613,34 @@ @Transactional(timeout = 60, rollbackFor = Exception.class) public R syncOrderDelete(List<SyncOrderParams> orders) { orders.forEach(order -> { - order.getItems().forEach(orderItem -> { - WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() - .eq(WkOrder::getType, order.getType()) - .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) - .eq(WkOrder::getId, orderItem.getOrderId())); - if (Objects.isNull(wkOrder)) { - throw new CoolException("璁㈠崟锛�" + orderItem.getOrderCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒"); - } + 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::getMatnrId, orderItem.getMatnrId()) - .eq(WkOrderItem::getSplrBatch, orderItem.getBatch()) - .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) { + .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode()) + .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, orderItem.getOrderId())); + List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId())); if (orderItems.isEmpty()) { - if (!asnOrderService.removeById(orderItem.getOrderId())) { + 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("涓诲崟鏁伴噺淇敼澶辫触锛侊紒"); + } } }); }); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java index 4c78108..fe65c73 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java @@ -66,6 +66,45 @@ return null; } + /** + * @author Ryan + * @date 2025/8/26 + * @description: 鑾峰彇璁㈠崟绫诲瀷 + * @version 1.0 + */ + public static String getOrderType(String desc) { + if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) { + return OrderType.ORDER_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) { + return OrderType.ORDER_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) { + return OrderType.ORDER_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) { + return OrderType.ORDER_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc)) { + return OrderType.ORDER_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) { + return OrderType.ORDER_OUT.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) { + return OrderType.ORDER_OUT.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc)) { + return OrderType.ORDER_OUT.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) { + return OrderType.ORDER_OUT.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) { + return OrderType.ORDER_OUT.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) { + return OrderType.ORDER_CHECK.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) { + return OrderType.ORDER_TRANSFER.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) { + return OrderType.ORDER_TRANSFER.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) { + return OrderType.ORDER_REVISE.type; + } + return null; + } + public static String getWorkDesc(String type) { if (type.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) { return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc; -- Gitblit v1.9.1