云仓WMS+RCS+自动入库临时方法配置

chen.lin

19 小时以前 82065a03737fa1370eb9f4f01ab5332933baf08a

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java

@@ -10,6 +10,8 @@
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.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -27,14 +29,17 @@
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
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;
@@ -66,6 +71,11 @@

    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private AsnOrderService asnOrderService;

    @Autowired
    private WaitPakinItemService waitPakinItemService;

    @Override
    public R generateBarcode(List<Long> orders) {
@@ -160,8 +170,8 @@
                    throw new CoolException(sbFaild.toString());
                }
                String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
                orderItem.setAsnId(order.getId())
                        .setAsnCode(order.getCode())
                orderItem.setOrderId(order.getId())
                        .setOrderCode(order.getCode())
                        .setSplrBatch(orderTemplate.getSplrBatch())
                        .setPlatItemId(orderTemplate.getPlatItemId())
                        .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
@@ -238,20 +248,47 @@
        if (Objects.isNull(wkOrderItem.getAnfme()) || Double.compare(wkOrderItem.getAnfme(), 0.0) <= 0) {
            throw new CoolException("计划数不能为空！！");
        }
        //保存扩展字段
        try {
            StringBuffer sb = new StringBuffer();
            if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
                sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch() );
                //获取16位uuid
                String uuid16 = Cools.md5Chinese(sb.toString());
                wkOrderItem.setFieldsIndex(uuid16);
                params.put("index", uuid16);

        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, wkOrderItem.getMatnrCode()));
        if (Objects.isNull(matnr)) {
            throw new CoolException("数据错误：物料" + wkOrderItem.getMatnrCode() + "不存在！！");
        }
        // 复制时排除 id，避免物料 id 覆盖单据明细 id，导致 saveOrUpdate 误判为新增而重复插入（出库单编辑保存后 1 条变 2 条）
        BeanUtils.copyProperties(matnr, wkOrderItem, "id");
        wkOrderItem.setMatnrCode(matnr.getCode())
                .setSplrBatch(!Objects.isNull(wkOrderItem.getBatch()) ? wkOrderItem.getBatch() : null)
                .setMatnrId(matnr.getId())
                .setMaktx(matnr.getName());

        WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
        if (Objects.isNull(wkOrder)) {
            throw new CoolException("数据错误，单据不存在！！");
        }
        if (!wkOrder.getType().equals(OrderType.ORDER_OUT.type)) {
            //保存扩展字段
            try {
                StringBuffer sb = new StringBuffer();
                if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
                    List<Fields> fields = FieldsUtils.getFieldsSta();
                    for (Fields field : fields) {
                        if (Objects.isNull(params.get(field.getFields()))) {
                            continue;
                        }
                        //字段拼接
                        sb.append(params.get(field.getFields()));
                    }
                    sb.append(wkOrderItem.getMatnrId() + "null");
                    log.error("=======================>添加批号字符串" + sb.toString());
                    //获取16位uuid
                    String uuid16 = Cools.md5Chinese(sb.toString());
                    wkOrderItem.setFieldsIndex(uuid16);
                    params.put("index", uuid16);
                }
                //保存或更新动态字段值
                FieldsUtils.updateFieldsValue(params);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            //保存或更新动态字段值
            FieldsUtils.updateFieldsValue(params);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
        if (!this.saveOrUpdate(wkOrderItem)) {
@@ -270,4 +307,26 @@
        return hsahMap;
    }

    @Override
    public void fillPalletQty(List<WkOrderItem> items) {
        if (items == null || items.isEmpty()) {
            return;
        }
        List<Long> itemIds = items.stream().map(WkOrderItem::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
        if (itemIds.isEmpty()) {
            return;
        }
        List<WaitPakinItem> allItems = waitPakinItemService.list(
                new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getAsnItemId, itemIds).eq(WaitPakinItem::getDeleted, 0));
        Map<Long, Double> sumByAsnItemId = allItems.stream()
                .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId,
                        Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
        sumByAsnItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
        for (WkOrderItem item : items) {
            if (item.getId() != null) {
                item.setPalletQty(sumByAsnItemId.getOrDefault(item.getId(), 0.0));
            }
        }
    }

}