#

LSH

2023-12-28 901dfbf8d57ffb54f9154e6d7db6899b9b4dcc92

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -142,8 +142,8 @@
        }


        OpenOrderPakinParam param = new OpenOrderPakinParam(param1);
        openService.pakinOrderCreate(param);
        OpenOrderPakmoveParam param = new OpenOrderPakmoveParam(param1);
        openService.pakmoveOrderCreate(param);
        return R.ok();
    }


 src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java

@@ -51,6 +51,18 @@
            this.owner=owner;
            this.entryId=entryId;
        }

        public DetlDto2(String matnr, String maktx, String batch, String specs, Double anfme, String owner, int entryId, String sourceLocName, String targetLocName) {
            this.matnr = matnr;
            this.maktx = maktx;
            this.batch = batch;
            this.specs = specs;
            this.anfme = anfme;
            this.owner = owner;
            this.entryId = entryId;
            this.sourceLocName = sourceLocName;
            this.targetLocName = targetLocName;
        }
    }

}

 src/main/java/com/zy/asrs/entity/param/OpenOrderPakmoveParam.java

New file
@@ -0,0 +1,44 @@
package com.zy.asrs.entity.param;

import com.zy.common.model.DetlDto;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by vincent on 2022/4/8
 */
@Data
public class OpenOrderPakmoveParam {

    private String formid;

    private String orderNo;

    private String orderType;

    private String orderTime;

    private List<DetlDto> orderDetails;

    public OpenOrderPakmoveParam(){}

    public OpenOrderPakmoveParam(OpenOrderPakinJDParam param1){
        this.orderNo=param1.getOrderNo();
        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
        this.orderType=kingDeeUtilType.desc;
        this.orderTime=param1.getCreateDate();
        List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
        List<DetlDto> dtos = new ArrayList<>();
        for (OpenOrderPakinJDParam.DetlDto2 detlDto2:matList){
            DetlDto detlDto = new DetlDto(detlDto2);
            detlDto.setSourceLocName(detlDto2.getSourceLocName());
            detlDto.setTargetLocName(detlDto2.getTargetLocName());
            dtos.add(detlDto);
        }
        this.orderDetails = dtos;
    }

}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -14,6 +14,8 @@
     */
    void pakinOrderCreate(OpenOrderPakinParam param);

    void pakmoveOrderCreate(OpenOrderPakmoveParam param);

    /**
     * 入库单回写
     */

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -276,6 +276,122 @@

    @Override
    @Transactional
    public void pakmoveOrderCreate(OpenOrderPakmoveParam param) {
        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
            throw new CoolException(param.getOrderNo() + "单据已存在，请勿重复提交");
        }

        for (DetlDto detlDto : param.getOrderDetails()){
            if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(),detlDto.getPayment())){
                throw new CoolException(param.getOrderNo() + "缺少货主或货物形态");
            }else {
                LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
                if (Cools.isEmpty(locOwner)){
                    LocOwner locOwner1 = new LocOwner();
                    locOwner1.setOwner(detlDto.getOwnerName());
                    locOwnerService.insert(locOwner1);
                }
            }
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        Date now = new Date();
        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
                null,    // 销售或采购费用合计
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                null,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
                null,    // 发货时间
                null,    // 物流名称
                null,    // 物流单号
                1L,    // 订单状态
                1,    // 状态
                9527L,    // 添加人员
                now,    // 添加时间
                9527L,    // 修改人员
                now,    // 修改时间
                null    // 备注
        );
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
        // 单据明细档
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getOrderDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
            dto.setBeBatch(detail.getBeBatch());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
            } else {
                list.add(dto);
            }
            dto.setWeight(detail.getWeight());
        }
        for (DetlDto detlDto : list) {
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);

            //批号为空会出现问题，设置一个默认值
            if (detlDto.getBatch() == null) {
                orderDetl.setBatch("");
            } else {
                orderDetl.setBatch(detlDto.getBatch());

            }
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
            if (Cools.isEmpty(locOwner)){
                throw new CoolException("生成单据明细失败，请联系管理员");
            }else {
                orderDetl.setOwner(locOwner.getId());
            }
            orderDetl.setPayment(detlDto.getPayment());
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setBeBatch(detlDto.getBeBatch());
            orderDetl.setWeight(detlDto.getWeight());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }
    }

    @Override
    @Transactional
    public List<StockVo> queryStock(StockVo stockVo) {
        return locDetlService.queryStockTotal(stockVo);
    }

 src/main/java/com/zy/common/model/DetlDto.java

@@ -29,6 +29,10 @@

    private Double weight;

    private String sourceLocName;//源仓库
    private String targetLocName;//目标仓库


    public DetlDto() {
    }