#

zjj

2024-09-10 6ef5d115862da9aa5e8028315c8ee2ed9de087ac

#

 license.lic

Binary files differ

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

@@ -180,44 +180,7 @@
            }
        }

    public static void main(String[] args) {
        // 1
        System.out.println("======================================");
        OpenOrderPakinParam param = new OpenOrderPakinParam();
        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
        param.setOrderType("打包上线单");
        param.setOrderTime(DateUtils.convert(new Date()));
        List<DetlDto> orderDetails = new ArrayList<>();
        param.setOrderDetails(orderDetails);
        for (int i = 0; i < 3; i++) {
            DetlDto detlDto = new DetlDto();
            switch (i) {
                case 0:
                    detlDto.setMatnr("MDH020030530");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(18.0);
                    break;
                case 1:
                    detlDto.setMatnr("MDH020016416");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(32.0);
                    break;
                case 2:
                    detlDto.setMatnr("LSH90152025");
                    detlDto.setAnfme(50.0);
                    break;
                default:
                    break;
            }
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }



    /**

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

@@ -6,11 +6,11 @@

@Data
public class GTOrderParam {
    private Integer orderId; // 单据id
    private Integer orderName; //单据名称
    private String orderType; //单据名称
    private String inboundDate; //日期
    private String orderNo; // 单据号
    private String warehouse; //仓库
    private String originWarehouse; //来源仓库
    private String suppliers; // 供应商
    private String salesman; //业务员
    private String department; //部门

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

@@ -11,12 +11,18 @@
@Data
public class OpenOrderPakinParam {

    private String orderNo;
    private String orderType; //单据名称
    private String inboundDate; //日期
    private String orderNo; // 单据号
    private String warehouse; //仓库
    private String originWarehouse; //来源仓库
    private String suppliers; // 供应商
    private String salesman; //业务员
    private String department; //部门
    private String businessType; //业务类型
    private String user; //制单人

    private String orderType;

    private String orderTime;

    private List<DetlDto> orderDetails;
    private List<DetlDto> orderDetails; //物料列表

}

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

@@ -15,26 +15,21 @@
@Data
public class OpenOrderPakoutParam {

    private String orderNo;

    private String orderType;

    private String orderTime;
    private String orderType; //单据名称
    private String inboundDate; //日期
    private String orderNo; // 单据号
    private String warehouse; //仓库
    private String originWarehouse; //来源仓库
    private String suppliers; // 供应商
    private String salesman; //业务员
    private String department; //部门
    private String businessType; //业务类型
    private String user; //制单人

    private List<DetlDto> orderDetails;

    private String lgort;

    public static void main(String[] args) {
        OpenOrderPakoutParam param = new OpenOrderPakoutParam();
        param.setOrderNo("LXT12321321");
        param.setOrderType("交货单");
        param.setOrderTime(DateUtils.convert(new Date()));
        List<DetlDto> orderDetails = new ArrayList<>();
        param.setOrderDetails(orderDetails);
        DetlDto detlDto = new DetlDto("15099-10000", 3.0);
        orderDetails.add(detlDto);
        System.out.println(JSON.toJSONString(param));
    }


}

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

@@ -431,7 +431,7 @@
            String orderNo = "PACK" + snowflakeIdWorker.nextId();
            OpenOrderPakinParam openParam = new OpenOrderPakinParam();
            openParam.setOrderNo(orderNo);
            openParam.setOrderTime(DateUtils.convert(now));
            openParam.setInboundDate(DateUtils.convert(now));
            openParam.setOrderType("打包入库单");
            openParam.setOrderDetails(detlDtos);
            openService.pakinOrderCreate(openParam);

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

@@ -64,30 +64,30 @@
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                param.getInboundDate(),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getWarehouse(),    //仓库 itemName
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                param.getOriginWarehouse(),    // 初始票据号 来源仓库
                param.getDepartment(),    // 票据号
                null,    // 客户编号
                null,    // 客户
                param.getSuppliers(),    // 供应商 cstmrName
                null,    // 联系方式
                null,    // 操作人员
                param.getUser(),    // 制单人
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
                null,    // 销售或采购费用合计
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                param.getSalesman(),    // 业务员
                null,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
                null,    // 发货时间
                null,    // 物流名称
                param.getBusinessType(),    // 物流名称
                null,    // 物流单号
                1L,    // 订单状态
                1,    // 状态
@@ -130,6 +130,9 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setThreeCode(detlDto.getOrderNo());
            orderDetl.setSuppCode(detlDto.getFromOrderNo());
            orderDetl.setMemo(detlDto.getMemo());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
@@ -199,30 +202,30 @@
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                param.getInboundDate(),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getWarehouse(),    //仓库 itemName
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                param.getOriginWarehouse(),    // 初始票据号 来源仓库
                param.getDepartment(),    // 票据号
                null,    // 客户编号
                null,    // 客户
                param.getSuppliers(),    // 供应商 cstmrName
                null,    // 联系方式
                null,    // 操作人员
                param.getUser(),    // 制单人
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
                null,    // 销售或采购费用合计
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                param.getSalesman(),    // 业务员
                null,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
                null,    // 发货时间
                null,    // 物流名称
                param.getBusinessType(),    // 物流名称
                null,    // 物流单号
                1L,    // 订单状态
                1,    // 状态
@@ -265,6 +268,9 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setThreeCode(detlDto.getOrderNo());
            orderDetl.setSuppCode(detlDto.getFromOrderNo());
            orderDetl.setMemo(detlDto.getMemo());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }

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

@@ -114,7 +114,7 @@
                // 生成入库单据
                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动入库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakinOrderCreate(openParam);
@@ -122,7 +122,7 @@
                // 生成出库单据
                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动出库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakoutOrderCreate(openParam);

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

@@ -13,13 +13,13 @@
@Data
public class DetlDto {

    private String orderNo;

    private String matnr;

    private String batch;

    private Double anfme;
    private String matnr; //物料编码
    private String maktx; //物料名称
    private String batch; //批次
    private Double anfme; //数量
    private String orderNo; //订单号
    private String fromOrderNo; //来源单号
    private String memo; //备注

    public DetlDto() {
    }