#

lsh

2024-09-19 6ffb8e752717f0408ce01682343cfff1947f7cef

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java

@@ -95,21 +95,42 @@
            if (Cools.isEmpty(mat)) {
                throw new CoolException(matParam.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setBatch(matParam.getBatch());
            orderDetl.setAnfme(matParam.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            if (!orderDetlService.save(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
                    .eq(OrderDetl::getOrderNo, order.getOrderNo()).eq(OrderDetl::getBatch,matParam.getBatch())
                    .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
                    .eq(OrderDetl::getSuppCode, matParam.getOriginNo()).eq(OrderDetl::getUnit,matParam.getUnit())
            );
            if (Cools.isEmpty(orderDetl1)){
                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                orderDetl.setBatch(matParam.getBatch());
                orderDetl.setAnfme(matParam.getAnfme());
                orderDetl.setUnit(matParam.getUnit());
                orderDetl.setThreeCode(matParam.getWarehouse());//仓库号
                orderDetl.setSupp(matParam.getOrigin());//来源单号
                orderDetl.setSuppCode(matParam.getOriginNo());//来源序号
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.save(orderDetl)) {
                    throw new CoolException("生成单据明细失败，请联系管理员");
                }
            } else {
                orderDetl1.setAnfme(matParam.getAnfme());
                orderDetl1.setUpdateBy(9527L);
                orderDetl1.setUpdateTime(now);
                orderDetl1.setStatus(1);
                orderDetl1.setQty(0.0D);
                if (!orderDetlService.updateById(orderDetl1)) {
                    throw new CoolException("更新单据明细失败，请联系管理员");
                }
            }

        }
    }

@@ -181,6 +202,9 @@
            orderDetl.setAnfme(matParam.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setThreeCode(matParam.getWarehouse());//仓库号
            orderDetl.setSupp(matParam.getOrigin());//来源单号
            orderDetl.setSuppCode(matParam.getOriginNo());//来源序号
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
@@ -247,6 +271,24 @@
            mat.setMatnr(matParam.getMatnr());//物料号
            mat.setHostId(hostId);//仓库ID
            mat.setTagId(tag.getId());//分类ID
            if (!Cools.isEmpty(matParam.getShopCategory())) {
                Tag shopTag = tagService.getOne(new LambdaQueryWrapper<Tag>()
                        .eq(Tag::getName, matParam.getShopCategory())
                        .eq(Tag::getHostId, hostId));
                if (shopTag == null) {
                    //商品分类为空，创建商品分类
                    shopTag = new Tag();
                    shopTag.setName(matParam.getShopCategory());
                    shopTag.setParentId(tag.getId());
                    shopTag.setStatus(1);
                    shopTag.setHostId(hostId);
                    shopTag.setCreateTime(new Date());
                    shopTag.setUpdateTime(new Date());
                    tagService.save(shopTag);
                }
                mat.setTagId(shopTag.getId());//分类ID
            }

            if (!Cools.isEmpty(matParam.getMaktx())) {
                mat.setMaktx(matParam.getMaktx());
            }
@@ -338,7 +380,7 @@
                mat.setUnits(matParam.getUnits());
            }
            if (!Cools.isEmpty(matParam.getLength())) {
                mat.setLength(Double.parseDouble(matParam.getLength()));
                mat.setLength(matParam.getLength());
            }
            if (!Cools.isEmpty(matParam.getWidth())) {
                mat.setWidth(matParam.getWidth());
@@ -346,6 +388,15 @@
            if (!Cools.isEmpty(matParam.getHeight())) {
                mat.setHeight(matParam.getHeight());
            }
            if (!Cools.isEmpty(matParam.getAccountingClass())) {
                mat.setAccountingClass(matParam.getAccountingClass());
            }
            if (!Cools.isEmpty(matParam.getBatch())) {
                mat.setBatch(matParam.getBatch());
            }
            if (!Cools.isEmpty(matParam.getInventoryAccount())) {
                mat.setInventoryAccount(matParam.getInventoryAccount());
            }

            if (matService.save(mat)) {
                count++;