From ef69d3bad0c7f03da11cb1c1e46a84bcebe02bc4 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 25 三月 2025 10:44:48 +0800 Subject: [PATCH] 修改 # 物料分组编码规则优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java index 8906fbf..098d817 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java @@ -1,12 +1,133 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.api.entity.dto.PoItemsDto; +import com.vincent.rsf.server.api.service.ReceiveMsgService; +import com.vincent.rsf.server.api.service.ReportMsgService; +import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; +import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper; import com.vincent.rsf.server.manager.mapper.AsnOrderMapper; import com.vincent.rsf.server.manager.entity.AsnOrder; +import com.vincent.rsf.server.manager.mapper.PurchaseMapper; +import com.vincent.rsf.server.manager.service.AsnOrderItemService; import com.vincent.rsf.server.manager.service.AsnOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.vincent.rsf.server.system.constant.SerialRuleCode; +import com.vincent.rsf.server.system.entity.SerialRule; +import com.vincent.rsf.server.system.mapper.SerialRuleMapper; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author Ryan + * @description + * @throws + * @return + * @time 2025/3/7 08:02 + */ @Service("asnOrderService") public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements AsnOrderService { + @Autowired + private ReceiveMsgService receiveMsgService; + @Autowired + private ReportMsgService reportMsgService; + @Resource + private PurchaseMapper purchaseMapper; + + @Autowired + private AsnOrderItemService asnOrderItemService; + + @Resource + private SerialRuleMapper serialRuleMapper; + + @Override + public boolean notifyInspect(List<AsnOrder> orders) { + if (orders.isEmpty()) { + throw new CoolException("涓婃姤鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + Set<Long> asnIds = orders.stream().map(AsnOrder::getId).collect(Collectors.toSet()); + if (asnIds.isEmpty()) { + throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒"); + } + List<PoItemsDto> items = purchaseMapper.poList(asnIds); + if (reportMsgService.reportInspectNotify(items)) { + return true; + } else { + return false; + } + } + + @Override + public R generateBarcode(List<AsnOrder> orders) { + orders.forEach(order -> { + List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId())); + if (!items.isEmpty()) { + items.forEach(item -> { + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item); + item.setTrackCode(ruleCode); + }); + if (!asnOrderItemService.saveOrUpdateBatch(items)) { + throw new CoolException("鐢熸垚鏉$爜澶辫触锛侊紒"); + } + } + }); + return R.ok(); + } + + @Override + public List<AsnOrder> getListByMatnr(Map<String, String> params) { + if (Objects.isNull(params)) { + throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒"); + } + List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>() + .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx")) + .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode"))); + + if (orderItems.isEmpty()) { + return new ArrayList<>(); + } + List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList()); + + return this.listByIds(longList); + } + + @Override + public R saveOrderAndItems(AsnOrderAndItemsParams params) { + if (Objects.isNull(params.getOrders())) { + throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖"); + } + AsnOrder orders = params.getOrders(); + + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders); + if (Objects.isNull(ruleCode)) { + throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�"); + } + orders.setCode(ruleCode); + if (!this.save(orders)) { + throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒"); + } + if (params.getItems().isEmpty()) { + throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�"); + } + params.getItems().forEach(item -> { + item.put("asnId", orders.getId()); + item.put("asnCode", orders.getCode()); + item.put("poCode", orders.getPoCode()); + + if (!asnOrderItemService.fieldsSave(item)) { + throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + + }); + return R.ok("淇濆瓨鎴愬姛!!"); + } } -- Gitblit v1.9.1