1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

skyouc

9 天以前 0696db2f8a83d32d8c00ba55967694ed1a76f4d0

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

@@ -17,6 +17,7 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
@@ -24,6 +25,7 @@
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.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.service.FieldsItemService;
@@ -35,7 +37,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

@@ -55,6 +56,9 @@

    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Autowired
    private CompanysService companysService;

    @Override
    public R generateBarcode(List<Long> orders) {
@@ -91,13 +95,15 @@
        }
        List<AsnOrderTemplate> resultList = result.getList();
        Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
        StringBuffer sbFaild = new StringBuffer();
        for (String key : listMap.keySet()) {
            AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
            AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
            if (Objects.isNull(asnOrder)) {
            AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
            if (!Objects.isNull(order)) {
                sbFaild.append(template.getCode()).append(",已添加！！");
                continue;
            }
            AsnOrder order = new AsnOrder();
            order = new AsnOrder();
            order.setCode(template.getCode())
                    .setPoCode(template.getPoCode())
                    .setMemo(template.getMemo())
@@ -112,28 +118,44 @@
            List<AsnOrderItem> items = new ArrayList<>();
            for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
                AsnOrderItem orderItem = new AsnOrderItem();
                Matnr matnr = null;
                if (!Objects.isNull(orderTemplate.getMatnrCode()) || StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
                    matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
                            .eq(Matnr::getCode, orderTemplate.getMatnrCode()));
                if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
                    continue;
                }
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
                        .eq(Matnr::getCode, orderTemplate.getMatnrCode()));
                if (Objects.isNull(matnr)) {
                    sbFaild.append(orderTemplate.getMatnrCode()).append("物料不存在");
                    continue;
                }
                orderItem.setAsnId(order.getId())
                        .setAsnCode(order.getCode())
                        .setSplrBatch(orderTemplate.getSplrBatch())
                        .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
                        .setQty(Double.parseDouble(orderTemplate.getQty()))
                        .setSplrName(orderTemplate.getSplrName())
                        .setBarcode(orderTemplate.getBarcode())
                        .setTrackCode(orderTemplate.getTrackCode())
                        .setSplrCode(orderTemplate.getSplrCode())
                        .setPoCode(orderTemplate.getPoCode())
                        .setMaktx(orderTemplate.getMaktx())
                        .setMatnrCode(orderTemplate.getMatnrCode())
                        .setPurUnit(orderTemplate.getPurUnit())
                        .setPurQty(Double.parseDouble(orderTemplate.getPurQty()));
                if (!Objects.isNull(matnr)) {
                    orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setSpec(matnr.getSpec())
                        .setModel(matnr.getModel())
                        .setPurQty(Double.parseDouble(orderTemplate.getPurQty()))
                        .setMaktx(matnr.getName())
                        .setMatnrCode(matnr.getCode())
                        .setMatnrId(matnr.getId())
                        .setStockUnit(matnr.getUnit());
                if (!Objects.isNull(orderTemplate.getSplrCode())) {
                    Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderTemplate.getSplrCode()));
                    if (!Objects.isNull(companys)) {
                        orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
                    } else {
                        orderItem.setSplrCode(orderTemplate.getSplrCode()).setSplrName(orderTemplate.getSplrName() + "(供应商不存在！！)");
                    }
                } else {
                    continue;
                }

                items.add(orderItem);
                if (!asnOrderItemService.saveBatch(items)) {
                    throw new CoolException("单据明细保存失败！！");
@@ -141,18 +163,22 @@
            }
            if (!items.isEmpty()) {
                double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
                double purQty = items.stream().mapToDouble(AsnOrderItem::getPurQty).sum();
                if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>().set(AsnOrder::getQty, qty).set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
                double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
                if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>()
                        .set(AsnOrder::getQty, qty)
                        .set(AsnOrder::getAnfme, anfme)
                        .eq(AsnOrder::getId, order.getId()))) {
                    throw new CoolException("单据数量修改失败！！");
                }
            }
        }

        return R.ok("操作成功！！");
        return R.ok("操作成功," + sbFaild.toString());
    }

    /**
     * @param
     * @param loginUserId
     * @return
     * @author Ryan
     * @description ASN明细单据保存，及扩展字段保存
@@ -160,12 +186,12 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean fieldsSave(Map<String, Object> params) {
    public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
        AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
        asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
        if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
            asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);

        }
        if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
            throw new CoolException("计划数不能为空！！");
@@ -197,7 +223,6 @@
        }
        hsahMap.setRecords(FieldsUtils.getExtendFields(hsahMap.getRecords()));
        return hsahMap;

    }

}