no message

skyouc

6 天以前 ce0f9490376709fdd96ce6b864bd105ac64f086c

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

@@ -100,7 +100,7 @@
        StringBuffer sbFaild = new StringBuffer();
        for (String key : listMap.keySet()) {
            if (StringUtils.isBlank(key)) {
                throw new CoolException("单号不能能为空！！");
                throw new CoolException("单号不能为空！！");
            }
            AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
            AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
@@ -129,16 +129,16 @@
            for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
                AsnOrderItem orderItem = new AsnOrderItem();
                if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
                    throw new CoolException(orderTemplate.getPoCode() + "：物料编码不能为空！！");
                    throw new CoolException(orderTemplate.getCode() + "：物料编码不能为空！！");
                }
                if (StringUtils.isBlank(orderTemplate.getAnfme())) {
                    throw new CoolException(orderTemplate.getPoCode() + "：数量不能能为空！！");
                    throw new CoolException(orderTemplate.getCode() + "：数量不能为空！！");
                }
                if (StringUtils.isBlank(orderTemplate.getType())) {
                    throw new CoolException(orderTemplate.getPoCode() + "：单据类型不能为空！！");
                    throw new CoolException(orderTemplate.getCode() + "：单据类型不能为空！！");
                }
                if (StringUtils.isBlank(orderTemplate.getWkType())) {
                    throw new CoolException(orderTemplate.getPoCode() + "：业务类型不能为空！！");
                    throw new CoolException(orderTemplate.getCode() + "：业务类型不能为空！！");
                }

                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
@@ -147,14 +147,14 @@
                    sbFaild.append(orderTemplate.getMatnrCode()).append("物料不存在");
                    throw new CoolException(sbFaild.toString());
                }
                String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
//                String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
                orderItem.setAsnId(order.getId())
                        .setAsnCode(order.getCode())
                        .setSplrBatch(orderTemplate.getSplrBatch())
//                        .setSplrBatch(orderTemplate.getSplrBatch())
                        .setPlatItemId(orderTemplate.getPlatItemId())
                        .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
                        .setTrackCode(trackCode)
                        .setBarcode(trackCode)
//                        .setTrackCode(trackCode)
//                        .setBarcode(trackCode)
                        .setPoCode(orderTemplate.getPoCode())
                        .setPurUnit(matnr.getUnit())
                        .setCreateBy(loginUserId)
@@ -212,10 +212,10 @@
    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 (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
//            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
//            asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
//        }
        if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
            Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
                    .eq(Companys::getId, asnOrderItem.getSplrCode())