From 00c664d20db68b93bdbd5e575f25a6241500b188 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 21 Aug 2024 18:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/plugin/lets/dao/IIcGeneralBDao.java | 1 + .../lets/dao/impl/IcGeneralBDaoImpl.java | 7 + .../plugin/lets/entity/IcGeneralBEntity.java | 1723 +---------------- .../plugin/lets/entity/IcGeneralBEntity.xml | 238 ++- .../plugin/lets/entity/IcGeneralHEntity.xml | 4 +- .../transfer/TransferInPluginInitializer.java | 57 +- .../TransferOutPluginInitializer.java | 4 + .../lets/plugin/transfer/TransferTest.java | 4 +- .../OFSTranseferOrderSearchResponse.java | 2 +- 9 files changed, 303 insertions(+), 1737 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IIcGeneralBDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IIcGeneralBDao.java index bb58decf..1f6e4fa1 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IIcGeneralBDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IIcGeneralBDao.java @@ -16,6 +16,7 @@ public interface IIcGeneralBDao extends IBaseDao { * 根据cgeneralhid表头主键查询 */ public List queryByCgeneralhid(String cgeneralhid); + public List queryAndCinvbasCode(String cgeneralhid); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/IcGeneralBDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/IcGeneralBDaoImpl.java index 43d1791c..91d1bee5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/IcGeneralBDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/IcGeneralBDaoImpl.java @@ -1,6 +1,8 @@ package com.hzya.frame.plugin.lets.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant; import com.hzya.frame.plugin.lets.dao.IIcGeneralBDao; import com.hzya.frame.plugin.lets.entity.IcGeneralBEntity; @@ -18,5 +20,10 @@ public class IcGeneralBDaoImpl extends MybatisGenericDao queryByCgeneralhid(String cgeneralhid) { return query("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryByCgeneralhid",cgeneralhid); } + @Override + @DS(ProfilesActiveConstant.LETS_DATE_SOURCE) + public List queryAndCinvbasCode(String cgeneralhid) { + return (List)selectList("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryAndCinvbasCode",cgeneralhid); + } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.java index 864bb9d9..5bb1fab2 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.java @@ -1,12 +1,15 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + /** * (IcGeneralB)实体类 * * @author makejava * @since 2023-09-05 08:36:02 */ +@Data public class IcGeneralBEntity extends BaseEntity { private Double alrconfincomny; @@ -41,6 +44,8 @@ public class IcGeneralBEntity extends BaseEntity { private String cfreezeid; private String cgeneralbid; private String cgeneralhid; + /** 存货档案code */ + private String cinvbascode; private String cinvbasid; private String cinventoryid; private String corderBb1id; @@ -226,1725 +231,7 @@ public class IcGeneralBEntity extends BaseEntity { private String writeofftype; - public Double getAlrconfincomny() { - return alrconfincomny; - } - public void setAlrconfincomny(Double alrconfincomny) { - this.alrconfincomny = alrconfincomny; - } - - public Double getAlrconfinconum() { - return alrconfinconum; - } - - public void setAlrconfinconum(Double alrconfinconum) { - this.alrconfinconum = alrconfinconum; - } - - public String getBbarcodeclose() { - return bbarcodeclose; - } - - public void setBbarcodeclose(String bbarcodeclose) { - this.bbarcodeclose = bbarcodeclose; - } - - public String getBomversion() { - return bomversion; - } - - public void setBomversion(String bomversion) { - this.bomversion = bomversion; - } - - public String getBonroadflag() { - return bonroadflag; - } - - public void setBonroadflag(String bonroadflag) { - this.bonroadflag = bonroadflag; - } - - public String getBreturnprofit() { - return breturnprofit; - } - - public void setBreturnprofit(String breturnprofit) { - this.breturnprofit = breturnprofit; - } - - public String getBsafeprice() { - return bsafeprice; - } - - public void setBsafeprice(String bsafeprice) { - this.bsafeprice = bsafeprice; - } - - public String getBsourcelargess() { - return bsourcelargess; - } - - public void setBsourcelargess(String bsourcelargess) { - this.bsourcelargess = bsourcelargess; - } - - public String getBsupplyflag() { - return bsupplyflag; - } - - public void setBsupplyflag(String bsupplyflag) { - this.bsupplyflag = bsupplyflag; - } - - public String getBtoinzgflag() { - return btoinzgflag; - } - - public void setBtoinzgflag(String btoinzgflag) { - this.btoinzgflag = btoinzgflag; - } - - public String getBtoouttoiaflag() { - return btoouttoiaflag; - } - - public void setBtoouttoiaflag(String btoouttoiaflag) { - this.btoouttoiaflag = btoouttoiaflag; - } - - public String getBtooutzgflag() { - return btooutzgflag; - } - - public void setBtooutzgflag(String btooutzgflag) { - this.btooutzgflag = btooutzgflag; - } - - public String getBtou8rm() { - return btou8rm; - } - - public void setBtou8rm(String btou8rm) { - this.btou8rm = btou8rm; - } - - public String getBtransasset() { - return btransasset; - } - - public void setBtransasset(String btransasset) { - this.btransasset = btransasset; - } - - public String getBzgflag() { - return bzgflag; - } - - public void setBzgflag(String bzgflag) { - this.bzgflag = bzgflag; - } - - public String getBzgyfflag() { - return bzgyfflag; - } - - public void setBzgyfflag(String bzgyfflag) { - this.bzgyfflag = bzgyfflag; - } - - public String getCastunitid() { - return castunitid; - } - - public void setCastunitid(String castunitid) { - this.castunitid = castunitid; - } - - public String getCbodybilltypecode() { - return cbodybilltypecode; - } - - public void setCbodybilltypecode(String cbodybilltypecode) { - this.cbodybilltypecode = cbodybilltypecode; - } - - public String getCbodywarehouseid() { - return cbodywarehouseid; - } - - public void setCbodywarehouseid(String cbodywarehouseid) { - this.cbodywarehouseid = cbodywarehouseid; - } - - public String getCcheckstateid() { - return ccheckstateid; - } - - public void setCcheckstateid(String ccheckstateid) { - this.ccheckstateid = ccheckstateid; - } - - public String getCcorrespondbid() { - return ccorrespondbid; - } - - public void setCcorrespondbid(String ccorrespondbid) { - this.ccorrespondbid = ccorrespondbid; - } - - public String getCcorrespondcode() { - return ccorrespondcode; - } - - public void setCcorrespondcode(String ccorrespondcode) { - this.ccorrespondcode = ccorrespondcode; - } - - public String getCcorrespondhid() { - return ccorrespondhid; - } - - public void setCcorrespondhid(String ccorrespondhid) { - this.ccorrespondhid = ccorrespondhid; - } - - public String getCcorrespondtype() { - return ccorrespondtype; - } - - public void setCcorrespondtype(String ccorrespondtype) { - this.ccorrespondtype = ccorrespondtype; - } - - public String getCcostobject() { - return ccostobject; - } - - public void setCcostobject(String ccostobject) { - this.ccostobject = ccostobject; - } - - public String getCcurrencytypeid() { - return ccurrencytypeid; - } - - public void setCcurrencytypeid(String ccurrencytypeid) { - this.ccurrencytypeid = ccurrencytypeid; - } - - public String getCfirstbillbid() { - return cfirstbillbid; - } - - public void setCfirstbillbid(String cfirstbillbid) { - this.cfirstbillbid = cfirstbillbid; - } - - public String getCfirstbillhid() { - return cfirstbillhid; - } - - public void setCfirstbillhid(String cfirstbillhid) { - this.cfirstbillhid = cfirstbillhid; - } - - public String getCfirsttype() { - return cfirsttype; - } - - public void setCfirsttype(String cfirsttype) { - this.cfirsttype = cfirsttype; - } - - public String getCfreezeid() { - return cfreezeid; - } - - public void setCfreezeid(String cfreezeid) { - this.cfreezeid = cfreezeid; - } - - public String getCgeneralbid() { - return cgeneralbid; - } - - public void setCgeneralbid(String cgeneralbid) { - this.cgeneralbid = cgeneralbid; - } - - public String getCgeneralhid() { - return cgeneralhid; - } - - public void setCgeneralhid(String cgeneralhid) { - this.cgeneralhid = cgeneralhid; - } - - public String getCinvbasid() { - return cinvbasid; - } - - public void setCinvbasid(String cinvbasid) { - this.cinvbasid = cinvbasid; - } - - public String getCinventoryid() { - return cinventoryid; - } - - public void setCinventoryid(String cinventoryid) { - this.cinventoryid = cinventoryid; - } - - public String getCorderBb1id() { - return corderBb1id; - } - - public void setCorderBb1id(String corderBb1id) { - this.corderBb1id = corderBb1id; - } - - public String getCparentid() { - return cparentid; - } - - public void setCparentid(String cparentid) { - this.cparentid = cparentid; - } - - public String getCprojectid() { - return cprojectid; - } - - public void setCprojectid(String cprojectid) { - this.cprojectid = cprojectid; - } - - public String getCprojectphaseid() { - return cprojectphaseid; - } - - public void setCprojectphaseid(String cprojectphaseid) { - this.cprojectphaseid = cprojectphaseid; - } - - public String getCquotecurrency() { - return cquotecurrency; - } - - public void setCquotecurrency(String cquotecurrency) { - this.cquotecurrency = cquotecurrency; - } - - public String getCquoteunitid() { - return cquoteunitid; - } - - public void setCquoteunitid(String cquoteunitid) { - this.cquoteunitid = cquoteunitid; - } - - public String getCreceieveid() { - return creceieveid; - } - - public void setCreceieveid(String creceieveid) { - this.creceieveid = creceieveid; - } - - public String getCreceiveareaid() { - return creceiveareaid; - } - - public void setCreceiveareaid(String creceiveareaid) { - this.creceiveareaid = creceiveareaid; - } - - public String getCreceivepointid() { - return creceivepointid; - } - - public void setCreceivepointid(String creceivepointid) { - this.creceivepointid = creceivepointid; - } - - public String getCrowno() { - return crowno; - } - - public void setCrowno(String crowno) { - this.crowno = crowno; - } - - public String getCselastunitid() { - return cselastunitid; - } - - public void setCselastunitid(String cselastunitid) { - this.cselastunitid = cselastunitid; - } - - public String getCsignwastbid() { - return csignwastbid; - } - - public void setCsignwastbid(String csignwastbid) { - this.csignwastbid = csignwastbid; - } - - public String getCsignwasthid() { - return csignwasthid; - } - - public void setCsignwasthid(String csignwasthid) { - this.csignwasthid = csignwasthid; - } - - public String getCsignwasttype() { - return csignwasttype; - } - - public void setCsignwasttype(String csignwasttype) { - this.csignwasttype = csignwasttype; - } - - public String getCsourcebillbid() { - return csourcebillbid; - } - - public void setCsourcebillbid(String csourcebillbid) { - this.csourcebillbid = csourcebillbid; - } - - public String getCsourcebillhid() { - return csourcebillhid; - } - - public void setCsourcebillhid(String csourcebillhid) { - this.csourcebillhid = csourcebillhid; - } - - public String getCsourcetype() { - return csourcetype; - } - - public void setCsourcetype(String csourcetype) { - this.csourcetype = csourcetype; - } - - public String getCsourcewastbid() { - return csourcewastbid; - } - - public void setCsourcewastbid(String csourcewastbid) { - this.csourcewastbid = csourcewastbid; - } - - public String getCsourcewasthid() { - return csourcewasthid; - } - - public void setCsourcewasthid(String csourcewasthid) { - this.csourcewasthid = csourcewasthid; - } - - public String getCsourcewasttype() { - return csourcewasttype; - } - - public void setCsourcewasttype(String csourcewasttype) { - this.csourcewasttype = csourcewasttype; - } - - public String getCsrc2billbid() { - return csrc2billbid; - } - - public void setCsrc2billbid(String csrc2billbid) { - this.csrc2billbid = csrc2billbid; - } - - public String getCsrc2billhid() { - return csrc2billhid; - } - - public void setCsrc2billhid(String csrc2billhid) { - this.csrc2billhid = csrc2billhid; - } - - public String getCsrc2billtype() { - return csrc2billtype; - } - - public void setCsrc2billtype(String csrc2billtype) { - this.csrc2billtype = csrc2billtype; - } - - public String getCsumid() { - return csumid; - } - - public void setCsumid(String csumid) { - this.csumid = csumid; - } - - public String getCvendorid() { - return cvendorid; - } - - public void setCvendorid(String cvendorid) { - this.cvendorid = cvendorid; - } - - public String getCworkcenterid() { - return cworkcenterid; - } - - public void setCworkcenterid(String cworkcenterid) { - this.cworkcenterid = cworkcenterid; - } - - public String getCworksiteid() { - return cworksiteid; - } - - public void setCworksiteid(String cworksiteid) { - this.cworksiteid = cworksiteid; - } - - public String getCwp() { - return cwp; - } - - public void setCwp(String cwp) { - this.cwp = cwp; - } - - public String getDbizdate() { - return dbizdate; - } - - public void setDbizdate(String dbizdate) { - this.dbizdate = dbizdate; - } - - public String getDdeliverdate() { - return ddeliverdate; - } - - public void setDdeliverdate(String ddeliverdate) { - this.ddeliverdate = ddeliverdate; - } - - public String getDfirstbilldate() { - return dfirstbilldate; - } - - public void setDfirstbilldate(String dfirstbilldate) { - this.dfirstbilldate = dfirstbilldate; - } - - public Integer getDr() { - return dr; - } - - public void setDr(Integer dr) { - this.dr = dr; - } - - public String getDrequiredate() { - return drequiredate; - } - - public void setDrequiredate(String drequiredate) { - this.drequiredate = drequiredate; - } - - public String getDrequiretime() { - return drequiretime; - } - - public void setDrequiretime(String drequiretime) { - this.drequiretime = drequiretime; - } - - public String getDstandbydate() { - return dstandbydate; - } - - public void setDstandbydate(String dstandbydate) { - this.dstandbydate = dstandbydate; - } - - public String getDvalidate() { - return dvalidate; - } - - public void setDvalidate(String dvalidate) { - this.dvalidate = dvalidate; - } - - public String getDzgdate() { - return dzgdate; - } - - public void setDzgdate(String dzgdate) { - this.dzgdate = dzgdate; - } - - public String getFassertcardflag() { - return fassertcardflag; - } - - public void setFassertcardflag(String fassertcardflag) { - this.fassertcardflag = fassertcardflag; - } - - public Integer getFbillrowflag() { - return fbillrowflag; - } - - public void setFbillrowflag(Integer fbillrowflag) { - this.fbillrowflag = fbillrowflag; - } - - public Integer getFchecked() { - return fchecked; - } - - public void setFchecked(Integer fchecked) { - this.fchecked = fchecked; - } - - public String getFlargess() { - return flargess; - } - - public void setFlargess(String flargess) { - this.flargess = flargess; - } - - public String getFtoouttransflag() { - return ftoouttransflag; - } - - public void setFtoouttransflag(String ftoouttransflag) { - this.ftoouttransflag = ftoouttransflag; - } - - public Double getHsl() { - return hsl; - } - - public void setHsl(Double hsl) { - this.hsl = hsl; - } - - public Integer getIdesatype() { - return idesatype; - } - - public void setIdesatype(Integer idesatype) { - this.idesatype = idesatype; - } - - public String getInccontimepoint() { - return inccontimepoint; - } - - public void setInccontimepoint(String inccontimepoint) { - this.inccontimepoint = inccontimepoint; - } - - public String getInccontimepointname() { - return inccontimepointname; - } - - public void setInccontimepointname(String inccontimepointname) { - this.inccontimepointname = inccontimepointname; - } - - public String getIsok() { - return isok; - } - - public void setIsok(String isok) { - this.isok = isok; - } - - public Double getMaterialcost() { - return materialcost; - } - - public void setMaterialcost(Double materialcost) { - this.materialcost = materialcost; - } - - public Double getNaccumtonum() { - return naccumtonum; - } - - public void setNaccumtonum(Double naccumtonum) { - this.naccumtonum = naccumtonum; - } - - public Double getNaccumwastnum() { - return naccumwastnum; - } - - public void setNaccumwastnum(Double naccumwastnum) { - this.naccumwastnum = naccumwastnum; - } - - public Double getNbarcodenum() { - return nbarcodenum; - } - - public void setNbarcodenum(Double nbarcodenum) { - this.nbarcodenum = nbarcodenum; - } - - public Double getNcorrespondastnum() { - return ncorrespondastnum; - } - - public void setNcorrespondastnum(Double ncorrespondastnum) { - this.ncorrespondastnum = ncorrespondastnum; - } - - public Double getNcorrespondgrsnum() { - return ncorrespondgrsnum; - } - - public void setNcorrespondgrsnum(Double ncorrespondgrsnum) { - this.ncorrespondgrsnum = ncorrespondgrsnum; - } - - public Double getNcorrespondnum() { - return ncorrespondnum; - } - - public void setNcorrespondnum(Double ncorrespondnum) { - this.ncorrespondnum = ncorrespondnum; - } - - public Double getNcountnum() { - return ncountnum; - } - - public void setNcountnum(Double ncountnum) { - this.ncountnum = ncountnum; - } - - public Integer getNfeesettletimes() { - return nfeesettletimes; - } - - public void setNfeesettletimes(Integer nfeesettletimes) { - this.nfeesettletimes = nfeesettletimes; - } - - public Double getNinassistnum() { - return ninassistnum; - } - - public void setNinassistnum(Double ninassistnum) { - this.ninassistnum = ninassistnum; - } - - public Double getNingrossnum() { - return ningrossnum; - } - - public void setNingrossnum(Double ningrossnum) { - this.ningrossnum = ningrossnum; - } - - public Double getNinnum() { - return ninnum; - } - - public void setNinnum(Double ninnum) { - this.ninnum = ninnum; - } - - public Double getNkdnum() { - return nkdnum; - } - - public void setNkdnum(Double nkdnum) { - this.nkdnum = nkdnum; - } - - public Double getNmny() { - return nmny; - } - - public void setNmny(Double nmny) { - this.nmny = nmny; - } - - public Double getNneedinassistnum() { - return nneedinassistnum; - } - - public void setNneedinassistnum(Double nneedinassistnum) { - this.nneedinassistnum = nneedinassistnum; - } - - public Double getNoutassistnum() { - return noutassistnum; - } - - public void setNoutassistnum(Double noutassistnum) { - this.noutassistnum = noutassistnum; - } - - public Double getNoutgrossnum() { - return noutgrossnum; - } - - public void setNoutgrossnum(Double noutgrossnum) { - this.noutgrossnum = noutgrossnum; - } - - public Double getNoutnum() { - return noutnum; - } - - public void setNoutnum(Double noutnum) { - this.noutnum = noutnum; - } - - public Double getNplannedmny() { - return nplannedmny; - } - - public void setNplannedmny(Double nplannedmny) { - this.nplannedmny = nplannedmny; - } - - public Double getNplannedprice() { - return nplannedprice; - } - - public void setNplannedprice(Double nplannedprice) { - this.nplannedprice = nplannedprice; - } - - public Double getNprice() { - return nprice; - } - - public void setNprice(Double nprice) { - this.nprice = nprice; - } - - public Integer getNpricesettlebill() { - return npricesettlebill; - } - - public void setNpricesettlebill(Integer npricesettlebill) { - this.npricesettlebill = npricesettlebill; - } - - public Double getNquotemny() { - return nquotemny; - } - - public void setNquotemny(Double nquotemny) { - this.nquotemny = nquotemny; - } - - public Double getNquotentmny() { - return nquotentmny; - } - - public void setNquotentmny(Double nquotentmny) { - this.nquotentmny = nquotentmny; - } - - public Double getNquotentprice() { - return nquotentprice; - } - - public void setNquotentprice(Double nquotentprice) { - this.nquotentprice = nquotentprice; - } - - public Double getNquoteprice() { - return nquoteprice; - } - - public void setNquoteprice(Double nquoteprice) { - this.nquoteprice = nquoteprice; - } - - public Double getNquoteunitnum() { - return nquoteunitnum; - } - - public void setNquoteunitnum(Double nquoteunitnum) { - this.nquoteunitnum = nquoteunitnum; - } - - public Double getNquoteunitrate() { - return nquoteunitrate; - } - - public void setNquoteunitrate(Double nquoteunitrate) { - this.nquoteunitrate = nquoteunitrate; - } - - public Double getNreplenishedastnum() { - return nreplenishedastnum; - } - - public void setNreplenishedastnum(Double nreplenishedastnum) { - this.nreplenishedastnum = nreplenishedastnum; - } - - public Double getNreplenishednum() { - return nreplenishednum; - } - - public void setNreplenishednum(Double nreplenishednum) { - this.nreplenishednum = nreplenishednum; - } - - public Double getNretastnum() { - return nretastnum; - } - - public void setNretastnum(Double nretastnum) { - this.nretastnum = nretastnum; - } - - public Double getNretgrossnum() { - return nretgrossnum; - } - - public void setNretgrossnum(Double nretgrossnum) { - this.nretgrossnum = nretgrossnum; - } - - public Double getNretnum() { - return nretnum; - } - - public void setNretnum(Double nretnum) { - this.nretnum = nretnum; - } - - public Double getNsalemny() { - return nsalemny; - } - - public void setNsalemny(Double nsalemny) { - this.nsalemny = nsalemny; - } - - public Double getNsaleprice() { - return nsaleprice; - } - - public void setNsaleprice(Double nsaleprice) { - this.nsaleprice = nsaleprice; - } - - public Double getNshouldinnum() { - return nshouldinnum; - } - - public void setNshouldinnum(Double nshouldinnum) { - this.nshouldinnum = nshouldinnum; - } - - public Double getNshouldoutassistnum() { - return nshouldoutassistnum; - } - - public void setNshouldoutassistnum(Double nshouldoutassistnum) { - this.nshouldoutassistnum = nshouldoutassistnum; - } - - public Double getNshouldoutnum() { - return nshouldoutnum; - } - - public void setNshouldoutnum(Double nshouldoutnum) { - this.nshouldoutnum = nshouldoutnum; - } - - public Double getNtarenum() { - return ntarenum; - } - - public void setNtarenum(Double ntarenum) { - this.ntarenum = ntarenum; - } - - public Double getNtaxmny() { - return ntaxmny; - } - - public void setNtaxmny(Double ntaxmny) { - this.ntaxmny = ntaxmny; - } - - public Double getNtaxprice() { - return ntaxprice; - } - - public void setNtaxprice(Double ntaxprice) { - this.ntaxprice = ntaxprice; - } - - public Double getNtotalmatchnum() { - return ntotalmatchnum; - } - - public void setNtotalmatchnum(Double ntotalmatchnum) { - this.ntotalmatchnum = ntotalmatchnum; - } - - public Double getNtotalreasonwastenum() { - return ntotalreasonwastenum; - } - - public void setNtotalreasonwastenum(Double ntotalreasonwastenum) { - this.ntotalreasonwastenum = ntotalreasonwastenum; - } - - public Double getNtranoutastnum() { - return ntranoutastnum; - } - - public void setNtranoutastnum(Double ntranoutastnum) { - this.ntranoutastnum = ntranoutastnum; - } - - public Double getNtranoutnum() { - return ntranoutnum; - } - - public void setNtranoutnum(Double ntranoutnum) { - this.ntranoutnum = ntranoutnum; - } - - public String getPkBodycalbody() { - return pkBodycalbody; - } - - public void setPkBodycalbody(String pkBodycalbody) { - this.pkBodycalbody = pkBodycalbody; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getPkCreqwareid() { - return pkCreqwareid; - } - - public void setPkCreqwareid(String pkCreqwareid) { - this.pkCreqwareid = pkCreqwareid; - } - - public String getPkCubasdoc() { - return pkCubasdoc; - } - - public void setPkCubasdoc(String pkCubasdoc) { - this.pkCubasdoc = pkCubasdoc; - } - - public String getPkDefdoc1() { - return pkDefdoc1; - } - - public void setPkDefdoc1(String pkDefdoc1) { - this.pkDefdoc1 = pkDefdoc1; - } - - public String getPkDefdoc10() { - return pkDefdoc10; - } - - public void setPkDefdoc10(String pkDefdoc10) { - this.pkDefdoc10 = pkDefdoc10; - } - - public String getPkDefdoc11() { - return pkDefdoc11; - } - - public void setPkDefdoc11(String pkDefdoc11) { - this.pkDefdoc11 = pkDefdoc11; - } - - public String getPkDefdoc12() { - return pkDefdoc12; - } - - public void setPkDefdoc12(String pkDefdoc12) { - this.pkDefdoc12 = pkDefdoc12; - } - - public String getPkDefdoc13() { - return pkDefdoc13; - } - - public void setPkDefdoc13(String pkDefdoc13) { - this.pkDefdoc13 = pkDefdoc13; - } - - public String getPkDefdoc14() { - return pkDefdoc14; - } - - public void setPkDefdoc14(String pkDefdoc14) { - this.pkDefdoc14 = pkDefdoc14; - } - - public String getPkDefdoc15() { - return pkDefdoc15; - } - - public void setPkDefdoc15(String pkDefdoc15) { - this.pkDefdoc15 = pkDefdoc15; - } - - public String getPkDefdoc16() { - return pkDefdoc16; - } - - public void setPkDefdoc16(String pkDefdoc16) { - this.pkDefdoc16 = pkDefdoc16; - } - - public String getPkDefdoc17() { - return pkDefdoc17; - } - - public void setPkDefdoc17(String pkDefdoc17) { - this.pkDefdoc17 = pkDefdoc17; - } - - public String getPkDefdoc18() { - return pkDefdoc18; - } - - public void setPkDefdoc18(String pkDefdoc18) { - this.pkDefdoc18 = pkDefdoc18; - } - - public String getPkDefdoc19() { - return pkDefdoc19; - } - - public void setPkDefdoc19(String pkDefdoc19) { - this.pkDefdoc19 = pkDefdoc19; - } - - public String getPkDefdoc2() { - return pkDefdoc2; - } - - public void setPkDefdoc2(String pkDefdoc2) { - this.pkDefdoc2 = pkDefdoc2; - } - - public String getPkDefdoc20() { - return pkDefdoc20; - } - - public void setPkDefdoc20(String pkDefdoc20) { - this.pkDefdoc20 = pkDefdoc20; - } - - public String getPkDefdoc3() { - return pkDefdoc3; - } - - public void setPkDefdoc3(String pkDefdoc3) { - this.pkDefdoc3 = pkDefdoc3; - } - - public String getPkDefdoc4() { - return pkDefdoc4; - } - - public void setPkDefdoc4(String pkDefdoc4) { - this.pkDefdoc4 = pkDefdoc4; - } - - public String getPkDefdoc5() { - return pkDefdoc5; - } - - public void setPkDefdoc5(String pkDefdoc5) { - this.pkDefdoc5 = pkDefdoc5; - } - - public String getPkDefdoc6() { - return pkDefdoc6; - } - - public void setPkDefdoc6(String pkDefdoc6) { - this.pkDefdoc6 = pkDefdoc6; - } - - public String getPkDefdoc7() { - return pkDefdoc7; - } - - public void setPkDefdoc7(String pkDefdoc7) { - this.pkDefdoc7 = pkDefdoc7; - } - - public String getPkDefdoc8() { - return pkDefdoc8; - } - - public void setPkDefdoc8(String pkDefdoc8) { - this.pkDefdoc8 = pkDefdoc8; - } - - public String getPkDefdoc9() { - return pkDefdoc9; - } - - public void setPkDefdoc9(String pkDefdoc9) { - this.pkDefdoc9 = pkDefdoc9; - } - - public String getPkInvoicecorp() { - return pkInvoicecorp; - } - - public void setPkInvoicecorp(String pkInvoicecorp) { - this.pkInvoicecorp = pkInvoicecorp; - } - - public String getPkMeasware() { - return pkMeasware; - } - - public void setPkMeasware(String pkMeasware) { - this.pkMeasware = pkMeasware; - } - - public String getPkPacksort() { - return pkPacksort; - } - - public void setPkPacksort(String pkPacksort) { - this.pkPacksort = pkPacksort; - } - - public String getPkReqcorp() { - return pkReqcorp; - } - - public void setPkReqcorp(String pkReqcorp) { - this.pkReqcorp = pkReqcorp; - } - - public String getPkReqstoorg() { - return pkReqstoorg; - } - - public void setPkReqstoorg(String pkReqstoorg) { - this.pkReqstoorg = pkReqstoorg; - } - - public String getPkReturnreason() { - return pkReturnreason; - } - - public void setPkReturnreason(String pkReturnreason) { - this.pkReturnreason = pkReturnreason; - } - - public String getProcess1() { - return process1; - } - - public void setProcess1(String process1) { - this.process1 = process1; - } - - public String getProcess2() { - return process2; - } - - public void setProcess2(String process2) { - this.process2 = process2; - } - - public String getProcess3() { - return process3; - } - - public void setProcess3(String process3) { - this.process3 = process3; - } - - public String getProcess4() { - return process4; - } - - public void setProcess4(String process4) { - this.process4 = process4; - } - - public String getProcess5() { - return process5; - } - - public void setProcess5(String process5) { - this.process5 = process5; - } - - public Double getProcesscost() { - return processcost; - } - - public void setProcesscost(Double processcost) { - this.processcost = processcost; - } - - public String getProcessmanid() { - return processmanid; - } - - public void setProcessmanid(String processmanid) { - this.processmanid = processmanid; - } - - public Integer getSerialnum() { - return serialnum; - } - - public void setSerialnum(Integer serialnum) { - this.serialnum = serialnum; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getVbatchcode() { - return vbatchcode; - } - - public void setVbatchcode(String vbatchcode) { - this.vbatchcode = vbatchcode; - } - - public String getVbilltypeu8rm() { - return vbilltypeu8rm; - } - - public void setVbilltypeu8rm(String vbilltypeu8rm) { - this.vbilltypeu8rm = vbilltypeu8rm; - } - - public String getVbodynote2() { - return vbodynote2; - } - - public void setVbodynote2(String vbodynote2) { - this.vbodynote2 = vbodynote2; - } - - public String getVcorrespondrowno() { - return vcorrespondrowno; - } - - public void setVcorrespondrowno(String vcorrespondrowno) { - this.vcorrespondrowno = vcorrespondrowno; - } - - public String getVfirstbillcode() { - return vfirstbillcode; - } - - public void setVfirstbillcode(String vfirstbillcode) { - this.vfirstbillcode = vfirstbillcode; - } - - public String getVfirstrowno() { - return vfirstrowno; - } - - public void setVfirstrowno(String vfirstrowno) { - this.vfirstrowno = vfirstrowno; - } - - public String getVfree1() { - return vfree1; - } - - public void setVfree1(String vfree1) { - this.vfree1 = vfree1; - } - - public String getVfree10() { - return vfree10; - } - - public void setVfree10(String vfree10) { - this.vfree10 = vfree10; - } - - public String getVfree2() { - return vfree2; - } - - public void setVfree2(String vfree2) { - this.vfree2 = vfree2; - } - - public String getVfree3() { - return vfree3; - } - - public void setVfree3(String vfree3) { - this.vfree3 = vfree3; - } - - public String getVfree4() { - return vfree4; - } - - public void setVfree4(String vfree4) { - this.vfree4 = vfree4; - } - - public String getVfree5() { - return vfree5; - } - - public void setVfree5(String vfree5) { - this.vfree5 = vfree5; - } - - public String getVfree6() { - return vfree6; - } - - public void setVfree6(String vfree6) { - this.vfree6 = vfree6; - } - - public String getVfree7() { - return vfree7; - } - - public void setVfree7(String vfree7) { - this.vfree7 = vfree7; - } - - public String getVfree8() { - return vfree8; - } - - public void setVfree8(String vfree8) { - this.vfree8 = vfree8; - } - - public String getVfree9() { - return vfree9; - } - - public void setVfree9(String vfree9) { - this.vfree9 = vfree9; - } - - public String getVnotebody() { - return vnotebody; - } - - public void setVnotebody(String vnotebody) { - this.vnotebody = vnotebody; - } - - public String getVproductbatch() { - return vproductbatch; - } - - public void setVproductbatch(String vproductbatch) { - this.vproductbatch = vproductbatch; - } - - public String getVreceiveaddress() { - return vreceiveaddress; - } - - public void setVreceiveaddress(String vreceiveaddress) { - this.vreceiveaddress = vreceiveaddress; - } - - public String getVsignwastcode() { - return vsignwastcode; - } - - public void setVsignwastcode(String vsignwastcode) { - this.vsignwastcode = vsignwastcode; - } - - public String getVsignwastrowno() { - return vsignwastrowno; - } - - public void setVsignwastrowno(String vsignwastrowno) { - this.vsignwastrowno = vsignwastrowno; - } - - public String getVsourcebillcode() { - return vsourcebillcode; - } - - public void setVsourcebillcode(String vsourcebillcode) { - this.vsourcebillcode = vsourcebillcode; - } - - public String getVsourcerowno() { - return vsourcerowno; - } - - public void setVsourcerowno(String vsourcerowno) { - this.vsourcerowno = vsourcerowno; - } - - public String getVsourcewastcode() { - return vsourcewastcode; - } - - public void setVsourcewastcode(String vsourcewastcode) { - this.vsourcewastcode = vsourcewastcode; - } - - public String getVsourcewastrowno() { - return vsourcewastrowno; - } - - public void setVsourcewastrowno(String vsourcewastrowno) { - this.vsourcewastrowno = vsourcewastrowno; - } - - public String getVsrc2billcode() { - return vsrc2billcode; - } - - public void setVsrc2billcode(String vsrc2billcode) { - this.vsrc2billcode = vsrc2billcode; - } - - public String getVsrc2billrowno() { - return vsrc2billrowno; - } - - public void setVsrc2billrowno(String vsrc2billrowno) { - this.vsrc2billrowno = vsrc2billrowno; - } - - public String getVtransfercode() { - return vtransfercode; - } - - public void setVtransfercode(String vtransfercode) { - this.vtransfercode = vtransfercode; - } - - public String getVuserdef1() { - return vuserdef1; - } - - public void setVuserdef1(String vuserdef1) { - this.vuserdef1 = vuserdef1; - } - - public String getVuserdef10() { - return vuserdef10; - } - - public void setVuserdef10(String vuserdef10) { - this.vuserdef10 = vuserdef10; - } - - public String getVuserdef11() { - return vuserdef11; - } - - public void setVuserdef11(String vuserdef11) { - this.vuserdef11 = vuserdef11; - } - - public String getVuserdef12() { - return vuserdef12; - } - - public void setVuserdef12(String vuserdef12) { - this.vuserdef12 = vuserdef12; - } - - public String getVuserdef13() { - return vuserdef13; - } - - public void setVuserdef13(String vuserdef13) { - this.vuserdef13 = vuserdef13; - } - - public String getVuserdef14() { - return vuserdef14; - } - - public void setVuserdef14(String vuserdef14) { - this.vuserdef14 = vuserdef14; - } - - public String getVuserdef15() { - return vuserdef15; - } - - public void setVuserdef15(String vuserdef15) { - this.vuserdef15 = vuserdef15; - } - - public String getVuserdef16() { - return vuserdef16; - } - - public void setVuserdef16(String vuserdef16) { - this.vuserdef16 = vuserdef16; - } - - public String getVuserdef17() { - return vuserdef17; - } - - public void setVuserdef17(String vuserdef17) { - this.vuserdef17 = vuserdef17; - } - - public String getVuserdef18() { - return vuserdef18; - } - - public void setVuserdef18(String vuserdef18) { - this.vuserdef18 = vuserdef18; - } - - public String getVuserdef19() { - return vuserdef19; - } - - public void setVuserdef19(String vuserdef19) { - this.vuserdef19 = vuserdef19; - } - - public String getVuserdef2() { - return vuserdef2; - } - - public void setVuserdef2(String vuserdef2) { - this.vuserdef2 = vuserdef2; - } - - public String getVuserdef20() { - return vuserdef20; - } - - public void setVuserdef20(String vuserdef20) { - this.vuserdef20 = vuserdef20; - } - - public String getVuserdef3() { - return vuserdef3; - } - - public void setVuserdef3(String vuserdef3) { - this.vuserdef3 = vuserdef3; - } - - public String getVuserdef4() { - return vuserdef4; - } - - public void setVuserdef4(String vuserdef4) { - this.vuserdef4 = vuserdef4; - } - - public String getVuserdef5() { - return vuserdef5; - } - - public void setVuserdef5(String vuserdef5) { - this.vuserdef5 = vuserdef5; - } - - public String getVuserdef6() { - return vuserdef6; - } - - public void setVuserdef6(String vuserdef6) { - this.vuserdef6 = vuserdef6; - } - - public String getVuserdef7() { - return vuserdef7; - } - - public void setVuserdef7(String vuserdef7) { - this.vuserdef7 = vuserdef7; - } - - public String getVuserdef8() { - return vuserdef8; - } - - public void setVuserdef8(String vuserdef8) { - this.vuserdef8 = vuserdef8; - } - - public String getVuserdef9() { - return vuserdef9; - } - - public void setVuserdef9(String vuserdef9) { - this.vuserdef9 = vuserdef9; - } - - public String getVvehiclecode() { - return vvehiclecode; - } - - public void setVvehiclecode(String vvehiclecode) { - this.vvehiclecode = vvehiclecode; - } - - public String getWriteofftype() { - return writeofftype; - } - - public void setWriteofftype(String writeofftype) { - this.writeofftype = writeofftype; - } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.xml index 2df420ca..e39e7b03 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralBEntity.xml @@ -1,6 +1,6 @@ - + @@ -35,6 +35,7 @@ + @@ -253,8 +254,9 @@ ,cfreezeid ,cgeneralbid ,cgeneralhid - ,cinvbasid - ,cinventoryid + ,cinvbascode + ,cinvbasid + ,cinventoryid ,corder_bb1id ,cparentid ,cprojectid @@ -658,10 +660,240 @@ and vuserdef9 = #{vuserdef9} and vvehiclecode = #{vvehiclecode} and writeofftype = #{writeofftype} + and dr=0 order by ${sort} ${order} + + + + + + + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java index 8d347cf3..45807e51 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java @@ -263,17 +263,49 @@ public class TransferInPluginInitializer extends PluginBaseEntity { //U8C调拨订单信息 // List toBillEntityList = queryToBillByPkVdefdoc19(ofsSourceOrderCode); //U8C调拨出库单主表信息 + List icGeneralHEntityList = queryIcGeneralHByPkVdefdoc19(ofsSourceOrderCode); + if (icGeneralHEntityList == null) { + Assert.state(false,"在U8C内根据OFS调拨订单号（pk_vdefdoc19）:{},没有查询到调拨出库单，请检查。",ofsSourceOrderCode); + } + if(icGeneralHEntityList.size()>1){ + Assert.state(false,"在U8C内根据OFS调拨订单号（pk_vdefdoc19）:{},查询到调拨出库单不唯一，请检查。",ofsSourceOrderCode); + } + IcGeneralHEntity icGeneralHEntity = icGeneralHEntityList.get(0); //U8C调拨出库单子表信息 - + List icGeneralBEntityList = queryIcGeneralBByCgeneralhid(icGeneralHEntity.getCgeneralhid()); + if(icGeneralBEntityList==null){ + Assert.state(false,"在U8C内根据U8C调拨出库单主表主键：{}，调拨出库单单号：{}，未查询到调拨出库单子表信息，请检查。",icGeneralHEntity.getCgeneralhid(),icGeneralHEntity.getVbillcode()); + } List ChildrenList = new ArrayList<>(); + int i=1; for (StockinOrderSearchResponse.StockinOrder.StockinB ofsTransferDetail : transferInOrders.getDetails()) { GeneralBillVO.Childrenvo childrenvo = new GeneralBillVO.Childrenvo(); + //cinventoryid 存货 + childrenvo.setCinventoryid(ofsTransferDetail.getSkuCode()); + //ninnum 实收数量 + childrenvo.setNinnum(ofsTransferDetail.getReceivedQty()); + //csourcetype 来源单据类型编码 + childrenvo.setCsourcetype("4Y"); + //vsourcebillcode 来源单据号 + childrenvo.setVsourcebillcode(icGeneralHEntity.getVbillcode()); + for (IcGeneralBEntity icGeneralBEntity : icGeneralBEntityList) { + System.out.println(icGeneralBEntity); + //根据存货+行号匹配 + if(ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getPkDefdoc20().trim())&&ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())){ + //crowno 行号 + childrenvo.setCrowno(i++ +"0"); + + //vsourcerowno 来源单据行号 + childrenvo.setVsourcerowno(icGeneralBEntity.getCrowno()); + break; + } + } ChildrenList.add(childrenvo); } generalBillVO.setParentvo(parentvo); @@ -281,7 +313,8 @@ public class TransferInPluginInitializer extends PluginBaseEntity { mapStr = "{\"GeneralBillVO\":[" + JSONUtil.toJsonStr(generalBillVO) + "]}"; - ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("approveqzCode"), mapStr); + ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("approveInqzCode"), mapStr); +// ZTResult ztResult = pushU8CByApiCode.pushByCode(null, mapStr); System.out.println(ztResult); //两层判断,一层中台转发,一层u8c返回 if ("false".equals(ztResult.getFlag())) { @@ -329,8 +362,12 @@ public class TransferInPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("推送U8C，丽知：OFS调拨入库订单--->U8C调拨入库订单（保存签字，关联U8C调拨出库单）失败，失败原因：" + e); ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - - String ErrMessage = "推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + reusltStrDto.getErrormsg(); + String ErrMessage=null; + if (reusltStrDto != null) { + ErrMessage = "推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + reusltStrDto.getErrormsg(); + }else { + ErrMessage=e.getMessage(); + } //失败 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); @@ -429,12 +466,12 @@ public class TransferInPluginInitializer extends PluginBaseEntity { /** * 根据调拨出库单主表主键，查询调拨出库单子表 */ - public List queryIcGeneralBByVsourcebillcode(String vsourcebillcode){ - IcGeneralBEntity icGeneralBEntity = new IcGeneralBEntity(); - icGeneralBEntity.setDr(0); - icGeneralBEntity.setVsourcebillcode(vsourcebillcode); - icGeneralBEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); - List icGeneralBEntityList = icGeneralBDao.query(icGeneralBEntity); + public List queryIcGeneralBByCgeneralhid(String cgeneralhid){ +// IcGeneralBEntity icGeneralBEntity = new IcGeneralBEntity(); +// icGeneralBEntity.setDr(0); +// icGeneralBEntity.setCgeneralhid(cgeneralhid); +// icGeneralBEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); + List icGeneralBEntityList = icGeneralBDao.queryAndCinvbasCode(cgeneralhid); if (icGeneralBEntityList==null||icGeneralBEntityList.size() == 0) { return null; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index d6b13fc7..bb254743 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -285,6 +285,10 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { //nnum 数量 children.setNnum(BigDecimal.valueOf(ofsDetail.getShipQty())); childrenvo.add(children); + //ofs行id + children.setPk_defdoc20(ofsDetail.getId()); + + } billVO.setParentvo(parentvo); billVO.setChildrenvo(childrenvo); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java index e01c0e2f..1e694170 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java @@ -40,7 +40,7 @@ public class TransferTest { @Test public void t10(){ - transferOutPluginInitializer.start("LETS-SH2024082000000005"); + transferOutPluginInitializer.start("LETS-SH2024082100000007"); } @Test @@ -55,7 +55,7 @@ public class TransferTest { } @Test public void t21(){ - transferInPluginInitializer.start("LETS-RE2024082000000006"); + transferInPluginInitializer.start("LETS-RE2024082100000005"); } diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java index e5f4be1f..4848e6eb 100644 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java @@ -84,7 +84,7 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics { @Data public class OFSTranseferB{ /** id */ - private Integer id; + private String id; /** 订单ID */ private Integer transferOrderId; /** 订单编号 */