#

Junjie

5 天以前 74482772cca58f201697c017eb5fb15c59cafb31

#

 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() {
    }

@@ -325,7 +332,7 @@
        this.memo = memo;
    }

    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) {
    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;
@@ -361,6 +368,7 @@
        this.updateTime = updateTime;
        this.memo = memo;
        this.pakinPakoutStatus = pakinPakoutStatus;
        this.kpCstmrName = kpCstmrName;
    }

    public Order(Order order) {

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

@@ -317,6 +317,13 @@
    @TableField("stock_num")
    private Double stockNum;

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

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

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

@@ -317,6 +317,13 @@
    @TableField("stock_num")
    private Double stockNum;

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

    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/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/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/WrkDetlLogMapper.xml

@@ -52,6 +52,7 @@
        <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" />
    </resultMap>

    <sql id="batchSeq">

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

@@ -52,6 +52,7 @@
        <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" />
    </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>