src/main/java/com/zy/asrs/entity/Order.java

@@ -285,6 +285,13 @@
    @TableField("pakin_pakout_status")
    private Integer pakinPakoutStatus;

    /**
     * 开票客户名称
     */
    @ApiModelProperty(value = "开票客户名称")
    @TableField("kp_cstmr_name")
    private String kpCstmrName;

    public Order() {
    }

@@ -363,6 +370,45 @@
        this.pakinPakoutStatus = pakinPakoutStatus;
    }

    public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, String kpCstmrName) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
        this.docType = docType;
        this.itemId = itemId;
        this.itemName = itemName;
        this.allotItemId = allotItemId;
        this.defNumber = defNumber;
        this.number = number;
        this.cstmr = cstmr;
        this.cstmrName = cstmrName;
        this.tel = tel;
        this.operMemb = operMemb;
        this.totalFee = totalFee;
        this.discount = discount;
        this.discountFee = discountFee;
        this.otherFee = otherFee;
        this.actFee = actFee;
        this.payType = payType;
        this.salesman = salesman;
        this.accountDay = accountDay;
        this.postFeeType = postFeeType;
        this.postFee = postFee;
        this.payTime = payTime;
        this.sendTime = sendTime;
        this.shipName = shipName;
        this.shipCode = shipCode;
        this.settle = settle;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.pakinPakoutStatus = pakinPakoutStatus;
        this.kpCstmrName = kpCstmrName;
    }

    public Order(Order order) {
        this.uuid = order.getUuid();
        this.orderNo = order.getOrderNo();

 src/main/java/com/zy/asrs/entity/OrderPakout.java

@@ -278,6 +278,13 @@
    @TableField("pakin_pakout_status")
    private Integer pakinPakoutStatus;

    /**
     * 开票客户名称
     */
    @ApiModelProperty(value = "开票客户名称")
    @TableField("kp_cstmr_name")
    private String kpCstmrName;

    public OrderPakout() {}

    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -310,6 +310,27 @@
    @TableField("box_type3")
    private String boxType3 = "";

    /**
     * 库存
     */
    @ApiModelProperty(value = "库存")
    @TableField("stock_num")
    private Double stockNum;

    /**
     * 开票客户名称
     */
    @ApiModelProperty(value = "开票客户名称")
    @TableField("kp_cstmr_name")
    private String kpCstmrName;

    /**
     * 辅库存
     */
    @ApiModelProperty(value = "辅库存")
    @TableField("stock_num2")
    private Double stockNum2;

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -310,6 +310,27 @@
    @TableField("box_type3")
    private String boxType3 = "";

    /**
     * 库存
     */
    @ApiModelProperty(value = "库存")
    @TableField("stock_num")
    private Double stockNum;

    /**
     * 开票客户名称
     */
    @ApiModelProperty(value = "开票客户名称")
    @TableField("kp_cstmr_name")
    private String kpCstmrName;

    /**
     * 辅库存
     */
    @ApiModelProperty(value = "辅库存")
    @TableField("stock_num2")
    private Double stockNum2;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

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

@@ -35,6 +35,8 @@

    private String cstmrName;

    private String kpCstmrName;


//    public static void main(String[] args) {
//        OpenOrderPakoutParam param = new OpenOrderPakoutParam();

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

@@ -600,6 +600,7 @@
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    one.setWeight(one.getWeight() + detlDto.getWeight());
                } else {
                    detlDtos.add(detlDto);
                }
@@ -670,6 +671,7 @@
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    one.setWeight(one.getWeight() + detlDto.getWeight());
                } else {
                    detlDtos.add(detlDto);
                }

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

@@ -106,7 +106,8 @@
                9527L,    // 修改人员
                now,    // 修改时间
                null,   // 备注
                1
                1,
                null
        );

        if (!orderService.insert(order)) {
@@ -278,7 +279,8 @@
                9527L,    // 修改人员
                now,    // 修改时间
                null,    // 备注
                2
                2,
                param.getKpCstmrName()
        );
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");

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

@@ -482,6 +482,19 @@
                        , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());

            }

            Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
                    .eq("loc_no", wrkMast.getSourceLocNo())
                    .eq("matnr", orderDetlPakout.getMatnr());
            if (!Cools.isEmpty(locDto.getBatch())) {
                wrapper.eq("batch", locDto.getBatch());
            }
            if (!Cools.isEmpty(orderDetlPakout.getSpecs())) {
                wrapper.eq("specs", orderDetlPakout.getSpecs());
            }

            LocDetl locDetl = locDetlService.selectOne(wrapper);

            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetlPakout);
            wrkDetl.setZpallet(wrkMast.getBarcode());
@@ -496,6 +509,9 @@
            wrkDetl.setModiUser(userId);
            wrkDetl.setThreeCode(orderDetlPakout.getId() + "");
            wrkDetl.setSupp(orderPakout.getCstmrName());
            wrkDetl.setStockNum(locDetl.getAnfme());//库存
            wrkDetl.setStockNum2(locDetl.getWeight());//辅库存
            wrkDetl.setKpCstmrName(orderPakout.getKpCstmrName());

            //计算辅数量
            Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());

 src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java

@@ -439,6 +439,16 @@
     */
    private String fhckmc;

    /**
     *
     */
    private String kpkhbm;

    /**
     *
     */
    private String kpkhmc;

    @Override
    public boolean equals(Object that) {
        if (this == that) {

 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java

@@ -102,6 +102,7 @@
                    nccSaleXsfhmxWms.setWmsFlag(1);
                    param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
                    param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
                    param.setKpCstmrName(nccSaleXsfhmxWms.getKpkhmc());
                }
                param.setOrderDetails(orderDetails);
                openService.pakoutOrderCreate(param);

 src/main/resources/mapper/asrs/OrderMapper.xml

@@ -41,6 +41,7 @@
        <result column="memo" property="memo" />
        <result column="move_status" property="moveStatus" />
        <result column="pakin_pakout_status" property="pakinPakoutStatus" />
        <result column="kp_cstmr_name" property="kpCstmrName" />

    </resultMap>


 src/main/resources/mapper/asrs/OrderPakoutMapper.xml

@@ -41,6 +41,7 @@
        <result column="memo" property="memo" />
        <result column="move_status" property="moveStatus" />
        <result column="pakin_pakout_status" property="pakinPakoutStatus" />
        <result column="kp_cstmr_name" property="kpCstmrName" />

    </resultMap>


 src/main/resources/mapper/asrs/WrkDetlLogMapper.xml

@@ -51,6 +51,9 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="stock_num" property="stockNum" />
        <result column="kp_cstmr_name" property="kpCstmrName" />
        <result column="stock_num2" property="stockNum2" />
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/asrs/WrkDetlMapper.xml

@@ -51,6 +51,9 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="stock_num" property="stockNum" />
        <result column="kp_cstmr_name" property="kpCstmrName" />
        <result column="stock_num2" property="stockNum2" />
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml

@@ -79,6 +79,8 @@
            <result property="kczzmc" column="KCZZMC" />
            <result property="vnote" column="VNOTE" />
            <result property="wmsFlag" column="wms_flag" />
            <result property="kpkhbm" column="KPKHBM" />
            <result property="kpkhmc" column="KPKHMC" />
        <result property="wmsMemo" column="wms_memo" />
    </resultMap>