blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhou zhou
13 小时以前 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java


@@ -5,6 +5,7 @@




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.fasterxml.jackson.annotation.JsonFormat;


import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;


import com.vincent.rsf.server.manager.enums.OrderType;


import com.vincent.rsf.server.manager.enums.OrderWorkType;


import com.vincent.rsf.server.system.constant.DictTypeCode;


@@ -19,6 +20,7 @@


import com.baomidou.mybatisplus.annotation.TableId;


import com.baomidou.mybatisplus.annotation.TableLogic;


import com.baomidou.mybatisplus.annotation.TableName;


import com.baomidou.mybatisplus.annotation.Version;


import io.swagger.annotations.ApiModelProperty;


import lombok.Data;


import com.vincent.rsf.framework.common.Cools;


@@ -170,6 +172,9 @@


    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")


    private Date updateTime;




    @Version


    private Integer version;




    /**


     * 备注


@@ -343,6 +348,30 @@


        this.memo = memo;


    }




    public WkOrder(SyncOrderParams syncOrderParams) {


//        this.reportOnce = syncOrderParams.getre();


//        this.businessTime = syncOrderParams.getBusinessTime().toString();


        this.stationId = syncOrderParams.getStationId();


        this.orderInternalCode = syncOrderParams.getOrderInternalCode().toString();


        this.stockDirect = syncOrderParams.getStockDirect();


        this.customerId = syncOrderParams.getCustomerId();


        this.customerName = syncOrderParams.getCustomerName();


        this.supplierId = syncOrderParams.getSupplierId();


        this.supplierName = syncOrderParams.getSupplierName();


        this.stockOrgId = syncOrderParams.getStockOrgId();


        this.stockOrgName = syncOrderParams.getStockOrgName();


        this.purchaseOrgId = syncOrderParams.getPurchaseOrgId();


        this.purchaseOrgName = syncOrderParams.getPurchaseOrgName();


        this.purchaseUserId = syncOrderParams.getPurchaseUserId();


        this.purchaseUserName = syncOrderParams.getPurchaseUserName();


        this.prdOrgId = syncOrderParams.getPrdOrgId();


        this.prdOrgName = syncOrderParams.getPrdOrgName();


        this.saleOrgId = syncOrderParams.getSaleOrgId();


        this.saleOrgName = syncOrderParams.getSaleOrgName();


        this.saleUserId = syncOrderParams.getSaleUserId();


        this.saleUserName = syncOrderParams.getSaleUserName();


    }




    public String getExceStatus$() {


        if (Cools.isEmpty(this.exceStatus)) {


            return "";