From f5b4403dc7a305b1b90984911ceb8dbdc23d0db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=9D=BF?= Date: Sat, 10 Oct 2020 17:25:10 +0800 Subject: [PATCH] =?UTF-8?q?#feature/=E8=82=A1=E4=BB=BD=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=8F=E6=98=8E=E5=8C=96=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=AA=E7=A6=BB=E6=98=8C=E5=BC=82=E5=B8=B8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kas/dao/model/erp/VJmcKasFlowInfo.java | 174 ++++++++++++------ .../ils/kas/dao/model/order/OrderOtd.java | 143 ++++++++++++-- .../ils/kas/dao/model/order/OrderOtdLog.java | 142 ++++++++++++-- .../model/order/bo/OrderForCustcomerBo.java | 36 ++++ .../resources/mapper/order/OrderOtdMapper.xml | 11 ++ .../order/impl/SharesOrderServiceImpl.java | 17 +- 6 files changed, 428 insertions(+), 95 deletions(-) diff --git a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/erp/VJmcKasFlowInfo.java b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/erp/VJmcKasFlowInfo.java index 7d54f2a..d036031 100644 --- a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/erp/VJmcKasFlowInfo.java +++ b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/erp/VJmcKasFlowInfo.java @@ -247,8 +247,20 @@ public class VJmcKasFlowInfo extends Model { @TableField("temp_license") private String tempLicense; + @TableField("dtsuspend") + private Date suspendTime; + + @TableField("dtresume") + private Date resumeTime; + + @TableField("vcsusp_type") + private String suspType; + + @TableField("vcsusp_memo") + private String suspMemo; + public String getVcdn() { - return vcdn; + return this.vcdn; } public void setVcdn(String vcdn) { @@ -256,7 +268,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcdmsorderno() { - return vcdmsorderno; + return this.vcdmsorderno; } public void setVcdmsorderno(String vcdmsorderno) { @@ -264,7 +276,7 @@ public class VJmcKasFlowInfo extends Model { } public Integer getIcustomerid() { - return icustomerid; + return this.icustomerid; } public void setIcustomerid(Integer icustomerid) { @@ -272,7 +284,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVccustomer() { - return vccustomer; + return this.vccustomer; } public void setVccustomer(String vccustomer) { @@ -280,7 +292,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtorder() { - return dtorder; + return this.dtorder; } public void setDtorder(Date dtorder) { @@ -288,7 +300,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcvin() { - return vcvin; + return this.vcvin; } public void setVcvin(String vcvin) { @@ -296,7 +308,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcstyleno() { - return vcstyleno; + return this.vcstyleno; } public void setVcstyleno(String vcstyleno) { @@ -304,7 +316,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcstylename() { - return vcstylename; + return this.vcstylename; } public void setVcstylename(String vcstylename) { @@ -312,7 +324,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcdealerno() { - return vcdealerno; + return this.vcdealerno; } public void setVcdealerno(String vcdealerno) { @@ -320,7 +332,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcdealername() { - return vcdealername; + return this.vcdealername; } public void setVcdealername(String vcdealername) { @@ -328,7 +340,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcprovinceOrigin() { - return vcprovinceOrigin; + return this.vcprovinceOrigin; } public void setVcprovinceOrigin(String vcprovinceOrigin) { @@ -336,7 +348,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVccityOrigin() { - return vccityOrigin; + return this.vccityOrigin; } public void setVccityOrigin(String vccityOrigin) { @@ -344,7 +356,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcaddressOrigin() { - return vcaddressOrigin; + return this.vcaddressOrigin; } public void setVcaddressOrigin(String vcaddressOrigin) { @@ -352,7 +364,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcprovinceDest() { - return vcprovinceDest; + return this.vcprovinceDest; } public void setVcprovinceDest(String vcprovinceDest) { @@ -360,7 +372,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVccityDest() { - return vccityDest; + return this.vccityDest; } public void setVccityDest(String vccityDest) { @@ -368,7 +380,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcaddressDest() { - return vcaddressDest; + return this.vcaddressDest; } public void setVcaddressDest(String vcaddressDest) { @@ -376,7 +388,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcorderStat() { - return vcorderStat; + return this.vcorderStat; } public void setVcorderStat(String vcorderStat) { @@ -384,7 +396,7 @@ public class VJmcKasFlowInfo extends Model { } public Integer getItransmode() { - return itransmode; + return this.itransmode; } public void setItransmode(Integer itransmode) { @@ -392,7 +404,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVctransmode() { - return vctransmode; + return this.vctransmode; } public void setVctransmode(String vctransmode) { @@ -400,7 +412,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtoutFactory() { - return dtoutFactory; + return this.dtoutFactory; } public void setDtoutFactory(Date dtoutFactory) { @@ -408,7 +420,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtcache() { - return dtcache; + return this.dtcache; } public void setDtcache(Date dtcache) { @@ -416,7 +428,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtassign() { - return dtassign; + return this.dtassign; } public void setDtassign(Date dtassign) { @@ -424,7 +436,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDt2rail() { - return dt2rail; + return this.dt2rail; } public void setDt2rail(Date dt2rail) { @@ -432,7 +444,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtout3pl() { - return dtout3pl; + return this.dtout3pl; } public void setDtout3pl(Date dtout3pl) { @@ -440,7 +452,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtload() { - return dtload; + return this.dtload; } public void setDtload(Date dtload) { @@ -448,7 +460,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtonway() { - return dtonway; + return this.dtonway; } public void setDtonway(Date dtonway) { @@ -456,7 +468,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcdriver() { - return vcdriver; + return this.vcdriver; } public void setVcdriver(String vcdriver) { @@ -464,7 +476,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVclicense() { - return vclicense; + return this.vclicense; } public void setVclicense(String vclicense) { @@ -472,7 +484,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtdelivery() { - return dtdelivery; + return this.dtdelivery; } public void setDtdelivery(Date dtdelivery) { @@ -480,7 +492,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVctype() { - return vctype; + return this.vctype; } public void setVctype(String vctype) { @@ -488,7 +500,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVclocation() { - return vclocation; + return this.vclocation; } public void setVclocation(String vclocation) { @@ -496,7 +508,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtlocation() { - return dtlocation; + return this.dtlocation; } public void setDtlocation(Date dtlocation) { @@ -504,7 +516,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtcreate() { - return dtcreate; + return this.dtcreate; } public void setDtcreate(Date dtcreate) { @@ -512,7 +524,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcmemo() { - return vcmemo; + return this.vcmemo; } public void setVcmemo(String vcmemo) { @@ -520,7 +532,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtrefresh() { - return dtrefresh; + return this.dtrefresh; } public void setDtrefresh(Date dtrefresh) { @@ -528,7 +540,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtprint() { - return dtprint; + return this.dtprint; } public void setDtprint(Date dtprint) { @@ -536,7 +548,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtreturn() { - return dtreturn; + return this.dtreturn; } public void setDtreturn(Date dtreturn) { @@ -544,7 +556,7 @@ public class VJmcKasFlowInfo extends Model { } public Integer getIsupplierid() { - return isupplierid; + return this.isupplierid; } public void setIsupplierid(Integer isupplierid) { @@ -552,7 +564,7 @@ public class VJmcKasFlowInfo extends Model { } public String getVcsupplier() { - return vcsupplier; + return this.vcsupplier; } public void setVcsupplier(String vcsupplier) { @@ -560,7 +572,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtinsert() { - return dtinsert; + return this.dtinsert; } public void setDtinsert(Date dtinsert) { @@ -568,7 +580,7 @@ public class VJmcKasFlowInfo extends Model { } public Integer getBsuspend() { - return bsuspend; + return this.bsuspend; } public void setBsuspend(Integer bsuspend) { @@ -576,7 +588,7 @@ public class VJmcKasFlowInfo extends Model { } public Integer getBprocess() { - return bprocess; + return this.bprocess; } public void setBprocess(Integer bprocess) { @@ -584,7 +596,7 @@ public class VJmcKasFlowInfo extends Model { } public Date getDtprocess() { - return dtprocess; + return this.dtprocess; } public void setDtprocess(Date dtprocess) { @@ -592,7 +604,7 @@ public class VJmcKasFlowInfo extends Model { } public String getErrProc() { - return errProc; + return this.errProc; } public void setErrProc(String errProc) { @@ -600,33 +612,73 @@ public class VJmcKasFlowInfo extends Model { } public String getTempLicense() { - return tempLicense; + return this.tempLicense; } public void setTempLicense(String tempLicense) { this.tempLicense = tempLicense; } - @Override - protected Serializable pkVal() { - return this.vcdn; + public Date getSuspendTime() { + return this.suspendTime; + } + + public void setSuspendTime(Date suspendTime) { + this.suspendTime = suspendTime; + } + + public Date getResumeTime() { + return this.resumeTime; + } + + public void setResumeTime(Date resumeTime) { + this.resumeTime = resumeTime; + } + + public String getSuspType() { + return this.suspType; + } + + public void setSuspType(String suspType) { + this.suspType = suspType; + } + + public String getSuspMemo() { + return this.suspMemo; + } + + public void setSuspMemo(String suspMemo) { + this.suspMemo = suspMemo; } @Override public String toString() { - return "VJmcKasFlowInfo{" + ", vcdn=" + vcdn + ", vcdmsorderno=" + vcdmsorderno + ", icustomerid=" + icustomerid - + ", vccustomer=" + vccustomer + ", dtorder=" + dtorder + ", vcvin=" + vcvin + ", vcstyleno=" + vcstyleno - + ", vcstylename=" + vcstylename + ", vcdealerno=" + vcdealerno + ", vcdealername=" + vcdealername - + ", vcprovinceOrigin=" + vcprovinceOrigin + ", vccityOrigin=" + vccityOrigin + ", vcaddressOrigin=" - + vcaddressOrigin + ", vcprovinceDest=" + vcprovinceDest + ", vccityDest=" + vccityDest + ", vcaddressDest=" - + vcaddressDest + ", vcorderStat=" + vcorderStat + ", itransmode=" + itransmode + ", vctransmode=" + vctransmode - + ", dtoutFactory=" + dtoutFactory + ", dtcache=" + dtcache + ", dtassign=" + dtassign + ", dt2rail=" + dt2rail - + ", dtout3pl=" + dtout3pl + ", dtload=" + dtload + ", dtonway=" + dtonway + ", vcdriver=" + vcdriver - + ", vclicense=" + vclicense + ", dtdelivery=" + dtdelivery + ", vctype=" + vctype + ", vclocation=" - + vclocation + ", dtlocation=" + dtlocation + ", dtcreate=" + dtcreate + ", vcmemo=" + vcmemo + ", dtrefresh=" - + dtrefresh + ", dtprint=" + dtprint + ", dtreturn=" + dtreturn + ", isupplierid=" + isupplierid - + ", vcsupplier=" + vcsupplier + ", dtinsert=" + dtinsert + ", bsuspend=" + bsuspend + ", bprocess=" + bprocess - + ", dtprocess=" + dtprocess + ", errProc=" + errProc + ",tempLicense=" + tempLicense + "}"; + return "{" + " vcdn='" + getVcdn() + "'" + ", vcdmsorderno='" + getVcdmsorderno() + "'" + ", icustomerid='" + + getIcustomerid() + "'" + ", vccustomer='" + getVccustomer() + "'" + ", dtorder='" + getDtorder() + "'" + + ", vcvin='" + getVcvin() + "'" + ", vcstyleno='" + getVcstyleno() + "'" + ", vcstylename='" + getVcstylename() + + "'" + ", vcdealerno='" + getVcdealerno() + "'" + ", vcdealername='" + getVcdealername() + "'" + + ", vcprovinceOrigin='" + getVcprovinceOrigin() + "'" + ", vccityOrigin='" + getVccityOrigin() + "'" + + ", vcaddressOrigin='" + getVcaddressOrigin() + "'" + ", vcprovinceDest='" + getVcprovinceDest() + "'" + + ", vccityDest='" + getVccityDest() + "'" + ", vcaddressDest='" + getVcaddressDest() + "'" + ", vcorderStat='" + + getVcorderStat() + "'" + ", itransmode='" + getItransmode() + "'" + ", vctransmode='" + getVctransmode() + "'" + + ", dtoutFactory='" + getDtoutFactory() + "'" + ", dtcache='" + getDtcache() + "'" + ", dtassign='" + + getDtassign() + "'" + ", dt2rail='" + getDt2rail() + "'" + ", dtout3pl='" + getDtout3pl() + "'" + ", dtload='" + + getDtload() + "'" + ", dtonway='" + getDtonway() + "'" + ", vcdriver='" + getVcdriver() + "'" + + ", vclicense='" + getVclicense() + "'" + ", dtdelivery='" + getDtdelivery() + "'" + ", vctype='" + getVctype() + + "'" + ", vclocation='" + getVclocation() + "'" + ", dtlocation='" + getDtlocation() + "'" + ", dtcreate='" + + getDtcreate() + "'" + ", vcmemo='" + getVcmemo() + "'" + ", dtrefresh='" + getDtrefresh() + "'" + + ", dtprint='" + getDtprint() + "'" + ", dtreturn='" + getDtreturn() + "'" + ", isupplierid='" + + getIsupplierid() + "'" + ", vcsupplier='" + getVcsupplier() + "'" + ", dtinsert='" + getDtinsert() + "'" + + ", bsuspend='" + getBsuspend() + "'" + ", bprocess='" + getBprocess() + "'" + ", dtprocess='" + getDtprocess() + + "'" + ", errProc='" + getErrProc() + "'" + ", tempLicense='" + getTempLicense() + "'" + ", suspendTime='" + + getSuspendTime() + "'" + ", resumeTime='" + getResumeTime() + "'" + ", suspType='" + getSuspType() + "'" + + ", suspMemo='" + getSuspMemo() + "'" + "}"; + } + + @Override + protected Serializable pkVal() { + // TODO Auto-generated method stub + return null; } } diff --git a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtd.java b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtd.java index 2e19a02..ce077f7 100644 --- a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtd.java +++ b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtd.java @@ -265,6 +265,29 @@ public class OrderOtd extends Model { @TableField("bsuspend") private Integer bsuspend; + /* + * @Description: 首次挂起时间 + */ + @TableField(value = "suspend_time", strategy = FieldStrategy.IGNORED) + private Date suspendTime; + + /* + * @Description: 末次解挂时间 + */ + @TableField(value = "resume_time", strategy = FieldStrategy.IGNORED) + private Date resumeTime; + + /* + * @Description: 挂起类型 + */ + @TableField(value = "susp_type", strategy = FieldStrategy.IGNORED) + private String suspType; + + /* + * @Description: 挂起说明 + */ + @TableField("susp_memo") + private String suspMemo; /** * 临牌号 */ @@ -668,24 +691,110 @@ public class OrderOtd extends Model { this.tempLicense = tempLicense; } + public String getOProvince() { + return this.oProvince; + } + + public void setOProvince(String oProvince) { + this.oProvince = oProvince; + } + + public String getOCity() { + return this.oCity; + } + + public void setOCity(String oCity) { + this.oCity = oCity; + } + + public String getOAddress() { + return this.oAddress; + } + + public void setOAddress(String oAddress) { + this.oAddress = oAddress; + } + + public String getDProvince() { + return this.dProvince; + } + + public void setDProvince(String dProvince) { + this.dProvince = dProvince; + } + + public String getDCity() { + return this.dCity; + } + + public void setDCity(String dCity) { + this.dCity = dCity; + } + + public String getDAddress() { + return this.dAddress; + } + + public void setDAddress(String dAddress) { + this.dAddress = dAddress; + } + + public Date getSuspendTime() { + return this.suspendTime; + } + + public void setSuspendTime(Date suspendTime) { + this.suspendTime = suspendTime; + } + + public Date getResumeTime() { + return this.resumeTime; + } + + public void setResumeTime(Date resumeTime) { + this.resumeTime = resumeTime; + } + + public String getSuspType() { + return this.suspType; + } + + public void setSuspType(String suspType) { + this.suspType = suspType; + } + + public String getSuspMemo() { + return this.suspMemo; + } + + public void setSuspMemo(String suspMemo) { + this.suspMemo = suspMemo; + } + @Override public String toString() { - return "OrderOtd{" + "id=" + id + ", sysOrderNo='" + sysOrderNo + '\'' + ", customerOrderNo='" + customerOrderNo - + '\'' + ", customerNo='" + customerNo + '\'' + ", customerName='" + customerName + '\'' + ", orderDate=" - + orderDate + ", vin='" + vin + '\'' + ", styleCode='" + styleCode + '\'' + ", styleName='" + styleName + '\'' - + ", dealerNo='" + dealerNo + '\'' + ", dealerName='" + dealerName + '\'' + ", oProvince='" + oProvince + '\'' - + ", oCity='" + oCity + '\'' + ", oAddress='" + oAddress + '\'' + ", dProvince='" + dProvince + '\'' - + ", dCity='" + dCity + '\'' + ", dAddress='" + dAddress + '\'' + ", distance=" + distance + ", orderStatus='" - + orderStatus + '\'' + ", transportTypeCode=" + transportTypeCode + ", transportType='" + transportType + '\'' - + ", pickTime=" + pickTime + ", inboundTime=" + inboundTime + ", arrangeCapacityTime=" + arrangeCapacityTime - + ", enterRailwayTime=" + enterRailwayTime + ", outboundTime=" + outboundTime + ", loadTime=" + loadTime - + ", leaveTime=" + leaveTime + ", driverPhone='" + driverPhone + '\'' + ", licensePlate='" + licensePlate + '\'' - + ", planShiptoTime=" + planShiptoTime + ", shiptoTime=" + shiptoTime + ", shipmentType='" + shipmentType + '\'' - + ", newestPosition='" + newestPosition + '\'' + ", newestTime=" + newestTime + ", orderCreateTime=" - + orderCreateTime + ", remark='" + remark + '\'' + ", remarkDesc='" + remarkDesc + '\'' + ", way='" + way + '\'' - + ", gmtCreate=" + gmtCreate + ", gmtModified=" + gmtModified + ", printOrderTime=" + printOrderTime - + ", returnOrderTime=" + returnOrderTime + ", supplierid=" + supplierid + ", supplier='" + supplier + '\'' - + ", manualDriverPhone='" + manualDriverPhone + '\'' + ", manualShiptoTime=" + manualShiptoTime + ", bsuspend=" - + bsuspend + ",tempLicense='" + tempLicense + "'}"; + return "{" + " id='" + getId() + "'" + ", sysOrderNo='" + getSysOrderNo() + "'" + ", customerOrderNo='" + + getCustomerOrderNo() + "'" + ", customerNo='" + getCustomerNo() + "'" + ", customerName='" + getCustomerName() + + "'" + ", orderDate='" + getOrderDate() + "'" + ", vin='" + getVin() + "'" + ", styleCode='" + getStyleCode() + + "'" + ", styleName='" + getStyleName() + "'" + ", dealerNo='" + getDealerNo() + "'" + ", dealerName='" + + getDealerName() + "'" + ", oProvince='" + getOProvince() + "'" + ", oCity='" + getOCity() + "'" + + ", oAddress='" + getOAddress() + "'" + ", dProvince='" + getDProvince() + "'" + ", dCity='" + getDCity() + "'" + + ", dAddress='" + getDAddress() + "'" + ", distance='" + getDistance() + "'" + ", orderStatus='" + + getOrderStatus() + "'" + ", transportTypeCode='" + getTransportTypeCode() + "'" + ", transportType='" + + getTransportType() + "'" + ", pickTime='" + getPickTime() + "'" + ", inboundTime='" + getInboundTime() + "'" + + ", arrangeCapacityTime='" + getArrangeCapacityTime() + "'" + ", enterRailwayTime='" + getEnterRailwayTime() + + "'" + ", outboundTime='" + getOutboundTime() + "'" + ", loadTime='" + getLoadTime() + "'" + ", leaveTime='" + + getLeaveTime() + "'" + ", driverPhone='" + getDriverPhone() + "'" + ", licensePlate='" + getLicensePlate() + + "'" + ", planShiptoTime='" + getPlanShiptoTime() + "'" + ", shiptoTime='" + getShiptoTime() + "'" + + ", shipmentType='" + getShipmentType() + "'" + ", newestPosition='" + getNewestPosition() + "'" + + ", newestTime='" + getNewestTime() + "'" + ", orderCreateTime='" + getOrderCreateTime() + "'" + ", remark='" + + getRemark() + "'" + ", remarkDesc='" + getRemarkDesc() + "'" + ", way='" + getWay() + "'" + ", gmtCreate='" + + getGmtCreate() + "'" + ", gmtModified='" + getGmtModified() + "'" + ", printOrderTime='" + getPrintOrderTime() + + "'" + ", returnOrderTime='" + getReturnOrderTime() + "'" + ", supplierid='" + getSupplierid() + "'" + + ", supplier='" + getSupplier() + "'" + ", manualDriverPhone='" + getManualDriverPhone() + "'" + + ", manualShiptoTime='" + getManualShiptoTime() + "'" + ", bsuspend='" + getBsuspend() + "'" + + ", suspendTime='" + getSuspendTime() + "'" + ", resumeTime='" + getResumeTime() + "'" + ", suspType='" + + getSuspType() + "'" + ", suspMemo='" + getSuspMemo() + "'" + ", tempLicense='" + getTempLicense() + "'" + "}"; } + } diff --git a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtdLog.java b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtdLog.java index 6290a86..3f77281 100644 --- a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtdLog.java +++ b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/OrderOtdLog.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.io.Serializable; @@ -235,6 +236,30 @@ public class OrderOtdLog extends Model { @TableField("transport_type_code") private Integer transportTypeCode; + /* + * @Description: 首次挂起时间 + */ + @TableField(value = "suspend_time", strategy = FieldStrategy.IGNORED) + private Date suspendTime; + + /* + * @Description: 末次解挂时间 + */ + @TableField(value = "resume_time", strategy = FieldStrategy.IGNORED) + private Date resumeTime; + + /* + * @Description: 挂起类型 + */ + @TableField(value = "susp_type", strategy = FieldStrategy.IGNORED) + private String suspType; + + /* + * @Description: 挂起说明 + */ + @TableField("susp_memo") + private String suspMemo; + /** * 临牌号 */ @@ -598,24 +623,109 @@ public class OrderOtdLog extends Model { this.tempLicense = tempLicense; } + public String getOProvince() { + return this.oProvince; + } + + public void setOProvince(String oProvince) { + this.oProvince = oProvince; + } + + public String getOCity() { + return this.oCity; + } + + public void setOCity(String oCity) { + this.oCity = oCity; + } + + public String getOAddress() { + return this.oAddress; + } + + public void setOAddress(String oAddress) { + this.oAddress = oAddress; + } + + public String getDProvince() { + return this.dProvince; + } + + public void setDProvince(String dProvince) { + this.dProvince = dProvince; + } + + public String getDCity() { + return this.dCity; + } + + public void setDCity(String dCity) { + this.dCity = dCity; + } + + public String getDAddress() { + return this.dAddress; + } + + public void setDAddress(String dAddress) { + this.dAddress = dAddress; + } + + public Date getSuspendTime() { + return this.suspendTime; + } + + public void setSuspendTime(Date suspendTime) { + this.suspendTime = suspendTime; + } + + public Date getResumeTime() { + return this.resumeTime; + } + + public void setResumeTime(Date resumeTime) { + this.resumeTime = resumeTime; + } + + public String getSuspType() { + return this.suspType; + } + + public void setSuspType(String suspType) { + this.suspType = suspType; + } + + public String getSuspMemo() { + return this.suspMemo; + } + + public void setSuspMemo(String suspMemo) { + this.suspMemo = suspMemo; + } + @Override public String toString() { - return "OrderOtdLog{" + "id=" + id + ", callStartTime=" + callStartTime + ", callEndTime=" + callEndTime - + ", callUrl='" + callUrl + '\'' + ", sysOrderNo='" + sysOrderNo + '\'' + ", customerOrderNo='" - + customerOrderNo + '\'' + ", customerNo='" + customerNo + '\'' + ", customerName='" + customerName + '\'' - + ", orderDate=" + orderDate + ", vin='" + vin + '\'' + ", styleCode='" + styleCode + '\'' + ", styleName='" - + styleName + '\'' + ", dealerNo='" + dealerNo + '\'' + ", dealerName='" + dealerName + '\'' + ", oProvince='" - + oProvince + '\'' + ", oCity='" + oCity + '\'' + ", oAddress='" + oAddress + '\'' + ", dProvince='" + dProvince - + '\'' + ", dCity='" + dCity + '\'' + ", dAddress='" + dAddress + '\'' + ", transportType='" + transportType - + '\'' + ", pickTime=" + pickTime + ", inboundTime=" + inboundTime + ", arrangeCapacityTime=" - + arrangeCapacityTime + ", enterRailwayTime=" + enterRailwayTime + ", outboundTime=" + outboundTime - + ", loadTime=" + loadTime + ", leaveTime=" + leaveTime + ", driverPhone='" + driverPhone + '\'' - + ", licensePlate='" + licensePlate + '\'' + ", shiptoTime=" + shiptoTime + ", shipmentType='" + shipmentType - + '\'' + ", newestPosition='" + newestPosition + '\'' + ", newestTime=" + newestTime + ", orderCreateTime=" - + orderCreateTime + ", remark='" + remark + '\'' + ", gmtCreate=" + gmtCreate + ", printOrderTime=" - + printOrderTime + ", returnOrderTime=" + returnOrderTime + ", supplierid=" + supplierid + ", supplier='" - + supplier + '\'' + ", bsuspend=" + bsuspend + ", transportTypeCode=" + transportTypeCode + ",tempLicense='" - + tempLicense + "'}"; + return "{" + " id='" + getId() + "'" + ", callStartTime='" + getCallStartTime() + "'" + ", callEndTime='" + + getCallEndTime() + "'" + ", callUrl='" + getCallUrl() + "'" + ", sysOrderNo='" + getSysOrderNo() + "'" + + ", customerOrderNo='" + getCustomerOrderNo() + "'" + ", customerNo='" + getCustomerNo() + "'" + + ", customerName='" + getCustomerName() + "'" + ", orderDate='" + getOrderDate() + "'" + ", vin='" + getVin() + + "'" + ", styleCode='" + getStyleCode() + "'" + ", styleName='" + getStyleName() + "'" + ", dealerNo='" + + getDealerNo() + "'" + ", dealerName='" + getDealerName() + "'" + ", oProvince='" + getOProvince() + "'" + + ", oCity='" + getOCity() + "'" + ", oAddress='" + getOAddress() + "'" + ", dProvince='" + getDProvince() + "'" + + ", dCity='" + getDCity() + "'" + ", dAddress='" + getDAddress() + "'" + ", transportType='" + + getTransportType() + "'" + ", pickTime='" + getPickTime() + "'" + ", inboundTime='" + getInboundTime() + "'" + + ", arrangeCapacityTime='" + getArrangeCapacityTime() + "'" + ", enterRailwayTime='" + getEnterRailwayTime() + + "'" + ", outboundTime='" + getOutboundTime() + "'" + ", loadTime='" + getLoadTime() + "'" + ", leaveTime='" + + getLeaveTime() + "'" + ", driverPhone='" + getDriverPhone() + "'" + ", licensePlate='" + getLicensePlate() + + "'" + ", shiptoTime='" + getShiptoTime() + "'" + ", shipmentType='" + getShipmentType() + "'" + + ", newestPosition='" + getNewestPosition() + "'" + ", newestTime='" + getNewestTime() + "'" + + ", orderCreateTime='" + getOrderCreateTime() + "'" + ", remark='" + getRemark() + "'" + ", gmtCreate='" + + getGmtCreate() + "'" + ", printOrderTime='" + getPrintOrderTime() + "'" + ", returnOrderTime='" + + getReturnOrderTime() + "'" + ", supplierid='" + getSupplierid() + "'" + ", supplier='" + getSupplier() + "'" + + ", bsuspend='" + getBsuspend() + "'" + ", transportTypeCode='" + getTransportTypeCode() + "'" + + ", suspendTime='" + getSuspendTime() + "'" + ", resumeTime='" + getResumeTime() + "'" + ", suspType='" + + getSuspType() + "'" + ", suspMemo='" + getSuspMemo() + "'" + ", tempLicense='" + getTempLicense() + "'" + "}"; } + } diff --git a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/bo/OrderForCustcomerBo.java b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/bo/OrderForCustcomerBo.java index 13f3801..5143f3f 100644 --- a/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/bo/OrderForCustcomerBo.java +++ b/kas-dao/src/main/java/com/unlcn/ils/kas/dao/model/order/bo/OrderForCustcomerBo.java @@ -19,11 +19,47 @@ public class OrderForCustcomerBo { private String supplier; private String tempLicense; private Date refreshTime; + private Date suspendTime; + private Date resumeTime; + private String suspType; + private String suspMemo; + + public String getSuspMemo() { + return this.suspMemo; + } + + public void setSuspMemo(String suspMemo) { + this.suspMemo = suspMemo; + } public String getCustomerOrderCode() { return customerOrderCode; } + public String getSuspType() { + return suspType; + } + + public void setSuspType(String suspType) { + this.suspType = suspType; + } + + public Date getResumeTime() { + return resumeTime; + } + + public void setResumeTime(Date resumeTime) { + this.resumeTime = resumeTime; + } + + public Date getSuspendTime() { + return suspendTime; + } + + public void setSuspendTime(Date suspendTime) { + this.suspendTime = suspendTime; + } + public void setCustomerOrderCode(String customerOrderCode) { this.customerOrderCode = customerOrderCode; } diff --git a/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml b/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml index f690f87..b0f9811 100644 --- a/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml +++ b/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml @@ -49,6 +49,11 @@ + + + + + @@ -68,6 +73,11 @@ + + + + + @@ -243,6 +253,7 @@ (case when length(koo.driver_phone)>=30 then substr(koo.driver_phone,1,10) else koo.driver_phone end) driver_phone, koo.license_plate, (case when isnull(koo.leave_time)=1 then null else koo.shipto_time end) shipto_time, koo.plan_shipto_time,koo.newest_position,koo.newest_time,koo.d_province,koo.returnOrder_time,koo.gmt_modified, +koo.suspend_time,koo.resume_time,koo.susp_type,koo.susp_memo, kood.id AS detail_id, kood.track_time, kood.province, kood.city, kood.address, kood.longitude, kood.latitude, kood.distance FROM diff --git a/kas-service/src/main/java/com/unlcn/ils/kas/service/order/impl/SharesOrderServiceImpl.java b/kas-service/src/main/java/com/unlcn/ils/kas/service/order/impl/SharesOrderServiceImpl.java index 54a1d42..299d3db 100644 --- a/kas-service/src/main/java/com/unlcn/ils/kas/service/order/impl/SharesOrderServiceImpl.java +++ b/kas-service/src/main/java/com/unlcn/ils/kas/service/order/impl/SharesOrderServiceImpl.java @@ -1410,7 +1410,22 @@ public class SharesOrderServiceImpl implements SharesOrderService { if (!StringUtils.isEmpty(vJmcKasFlowInfo.getTempLicense())) { orderOtdLog.setTempLicense(vJmcKasFlowInfo.getTempLicense()); } - + // 首次挂起时间 + if (!StringUtils.isEmpty(vJmcKasFlowInfo.getSuspendTime())) { + orderOtdLog.setSuspendTime(vJmcKasFlowInfo.getSuspendTime()); + } + // 末次解挂时间 + if (!StringUtils.isEmpty(vJmcKasFlowInfo.getResumeTime())) { + orderOtdLog.setResumeTime(vJmcKasFlowInfo.getResumeTime()); + } + // 挂起类型 + if (!StringUtils.isEmpty(vJmcKasFlowInfo.getSuspType())) { + orderOtdLog.setSuspType(vJmcKasFlowInfo.getSuspType()); + } + // 挂起备注 + if (!StringUtils.isEmpty(vJmcKasFlowInfo.getSuspMemo())) { + orderOtdLog.setSuspMemo(vJmcKasFlowInfo.getSuspMemo()); + } return orderOtdLog; } -- Gitee