diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IBdInvbasdocDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IBdInvbasdocDao.java index 2fb6e1eb..8d3cf6e5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IBdInvbasdocDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IBdInvbasdocDao.java @@ -26,5 +26,12 @@ public interface IBdInvbasdocDao extends IBaseDao { * @author liuyang */ List queryBdInvbasdocByPkInvmandocV2(BdInvbasdocEntity bdInvbasdocEntity) throws Exception; + + /** + * 查询存货基础档案 + * + * @author liuyang + */ + List queryBdInvbasdocByPkInvmandocV3(BdInvbasdocEntity bdInvbasdocEntity) throws Exception; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdInvbasdocDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdInvbasdocDaoImpl.java index 6b99688f..a0d5e798 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdInvbasdocDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdInvbasdocDaoImpl.java @@ -37,4 +37,12 @@ public class BdInvbasdocDaoImpl extends MybatisGenericDao bdInvbasdocEntities = queryList(bdInvbasdocEntity, "com.hzya.frame.plugin.lets.dao.impl.BdInvbasdocDaoImpl.queryBdInvbasdocByPkInvmandoc"); return bdInvbasdocEntities; } + + @DS("lets_u8c") + @Override + public List queryBdInvbasdocByPkInvmandocV3(BdInvbasdocEntity bdInvbasdocEntity) throws Exception { + Assert.notNull(bdInvbasdocEntity, "bdInvbasdocEntity不能为空!"); + Assert.notNull(bdInvbasdocEntity.getInvcodes(), "invcodes不能为空"); + return queryList(bdInvbasdocEntity, "com.hzya.frame.plugin.lets.dao.impl.BdInvbasdocDaoImpl.queryBdInvbasdocByInvcodes"); + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java index e78811d0..acf864e4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCubasdocEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * (BdCubasdoc)实体类-客商档案 @@ -8,6 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @author makejava * @since 2023-08-25 09:41:41 */ +@Data public class BdCubasdocEntity extends BaseEntity { private String accdefault; @@ -114,623 +116,9 @@ public class BdCubasdocEntity extends BaseEntity { */ private String modifytime_end_time; - - public String getModifytime_start_time() { - return modifytime_start_time; - } - - public void setModifytime_start_time(String modifytime_start_time) { - this.modifytime_start_time = modifytime_start_time; - } - - public String getModifytime_end_time() { - return modifytime_end_time; - } - - public void setModifytime_end_time(String modifytime_end_time) { - this.modifytime_end_time = modifytime_end_time; - } - - - public String getStart_createtime() { - return start_createtime; - } - - public void setStart_createtime(String start_createtime) { - this.start_createtime = start_createtime; - } - - public String getEnd_createtime() { - return end_createtime; - } - - public void setEnd_createtime(String end_createtime) { - this.end_createtime = end_createtime; - } - - public String getCustflag() { - return custflag; - } - - public void setCustflag(String custflag) { - this.custflag = custflag; - } - - public String getPk_cumandoc() { - return pk_cumandoc; - } - - public void setPk_cumandoc(String pk_cumandoc) { - this.pk_cumandoc = pk_cumandoc; - } - - public String getAccdefault() { - return accdefault; - } - - public void setAccdefault(String accdefault) { - this.accdefault = accdefault; - } - - public String getBilltemplet() { - return billtemplet; - } - - public void setBilltemplet(String billtemplet) { - this.billtemplet = billtemplet; - } - - public String getBp1() { - return bp1; - } - - public void setBp1(String bp1) { - this.bp1 = bp1; - } - - public String getBp2() { - return bp2; - } - - public void setBp2(String bp2) { - this.bp2 = bp2; - } - - public String getBp3() { - return bp3; - } - - public void setBp3(String bp3) { - this.bp3 = bp3; - } - - public String getConaddr() { - return conaddr; - } - - public void setConaddr(String conaddr) { - this.conaddr = conaddr; - } - - public String getCorrespondunit() { - return correspondunit; - } - - public void setCorrespondunit(String correspondunit) { - this.correspondunit = correspondunit; - } - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public String getCreditmny() { - return creditmny; - } - - public void setCreditmny(String creditmny) { - this.creditmny = creditmny; - } - - public String getCustcode() { - return custcode; - } - - public void setCustcode(String custcode) { - this.custcode = custcode; - } - - public String getCustname() { - return custname; - } - - public void setCustname(String custname) { - this.custname = custname; - } - - public Long getCustprop() { - return custprop; - } - - public void setCustprop(Long custprop) { - this.custprop = custprop; - } - - public String getCustshortname() { - return custshortname; - } - - public void setCustshortname(String custshortname) { - this.custshortname = custshortname; - } - - public String getDef1() { - return def1; - } - - public void setDef1(String def1) { - this.def1 = def1; - } - - public String getDef10() { - return def10; - } - - public void setDef10(String def10) { - this.def10 = def10; - } - - public String getDef11() { - return def11; - } - - public void setDef11(String def11) { - this.def11 = def11; - } - - public String getDef12() { - return def12; - } - - public void setDef12(String def12) { - this.def12 = def12; - } - - public String getDef13() { - return def13; - } - - public void setDef13(String def13) { - this.def13 = def13; - } - - public String getDef14() { - return def14; - } - - public void setDef14(String def14) { - this.def14 = def14; - } - - public String getDef15() { - return def15; - } - - public void setDef15(String def15) { - this.def15 = def15; - } - - public String getDef16() { - return def16; - } - - public void setDef16(String def16) { - this.def16 = def16; - } - - public String getDef17() { - return def17; - } - - public void setDef17(String def17) { - this.def17 = def17; - } - - public String getDef18() { - return def18; - } - - public void setDef18(String def18) { - this.def18 = def18; - } - - public String getDef19() { - return def19; - } - - public void setDef19(String def19) { - this.def19 = def19; - } - - public String getDef2() { - return def2; - } - - public void setDef2(String def2) { - this.def2 = def2; - } - - public String getDef20() { - return def20; - } - - public void setDef20(String def20) { - this.def20 = def20; - } - - public String getDef3() { - return def3; - } - - public void setDef3(String def3) { - this.def3 = def3; - } - - public String getDef4() { - return def4; - } - - public void setDef4(String def4) { - this.def4 = def4; - } - - public String getDef5() { - return def5; - } - - public void setDef5(String def5) { - this.def5 = def5; - } - - public String getDef6() { - return def6; - } - - public void setDef6(String def6) { - this.def6 = def6; - } - - public String getDef7() { - return def7; - } - - public void setDef7(String def7) { - this.def7 = def7; - } - - public String getDef8() { - return def8; - } - - public void setDef8(String def8) { - this.def8 = def8; - } - - public String getDef9() { - return def9; - } - - public void setDef9(String def9) { - this.def9 = def9; - } - - public Long getDr() { - return dr; - } - - public void setDr(Long dr) { - this.dr = dr; - } - - public String getDrpnodeflag() { - return drpnodeflag; - } - - public void setDrpnodeflag(String drpnodeflag) { - this.drpnodeflag = drpnodeflag; - } - - public String getEcotypesincevfive() { - return ecotypesincevfive; - } - - public void setEcotypesincevfive(String ecotypesincevfive) { - this.ecotypesincevfive = ecotypesincevfive; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getEngname() { - return engname; - } - - public void setEngname(String engname) { - this.engname = engname; - } - - public String getFax1() { - return fax1; - } - - public void setFax1(String fax1) { - this.fax1 = fax1; - } - - public String getFax2() { - return fax2; - } - - public void setFax2(String fax2) { - this.fax2 = fax2; - } - - public String getFreecustflag() { - return freecustflag; - } - - public void setFreecustflag(String freecustflag) { - this.freecustflag = freecustflag; - } - - public String getIsconnflag() { - return isconnflag; - } - - public void setIsconnflag(String isconnflag) { - this.isconnflag = isconnflag; - } - - public String getLegalbody() { - return legalbody; - } - - public void setLegalbody(String legalbody) { - this.legalbody = legalbody; - } - - public String getLinkman1() { - return linkman1; - } - - public void setLinkman1(String linkman1) { - this.linkman1 = linkman1; - } - - public String getLinkman2() { - return linkman2; - } - - public void setLinkman2(String linkman2) { - this.linkman2 = linkman2; - } - - public String getLinkman3() { - return linkman3; - } - - public void setLinkman3(String linkman3) { - this.linkman3 = linkman3; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getMnecode() { - return mnecode; - } - - public void setMnecode(String mnecode) { - this.mnecode = mnecode; - } - - public String getMobilephone1() { - return mobilephone1; - } - - public void setMobilephone1(String mobilephone1) { - this.mobilephone1 = mobilephone1; - } - - public String getMobilephone2() { - return mobilephone2; - } - - public void setMobilephone2(String mobilephone2) { - this.mobilephone2 = mobilephone2; - } - - public String getMobilephone3() { - return mobilephone3; - } - - public void setMobilephone3(String mobilephone3) { - this.mobilephone3 = mobilephone3; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getModifytime() { - return modifytime; - } - - public void setModifytime(String modifytime) { - this.modifytime = modifytime; - } - - public String getPhone1() { - return phone1; - } - - public void setPhone1(String phone1) { - this.phone1 = phone1; - } - - public String getPhone2() { - return phone2; - } - - public void setPhone2(String phone2) { - this.phone2 = phone2; - } - - public String getPhone3() { - return phone3; - } - - public void setPhone3(String phone3) { - this.phone3 = phone3; - } - - public String getPkAreacl() { - return pkAreacl; - } - - public void setPkAreacl(String pkAreacl) { - this.pkAreacl = pkAreacl; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getPkCorp1() { - return pkCorp1; - } - - public void setPkCorp1(String pkCorp1) { - this.pkCorp1 = pkCorp1; - } - - public String getPkCubasdoc() { - return pkCubasdoc; - } - - public void setPkCubasdoc(String pkCubasdoc) { - this.pkCubasdoc = pkCubasdoc; - } - - public String getPkCubasdoc1() { - return pkCubasdoc1; - } - - public void setPkCubasdoc1(String pkCubasdoc1) { - this.pkCubasdoc1 = pkCubasdoc1; - } - - public String getPkPricegroup() { - return pkPricegroup; - } - - public void setPkPricegroup(String pkPricegroup) { - this.pkPricegroup = pkPricegroup; - } - - public String getRegisterfund() { - return registerfund; - } - - public void setRegisterfund(String registerfund) { - this.registerfund = registerfund; - } - - public String getSaleaddr() { - return saleaddr; - } - - public void setSaleaddr(String saleaddr) { - this.saleaddr = saleaddr; - } - - public String getSealflag() { - return sealflag; - } - - public void setSealflag(String sealflag) { - this.sealflag = sealflag; - } - - public String getTaxpayerid() { - return taxpayerid; - } - - public void setTaxpayerid(String taxpayerid) { - this.taxpayerid = taxpayerid; - } - - public String getTrade() { - return trade; - } - - public void setTrade(String trade) { - this.trade = trade; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getZipcode() { - return zipcode; - } - - public void setZipcode(String zipcode) { - this.zipcode = zipcode; - } - + /** + * 多个编码查询 + */ + private String custcodes; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java index f4dd411e..2539a9d6 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * (BdCumandoc)实体类-客商管理档案 @@ -8,6 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @author makejava * @since 2023-08-25 09:42:24 */ +@Data public class BdCumandocEntity extends BaseEntity { private String accawmny; @@ -110,757 +112,9 @@ public class BdCumandocEntity extends BaseEntity { */ private String custflags; - public String getCustflags() { - return custflags; - } - - public void setCustflags(String custflags) { - this.custflags = custflags; - } - - public String getAccawmny() { - return accawmny; - } - - public void setAccawmny(String accawmny) { - this.accawmny = accawmny; - } - - public String getAcclimit() { - return acclimit; - } - - public void setAcclimit(String acclimit) { - this.acclimit = acclimit; - } - - public String getAcclimitcontrol() { - return acclimitcontrol; - } - - public void setAcclimitcontrol(String acclimitcontrol) { - this.acclimitcontrol = acclimitcontrol; - } - - public String getAcclmtbegindate() { - return acclmtbegindate; - } - - public void setAcclmtbegindate(String acclmtbegindate) { - this.acclmtbegindate = acclmtbegindate; - } - - public String getBalancemny() { - return balancemny; - } - - public void setBalancemny(String balancemny) { - this.balancemny = balancemny; - } - - public String getBp() { - return bp; - } - - public void setBp(String bp) { - this.bp = bp; - } - - public String getBusawmny() { - return busawmny; - } - - public void setBusawmny(String busawmny) { - this.busawmny = busawmny; - } - - public String getCmnecode() { - return cmnecode; - } - - public void setCmnecode(String cmnecode) { - this.cmnecode = cmnecode; - } - - public String getCooperateflag() { - return cooperateflag; - } - - public void setCooperateflag(String cooperateflag) { - this.cooperateflag = cooperateflag; - } - - public String getCooperatingdayfrom() { - return cooperatingdayfrom; - } - - public void setCooperatingdayfrom(String cooperatingdayfrom) { - this.cooperatingdayfrom = cooperatingdayfrom; - } - - public String getCooperatingdayto() { - return cooperatingdayto; - } - - public void setCooperatingdayto(String cooperatingdayto) { - this.cooperatingdayto = cooperatingdayto; - } - - public String getCorrespsettleunit() { - return correspsettleunit; - } - - public void setCorrespsettleunit(String correspsettleunit) { - this.correspsettleunit = correspsettleunit; - } - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public String getCreditcontrol() { - return creditcontrol; - } - - public void setCreditcontrol(String creditcontrol) { - this.creditcontrol = creditcontrol; - } - - public String getCreditlevel() { - return creditlevel; - } - - public void setCreditlevel(String creditlevel) { - this.creditlevel = creditlevel; - } - - public String getCreditlimitnum() { - return creditlimitnum; - } - - public void setCreditlimitnum(String creditlimitnum) { - this.creditlimitnum = creditlimitnum; - } - - public String getCreditmny() { - return creditmny; - } - - public void setCreditmny(String creditmny) { - this.creditmny = creditmny; - } - - public String getCreditmoney() { - return creditmoney; - } - - public void setCreditmoney(String creditmoney) { - this.creditmoney = creditmoney; - } - - public Long getCredlimitflag() { - return credlimitflag; - } - - public void setCredlimitflag(Long credlimitflag) { - this.credlimitflag = credlimitflag; - } - - public String getCustflag() { - return custflag; - } - - public void setCustflag(String custflag) { - this.custflag = custflag; - } - - public Long getCuststate() { - return custstate; - } - - public void setCuststate(Long custstate) { - this.custstate = custstate; - } - - public String getDef1() { - return def1; - } - - public void setDef1(String def1) { - this.def1 = def1; - } - - public String getDef10() { - return def10; - } - - public void setDef10(String def10) { - this.def10 = def10; - } - - public String getDef11() { - return def11; - } - - public void setDef11(String def11) { - this.def11 = def11; - } - - public String getDef12() { - return def12; - } - - public void setDef12(String def12) { - this.def12 = def12; - } - - public String getDef13() { - return def13; - } - - public void setDef13(String def13) { - this.def13 = def13; - } - - public String getDef14() { - return def14; - } - - public void setDef14(String def14) { - this.def14 = def14; - } - - public String getDef15() { - return def15; - } - - public void setDef15(String def15) { - this.def15 = def15; - } - - public String getDef16() { - return def16; - } - - public void setDef16(String def16) { - this.def16 = def16; - } - - public String getDef17() { - return def17; - } - - public void setDef17(String def17) { - this.def17 = def17; - } - - public String getDef18() { - return def18; - } - - public void setDef18(String def18) { - this.def18 = def18; - } - - public String getDef19() { - return def19; - } - - public void setDef19(String def19) { - this.def19 = def19; - } - - public String getDef2() { - return def2; - } - - public void setDef2(String def2) { - this.def2 = def2; - } - - public String getDef20() { - return def20; - } - - public void setDef20(String def20) { - this.def20 = def20; - } - - public String getDef21() { - return def21; - } - - public void setDef21(String def21) { - this.def21 = def21; - } - - public String getDef22() { - return def22; - } - - public void setDef22(String def22) { - this.def22 = def22; - } - - public String getDef23() { - return def23; - } - - public void setDef23(String def23) { - this.def23 = def23; - } - - public String getDef24() { - return def24; - } - - public void setDef24(String def24) { - this.def24 = def24; - } - - public String getDef25() { - return def25; - } - - public void setDef25(String def25) { - this.def25 = def25; - } - - public String getDef26() { - return def26; - } - - public void setDef26(String def26) { - this.def26 = def26; - } - - public String getDef27() { - return def27; - } - - public void setDef27(String def27) { - this.def27 = def27; - } - - public String getDef28() { - return def28; - } - - public void setDef28(String def28) { - this.def28 = def28; - } - - public String getDef29() { - return def29; - } - - public void setDef29(String def29) { - this.def29 = def29; - } - - public String getDef3() { - return def3; - } - - public void setDef3(String def3) { - this.def3 = def3; - } - - public String getDef30() { - return def30; - } - - public void setDef30(String def30) { - this.def30 = def30; - } - - public String getDef4() { - return def4; - } - - public void setDef4(String def4) { - this.def4 = def4; - } - - public String getDef5() { - return def5; - } - - public void setDef5(String def5) { - this.def5 = def5; - } - - public String getDef6() { - return def6; - } - - public void setDef6(String def6) { - this.def6 = def6; - } - - public String getDef7() { - return def7; - } - - public void setDef7(String def7) { - this.def7 = def7; - } - - public String getDef8() { - return def8; - } - - public void setDef8(String def8) { - this.def8 = def8; - } - - public String getDef9() { - return def9; - } - - public void setDef9(String def9) { - this.def9 = def9; - } - - public String getDevelopdate() { - return developdate; - } - - public void setDevelopdate(String developdate) { - this.developdate = developdate; - } - - public String getDiffcurrflag() { - return diffcurrflag; - } - - public void setDiffcurrflag(String diffcurrflag) { - this.diffcurrflag = diffcurrflag; - } - - public String getDiscountrate() { - return discountrate; - } - - public void setDiscountrate(String discountrate) { - this.discountrate = discountrate; - } - - public Long getDr() { - return dr; - } - - public void setDr(Long dr) { - this.dr = dr; - } - - public String getFreeofacclmtcheck() { - return freeofacclmtcheck; - } - - public void setFreeofacclmtcheck(String freeofacclmtcheck) { - this.freeofacclmtcheck = freeofacclmtcheck; - } - - public String getFreeofcremnycheck() { - return freeofcremnycheck; - } - - public void setFreeofcremnycheck(String freeofcremnycheck) { - this.freeofcremnycheck = freeofcremnycheck; - } - - public String getFrozendate() { - return frozendate; - } - - public void setFrozendate(String frozendate) { - this.frozendate = frozendate; - } - - public String getFrozenflag() { - return frozenflag; - } - - public void setFrozenflag(String frozenflag) { - this.frozenflag = frozenflag; - } - - public Long getGrade() { - return grade; - } - - public void setGrade(Long grade) { - this.grade = grade; - } - - public Long getInnerctldays() { - return innerctldays; - } - - public void setInnerctldays(Long innerctldays) { - this.innerctldays = innerctldays; - } - - public String getIounit() { - return iounit; - } - - public void setIounit(String iounit) { - this.iounit = iounit; - } - - public String getIsagent() { - return isagent; - } - - public void setIsagent(String isagent) { - this.isagent = isagent; - } - - public String getIspromtesettlement() { - return ispromtesettlement; - } - - public void setIspromtesettlement(String ispromtesettlement) { - this.ispromtesettlement = ispromtesettlement; - } - - public String getLinkman() { - return linkman; - } - - public void setLinkman(String linkman) { - this.linkman = linkman; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getMobilephone() { - return mobilephone; - } - - public void setMobilephone(String mobilephone) { - this.mobilephone = mobilephone; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getModifytime() { - return modifytime; - } - - public void setModifytime(String modifytime) { - this.modifytime = modifytime; - } - - public String getOrdawmny() { - return ordawmny; - } - - public void setOrdawmny(String ordawmny) { - this.ordawmny = ordawmny; - } - - public String getPkCalbody() { - return pkCalbody; - } - - public void setPkCalbody(String pkCalbody) { - this.pkCalbody = pkCalbody; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getPkCubasdoc() { - return pkCubasdoc; - } - - public void setPkCubasdoc(String pkCubasdoc) { - this.pkCubasdoc = pkCubasdoc; - } - - public String getPkCumandoc() { - return pkCumandoc; - } - - public void setPkCumandoc(String pkCumandoc) { - this.pkCumandoc = pkCumandoc; - } - - public String getPkCurrtype1() { - return pkCurrtype1; - } - - public void setPkCurrtype1(String pkCurrtype1) { - this.pkCurrtype1 = pkCurrtype1; - } - - public String getPkCusmandoc2() { - return pkCusmandoc2; - } - - public void setPkCusmandoc2(String pkCusmandoc2) { - this.pkCusmandoc2 = pkCusmandoc2; - } - - public String getPkCusmandoc3() { - return pkCusmandoc3; - } - - public void setPkCusmandoc3(String pkCusmandoc3) { - this.pkCusmandoc3 = pkCusmandoc3; - } - - public String getPkDefbusitype() { - return pkDefbusitype; - } - - public void setPkDefbusitype(String pkDefbusitype) { - this.pkDefbusitype = pkDefbusitype; - } - - public String getPkPayterm() { - return pkPayterm; - } - - public void setPkPayterm(String pkPayterm) { - this.pkPayterm = pkPayterm; - } - - public String getPkPricegroupcorp() { - return pkPricegroupcorp; - } - - public void setPkPricegroupcorp(String pkPricegroupcorp) { - this.pkPricegroupcorp = pkPricegroupcorp; - } - - public String getPkRespdept1() { - return pkRespdept1; - } - - public void setPkRespdept1(String pkRespdept1) { - this.pkRespdept1 = pkRespdept1; - } - - public String getPkResppsn1() { - return pkResppsn1; - } - - public void setPkResppsn1(String pkResppsn1) { - this.pkResppsn1 = pkResppsn1; - } - - public String getPkSalestru() { - return pkSalestru; - } - - public void setPkSalestru(String pkSalestru) { - this.pkSalestru = pkSalestru; - } - - public String getPkSendtype() { - return pkSendtype; - } - - public void setPkSendtype(String pkSendtype) { - this.pkSendtype = pkSendtype; - } - - public String getPkSettleunit() { - return pkSettleunit; - } - - public void setPkSettleunit(String pkSettleunit) { - this.pkSettleunit = pkSettleunit; - } - - public String getPkStordoc2() { - return pkStordoc2; - } - - public void setPkStordoc2(String pkStordoc2) { - this.pkStordoc2 = pkStordoc2; - } - - public Long getPrepaidratio() { - return prepaidratio; - } - - public void setPrepaidratio(Long prepaidratio) { - this.prepaidratio = prepaidratio; - } - - public String getRatifydate() { - return ratifydate; - } - - public void setRatifydate(String ratifydate) { - this.ratifydate = ratifydate; - } - - public String getSealflag() { - return sealflag; - } - - public void setSealflag(String sealflag) { - this.sealflag = sealflag; - } - - public Long getStockpriceratio() { - return stockpriceratio; - } - - public void setStockpriceratio(Long stockpriceratio) { - this.stockpriceratio = stockpriceratio; - } - - public String getTestsalemoney() { - return testsalemoney; - } - - public void setTestsalemoney(String testsalemoney) { - this.testsalemoney = testsalemoney; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - + /** + * 根据多个编码进行查询 + */ + private String custcodes; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.xml index b6e922a1..29660942 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.xml @@ -193,6 +193,7 @@ ,testsalemoney ,ts + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.java index bf657a4d..9324b76c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.java @@ -15,6 +15,7 @@ public class BdDefdocEntity extends BaseEntity { private Integer docsystype; private Integer dr; private String memo; + private String pkCorp; private String pkDefdoc; private String pkDefdoc1; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.java index f2b7b7cf..29dc0a81 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; import java.math.BigDecimal; @@ -10,8 +11,8 @@ import java.math.BigDecimal; * @author makejava * @since 2023-08-25 11:27:08 */ +@Data public class BdInvbasdocEntity extends BaseEntity { - private String asset; private String assistunit; private String autobalancemeas; @@ -123,707 +124,14 @@ public class BdInvbasdocEntity extends BaseEntity { */ private String modifytime_end_time; - /** * 管理档案公司主键 */ private String pk_corp_man; - public String getPk_corp_man() { - return pk_corp_man; - } - - public void setPk_corp_man(String pk_corp_man) { - this.pk_corp_man = pk_corp_man; - } - - public String getCreatetime_start_time() { - return createtime_start_time; - } - - public void setCreatetime_start_time(String createtime_start_time) { - this.createtime_start_time = createtime_start_time; - } - - public String getCreatetime_end_time() { - return createtime_end_time; - } - - public void setCreatetime_end_time(String createtime_end_time) { - this.createtime_end_time = createtime_end_time; - } - - public String getModifytime_start_time() { - return modifytime_start_time; - } - - public void setModifytime_start_time(String modifytime_start_time) { - this.modifytime_start_time = modifytime_start_time; - } - - public String getModifytime_end_time() { - return modifytime_end_time; - } - - public void setModifytime_end_time(String modifytime_end_time) { - this.modifytime_end_time = modifytime_end_time; - } - - public String getPk_corp() { - return pk_corp; - } - - public void setPk_corp(String pk_corp) { - this.pk_corp = pk_corp; - } - - public String getPk_invmandoc() { - return pk_invmandoc; - } - - public void setPk_invmandoc(String pk_invmandoc) { - this.pk_invmandoc = pk_invmandoc; - } - - public String getAsset() { - return asset; - } - - public void setAsset(String asset) { - this.asset = asset; - } - - public String getAssistunit() { - return assistunit; - } - - public void setAssistunit(String assistunit) { - this.assistunit = assistunit; - } - - public String getAutobalancemeas() { - return autobalancemeas; - } - - public void setAutobalancemeas(String autobalancemeas) { - this.autobalancemeas = autobalancemeas; - } - - public String getBilltemplet() { - return billtemplet; - } - - public void setBilltemplet(String billtemplet) { - this.billtemplet = billtemplet; - } - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public String getDef1() { - return def1; - } - - public void setDef1(String def1) { - this.def1 = def1; - } - - public String getDef10() { - return def10; - } - - public void setDef10(String def10) { - this.def10 = def10; - } - - public String getDef11() { - return def11; - } - - public void setDef11(String def11) { - this.def11 = def11; - } - - public String getDef12() { - return def12; - } - - public void setDef12(String def12) { - this.def12 = def12; - } - - public String getDef13() { - return def13; - } - - public void setDef13(String def13) { - this.def13 = def13; - } - - public String getDef14() { - return def14; - } - - public void setDef14(String def14) { - this.def14 = def14; - } - - public String getDef15() { - return def15; - } - - public void setDef15(String def15) { - this.def15 = def15; - } - - public String getDef16() { - return def16; - } - - public void setDef16(String def16) { - this.def16 = def16; - } - - public String getDef17() { - return def17; - } - - public void setDef17(String def17) { - this.def17 = def17; - } - - public String getDef18() { - return def18; - } - - public void setDef18(String def18) { - this.def18 = def18; - } - - public String getDef19() { - return def19; - } - - public void setDef19(String def19) { - this.def19 = def19; - } - - public String getDef2() { - return def2; - } - - public void setDef2(String def2) { - this.def2 = def2; - } - - public String getDef20() { - return def20; - } - - public void setDef20(String def20) { - this.def20 = def20; - } - - public String getDef3() { - return def3; - } - - public void setDef3(String def3) { - this.def3 = def3; - } - - public String getDef4() { - return def4; - } - - public void setDef4(String def4) { - this.def4 = def4; - } - - public String getDef5() { - return def5; - } - - public void setDef5(String def5) { - this.def5 = def5; - } - - public String getDef6() { - return def6; - } - - public void setDef6(String def6) { - this.def6 = def6; - } - - public String getDef7() { - return def7; - } - - public void setDef7(String def7) { - this.def7 = def7; - } - - public String getDef8() { - return def8; - } - - public void setDef8(String def8) { - this.def8 = def8; - } - - public String getDef9() { - return def9; - } - - public void setDef9(String def9) { - this.def9 = def9; - } - - public String getDiscountflag() { - return discountflag; - } - - public void setDiscountflag(String discountflag) { - this.discountflag = discountflag; - } - - public Long getDr() { - return dr; - } - - public void setDr(Long dr) { - this.dr = dr; - } - - public String getFaset() { - return faset; - } - - public void setFaset(String faset) { - this.faset = faset; - } - - public String getForinvname() { - return forinvname; - } - - public void setForinvname(String forinvname) { - this.forinvname = forinvname; - } - - public String getFree1() { - return free1; - } - - public void setFree1(String free1) { - this.free1 = free1; - } - - public String getFree10() { - return free10; - } - - public void setFree10(String free10) { - this.free10 = free10; - } - - public String getFree2() { - return free2; - } - - public void setFree2(String free2) { - this.free2 = free2; - } - - public String getFree3() { - return free3; - } - - public void setFree3(String free3) { - this.free3 = free3; - } - - public String getFree4() { - return free4; - } - - public void setFree4(String free4) { - this.free4 = free4; - } - - public String getFree5() { - return free5; - } - - public void setFree5(String free5) { - this.free5 = free5; - } - - public String getFree6() { - return free6; - } - - public void setFree6(String free6) { - this.free6 = free6; - } - - public String getFree7() { - return free7; - } - - public void setFree7(String free7) { - this.free7 = free7; - } - - public String getFree8() { - return free8; - } - - public void setFree8(String free8) { - this.free8 = free8; - } - - public String getFree9() { - return free9; - } - - public void setFree9(String free9) { - this.free9 = free9; - } - - public String getGraphid() { - return graphid; - } - - public void setGraphid(String graphid) { - this.graphid = graphid; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getInvbarcode() { - return invbarcode; - } - - public void setInvbarcode(String invbarcode) { - this.invbarcode = invbarcode; - } - - public String getInvcode() { - return invcode; - } - - public void setInvcode(String invcode) { - this.invcode = invcode; - } - - public String getInvmnecode() { - return invmnecode; - } - - public void setInvmnecode(String invmnecode) { - this.invmnecode = invmnecode; - } - - public String getInvname() { - return invname; - } - - public void setInvname(String invname) { - this.invname = invname; - } - - public String getInvpinpai() { - return invpinpai; - } - - public void setInvpinpai(String invpinpai) { - this.invpinpai = invpinpai; - } - - public String getInvshortname() { - return invshortname; - } - - public void setInvshortname(String invshortname) { - this.invshortname = invshortname; - } - - public String getInvspec() { - return invspec; - } - - public void setInvspec(String invspec) { - this.invspec = invspec; - } - - public String getInvtype() { - return invtype; - } - - public void setInvtype(String invtype) { - this.invtype = invtype; - } - - public String getIselectrans() { - return iselectrans; - } - - public void setIselectrans(String iselectrans) { - this.iselectrans = iselectrans; - } - - public String getIsmngstockbygrswt() { - return ismngstockbygrswt; - } - - public void setIsmngstockbygrswt(String ismngstockbygrswt) { - this.ismngstockbygrswt = ismngstockbygrswt; - } - - public String getIsretail() { - return isretail; - } - - public void setIsretail(String isretail) { - this.isretail = isretail; - } - - public String getIsstorebyconvert() { - return isstorebyconvert; - } - - public void setIsstorebyconvert(String isstorebyconvert) { - this.isstorebyconvert = isstorebyconvert; - } - - public String getLaborflag() { - return laborflag; - } - - public void setLaborflag(String laborflag) { - this.laborflag = laborflag; - } - - public String getLength() { - return length; - } - - public void setLength(String length) { - this.length = length; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getModifytime() { - return modifytime; - } - - public void setModifytime(String modifytime) { - this.modifytime = modifytime; - } - - public String getPkAssetcategory() { - return pkAssetcategory; - } - - public void setPkAssetcategory(String pkAssetcategory) { - this.pkAssetcategory = pkAssetcategory; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getPkInvbasdoc() { - return pkInvbasdoc; - } - - public void setPkInvbasdoc(String pkInvbasdoc) { - this.pkInvbasdoc = pkInvbasdoc; - } - - public String getPkInvcl() { - return pkInvcl; - } - - public void setPkInvcl(String pkInvcl) { - this.pkInvcl = pkInvcl; - } - - public String getPkMeasdoc() { - return pkMeasdoc; - } - - public void setPkMeasdoc(String pkMeasdoc) { - this.pkMeasdoc = pkMeasdoc; - } - - public String getPkMeasdoc1() { - return pkMeasdoc1; - } - - public void setPkMeasdoc1(String pkMeasdoc1) { - this.pkMeasdoc1 = pkMeasdoc1; - } - - public String getPkMeasdoc2() { - return pkMeasdoc2; - } - - public void setPkMeasdoc2(String pkMeasdoc2) { - this.pkMeasdoc2 = pkMeasdoc2; - } - - public String getPkMeasdoc3() { - return pkMeasdoc3; - } - - public void setPkMeasdoc3(String pkMeasdoc3) { - this.pkMeasdoc3 = pkMeasdoc3; - } - - public String getPkMeasdoc5() { - return pkMeasdoc5; - } - - public void setPkMeasdoc5(String pkMeasdoc5) { - this.pkMeasdoc5 = pkMeasdoc5; - } - - public String getPkMeasdoc6() { - return pkMeasdoc6; - } - - public void setPkMeasdoc6(String pkMeasdoc6) { - this.pkMeasdoc6 = pkMeasdoc6; - } - - public String getPkProdline() { - return pkProdline; - } - - public void setPkProdline(String pkProdline) { - this.pkProdline = pkProdline; - } - - public String getPkTaxitems() { - return pkTaxitems; - } - - public void setPkTaxitems(String pkTaxitems) { - this.pkTaxitems = pkTaxitems; - } - - public String getSealflag() { - return sealflag; - } - - public void setSealflag(String sealflag) { - this.sealflag = sealflag; - } - - public String getSetpartsflag() { - return setpartsflag; - } - - public void setSetpartsflag(String setpartsflag) { - this.setpartsflag = setpartsflag; - } - - public String getShipunitnum() { - return shipunitnum; - } - - public void setShipunitnum(String shipunitnum) { - this.shipunitnum = shipunitnum; - } - - public String getStoreunitnum() { - return storeunitnum; - } - - public void setStoreunitnum(String storeunitnum) { - this.storeunitnum = storeunitnum; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getUnitvolume() { - return unitvolume; - } - - public void setUnitvolume(String unitvolume) { - this.unitvolume = unitvolume; - } - - public BigDecimal getUnitweight() { - return unitweight; - } - - public void setUnitweight(BigDecimal unitweight) { - this.unitweight = unitweight; - } - - public String getWeitunitnum() { - return weitunitnum; - } - - public void setWeitunitnum(String weitunitnum) { - this.weitunitnum = weitunitnum; - } - - public String getWidth() { - return width; - } - - public void setWidth(String width) { - this.width = width; - } - + /** + * 多个编码查询 + */ + private String invcodes; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.xml index 9e8aef16..ca2a0819 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvbasdocEntity.xml @@ -1012,6 +1012,20 @@ update bd_invbasdoc set sts= 'N' and bim.pk_corp = #{pk_corp} + + and bia.invcode = #{invcode} + + + + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.java index 0c7ebc27..ec03c9af 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * (BdInvmandoc)实体类-存货管理档案 @@ -8,6 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @author makejava * @since 2023-08-25 11:21:44 */ +@Data public class BdInvmandocEntity extends BaseEntity { private String abctype; @@ -114,765 +116,9 @@ public class BdInvmandocEntity extends BaseEntity { */ private String invmnecode; - public String getInvmnecode() { - return invmnecode; - } - - public void setInvmnecode(String invmnecode) { - this.invmnecode = invmnecode; - } - - public String getInvcode() { - return invcode; - } - - public void setInvcode(String invcode) { - this.invcode = invcode; - } - - public String getAbctype() { - return abctype; - } - - public void setAbctype(String abctype) { - this.abctype = abctype; - } - - public String getAccflag() { - return accflag; - } - - public void setAccflag(String accflag) { - this.accflag = accflag; - } - - public String getCinvmnecode() { - return cinvmnecode; - } - - public void setCinvmnecode(String cinvmnecode) { - this.cinvmnecode = cinvmnecode; - } - - public String getConsumesettleflag() { - return consumesettleflag; - } - - public void setConsumesettleflag(String consumesettleflag) { - this.consumesettleflag = consumesettleflag; - } - - public String getCoopdayfrom() { - return coopdayfrom; - } - - public void setCoopdayfrom(String coopdayfrom) { - this.coopdayfrom = coopdayfrom; - } - - public String getCoopdayto() { - return coopdayto; - } - - public void setCoopdayto(String coopdayto) { - this.coopdayto = coopdayto; - } - - public String getCostprice() { - return costprice; - } - - public void setCostprice(String costprice) { - this.costprice = costprice; - } - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public String getDef1() { - return def1; - } - - public void setDef1(String def1) { - this.def1 = def1; - } - - public String getDef10() { - return def10; - } - - public void setDef10(String def10) { - this.def10 = def10; - } - - public String getDef11() { - return def11; - } - - public void setDef11(String def11) { - this.def11 = def11; - } - - public String getDef12() { - return def12; - } - - public void setDef12(String def12) { - this.def12 = def12; - } - - public String getDef13() { - return def13; - } - - public void setDef13(String def13) { - this.def13 = def13; - } - - public String getDef14() { - return def14; - } - - public void setDef14(String def14) { - this.def14 = def14; - } - - public String getDef15() { - return def15; - } - - public void setDef15(String def15) { - this.def15 = def15; - } - - public String getDef16() { - return def16; - } - - public void setDef16(String def16) { - this.def16 = def16; - } - - public String getDef17() { - return def17; - } - - public void setDef17(String def17) { - this.def17 = def17; - } - - public String getDef18() { - return def18; - } - - public void setDef18(String def18) { - this.def18 = def18; - } - - public String getDef19() { - return def19; - } - - public void setDef19(String def19) { - this.def19 = def19; - } - - public String getDef2() { - return def2; - } - - public void setDef2(String def2) { - this.def2 = def2; - } - - public String getDef20() { - return def20; - } - - public void setDef20(String def20) { - this.def20 = def20; - } - - public String getDef3() { - return def3; - } - - public void setDef3(String def3) { - this.def3 = def3; - } - - public String getDef4() { - return def4; - } - - public void setDef4(String def4) { - this.def4 = def4; - } - - public String getDef5() { - return def5; - } - - public void setDef5(String def5) { - this.def5 = def5; - } - - public String getDef6() { - return def6; - } - - public void setDef6(String def6) { - this.def6 = def6; - } - - public String getDef7() { - return def7; - } - - public void setDef7(String def7) { - this.def7 = def7; - } - - public String getDef8() { - return def8; - } - - public void setDef8(String def8) { - this.def8 = def8; - } - - public String getDef9() { - return def9; - } - - public void setDef9(String def9) { - this.def9 = def9; - } - - public Long getDr() { - return dr; - } - - public void setDr(Long dr) { - this.dr = dr; - } - - public String getExpaybacktax() { - return expaybacktax; - } - - public void setExpaybacktax(String expaybacktax) { - this.expaybacktax = expaybacktax; - } - - public String getFree1() { - return free1; - } - - public void setFree1(String free1) { - this.free1 = free1; - } - - public String getFree2() { - return free2; - } - - public void setFree2(String free2) { - this.free2 = free2; - } - - public String getFree3() { - return free3; - } - - public void setFree3(String free3) { - this.free3 = free3; - } - - public String getFree4() { - return free4; - } - - public void setFree4(String free4) { - this.free4 = free4; - } - - public String getFree5() { - return free5; - } - - public void setFree5(String free5) { - this.free5 = free5; - } - - public String getGrade() { - return grade; - } - - public void setGrade(String grade) { - this.grade = grade; - } - - public Long getInvlifeperiod() { - return invlifeperiod; - } - - public void setInvlifeperiod(Long invlifeperiod) { - this.invlifeperiod = invlifeperiod; - } - - public String getIsappendant() { - return isappendant; - } - - public void setIsappendant(String isappendant) { - this.isappendant = isappendant; - } - - public String getIsautoatpcheck() { - return isautoatpcheck; - } - - public void setIsautoatpcheck(String isautoatpcheck) { - this.isautoatpcheck = isautoatpcheck; - } - - public String getIscancalculatedinvcost() { - return iscancalculatedinvcost; - } - - public void setIscancalculatedinvcost(String iscancalculatedinvcost) { - this.iscancalculatedinvcost = iscancalculatedinvcost; - } - - public String getIscanpurchased() { - return iscanpurchased; - } - - public void setIscanpurchased(String iscanpurchased) { - this.iscanpurchased = iscanpurchased; - } - - public String getIscansaleinvoice() { - return iscansaleinvoice; - } - - public void setIscansaleinvoice(String iscansaleinvoice) { - this.iscansaleinvoice = iscansaleinvoice; - } - - public String getIscansold() { - return iscansold; - } - - public void setIscansold(String iscansold) { - this.iscansold = iscansold; - } - - public String getIsconfigable() { - return isconfigable; - } - - public void setIsconfigable(String isconfigable) { - this.isconfigable = isconfigable; - } - - public String getIsctlprodplanprice() { - return isctlprodplanprice; - } - - public void setIsctlprodplanprice(String isctlprodplanprice) { - this.isctlprodplanprice = isctlprodplanprice; - } - - public String getIsfatherofbom() { - return isfatherofbom; - } - - public void setIsfatherofbom(String isfatherofbom) { - this.isfatherofbom = isfatherofbom; - } - - public String getIsinvretfreeofchk() { - return isinvretfreeofchk; - } - - public void setIsinvretfreeofchk(String isinvretfreeofchk) { - this.isinvretfreeofchk = isinvretfreeofchk; - } - - public String getIsinvretinstobychk() { - return isinvretinstobychk; - } - - public void setIsinvretinstobychk(String isinvretinstobychk) { - this.isinvretinstobychk = isinvretinstobychk; - } - - public String getIsinvreturned() { - return isinvreturned; - } - - public void setIsinvreturned(String isinvreturned) { - this.isinvreturned = isinvreturned; - } - - public String getIsnoconallowed() { - return isnoconallowed; - } - - public void setIsnoconallowed(String isnoconallowed) { - this.isnoconallowed = isnoconallowed; - } - - public String getIsprimarybarcode() { - return isprimarybarcode; - } - - public void setIsprimarybarcode(String isprimarybarcode) { - this.isprimarybarcode = isprimarybarcode; - } - - public String getIsrecurrentcheck() { - return isrecurrentcheck; - } - - public void setIsrecurrentcheck(String isrecurrentcheck) { - this.isrecurrentcheck = isrecurrentcheck; - } - - public String getIssalable() { - return issalable; - } - - public void setIssalable(String issalable) { - this.issalable = issalable; - } - - public String getIssecondarybarcode() { - return issecondarybarcode; - } - - public void setIssecondarybarcode(String issecondarybarcode) { - this.issecondarybarcode = issecondarybarcode; - } - - public String getIsselfapprsupplier() { - return isselfapprsupplier; - } - - public void setIsselfapprsupplier(String isselfapprsupplier) { - this.isselfapprsupplier = isselfapprsupplier; - } - - public String getIsspecialty() { - return isspecialty; - } - - public void setIsspecialty(String isspecialty) { - this.isspecialty = isspecialty; - } - - public String getIssupplierstock() { - return issupplierstock; - } - - public void setIssupplierstock(String issupplierstock) { - this.issupplierstock = issupplierstock; - } - - public String getIsused() { - return isused; - } - - public void setIsused(String isused) { - this.isused = isused; - } - - public String getIsvirtual() { - return isvirtual; - } - - public void setIsvirtual(String isvirtual) { - this.isvirtual = isvirtual; - } - - public String getKeepwasterate() { - return keepwasterate; - } - - public void setKeepwasterate(String keepwasterate) { - this.keepwasterate = keepwasterate; - } - - public String getLowestprice() { - return lowestprice; - } - - public void setLowestprice(String lowestprice) { - this.lowestprice = lowestprice; - } - - public String getMantaxitem() { - return mantaxitem; - } - - public void setMantaxitem(String mantaxitem) { - this.mantaxitem = mantaxitem; - } - - public String getMaxprice() { - return maxprice; - } - - public void setMaxprice(String maxprice) { - this.maxprice = maxprice; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getModifytime() { - return modifytime; - } - - public void setModifytime(String modifytime) { - this.modifytime = modifytime; - } - - public String getNegallowed() { - return negallowed; - } - - public void setNegallowed(String negallowed) { - this.negallowed = negallowed; - } - - public Long getOutpriority() { - return outpriority; - } - - public void setOutpriority(Long outpriority) { - this.outpriority = outpriority; - } - - public String getOuttrackin() { - return outtrackin; - } - - public void setOuttrackin(String outtrackin) { - this.outtrackin = outtrackin; - } - - public String getPebegin() { - return pebegin; - } - - public void setPebegin(String pebegin) { - this.pebegin = pebegin; - } - - public String getPeend() { - return peend; - } - - public void setPeend(String peend) { - this.peend = peend; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getPkCumandoc() { - return pkCumandoc; - } - - public void setPkCumandoc(String pkCumandoc) { - this.pkCumandoc = pkCumandoc; - } - - public String getPkDftfactory() { - return pkDftfactory; - } - - public void setPkDftfactory(String pkDftfactory) { - this.pkDftfactory = pkDftfactory; - } - - public String getPkInvbasdoc() { - return pkInvbasdoc; - } - - public void setPkInvbasdoc(String pkInvbasdoc) { - this.pkInvbasdoc = pkInvbasdoc; - } - - public String getPkInvmandoc() { - return pkInvmandoc; - } - - public void setPkInvmandoc(String pkInvmandoc) { - this.pkInvmandoc = pkInvmandoc; - } - - public String getPkSealuser() { - return pkSealuser; - } - - public void setPkSealuser(String pkSealuser) { - this.pkSealuser = pkSealuser; - } - - public String getPlanprice() { - return planprice; - } - - public void setPlanprice(String planprice) { - this.planprice = planprice; - } - - public String getProdarea() { - return prodarea; - } - - public void setProdarea(String prodarea) { - this.prodarea = prodarea; - } - - public String getPurchasestge() { - return purchasestge; - } - - public void setPurchasestge(String purchasestge) { - this.purchasestge = purchasestge; - } - - public String getPurwasterate() { - return purwasterate; - } - - public void setPurwasterate(String purwasterate) { - this.purwasterate = purwasterate; - } - - public String getQualitydaynum() { - return qualitydaynum; - } - - public void setQualitydaynum(String qualitydaynum) { - this.qualitydaynum = qualitydaynum; - } - - public String getQualitymanflag() { - return qualitymanflag; - } - - public void setQualitymanflag(String qualitymanflag) { - this.qualitymanflag = qualitymanflag; - } - - public Long getQualityperiodunit() { - return qualityperiodunit; - } - - public void setQualityperiodunit(Long qualityperiodunit) { - this.qualityperiodunit = qualityperiodunit; - } - - public Long getRecurrentchkcyc() { - return recurrentchkcyc; - } - - public void setRecurrentchkcyc(Long recurrentchkcyc) { - this.recurrentchkcyc = recurrentchkcyc; - } - - public String getRefsaleprice() { - return refsaleprice; - } - - public void setRefsaleprice(String refsaleprice) { - this.refsaleprice = refsaleprice; - } - - public String getSealdate() { - return sealdate; - } - - public void setSealdate(String sealdate) { - this.sealdate = sealdate; - } - - public String getSealflag() { - return sealflag; - } - - public void setSealflag(String sealflag) { - this.sealflag = sealflag; - } - - public String getSellproxyflag() { - return sellproxyflag; - } - - public void setSellproxyflag(String sellproxyflag) { - this.sellproxyflag = sellproxyflag; - } - - public String getSerialmanaflag() { - return serialmanaflag; - } - - public void setSerialmanaflag(String serialmanaflag) { - this.serialmanaflag = serialmanaflag; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getWholemanaflag() { - return wholemanaflag; - } - - public void setWholemanaflag(String wholemanaflag) { - this.wholemanaflag = wholemanaflag; - } - + /** + * 查询多个存货编码 + */ + private String invcodes; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.xml index 9af380e8..4e08469f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdInvmandocEntity.xml @@ -1129,117 +1129,120 @@ update bd_invmandoc set sts= 'N' - + select + bd_invmandoc.abctype + ,bd_invmandoc.accflag + ,bd_invmandoc.cinvmnecode + ,bd_invmandoc.consumesettleflag + ,bd_invmandoc.coopdayfrom + ,bd_invmandoc.coopdayto + ,bd_invmandoc.costprice + ,bd_invmandoc.createtime + ,bd_invmandoc.creator + ,bd_invmandoc.def1 + ,bd_invmandoc.def10 + ,bd_invmandoc.def11 + ,bd_invmandoc.def12 + ,bd_invmandoc.def13 + ,bd_invmandoc.def14 + ,bd_invmandoc.def15 + ,bd_invmandoc.def16 + ,bd_invmandoc.def17 + ,bd_invmandoc.def18 + ,bd_invmandoc.def19 + ,bd_invmandoc.def2 + ,bd_invmandoc.def20 + ,bd_invmandoc.def3 + ,bd_invmandoc.def4 + ,bd_invmandoc.def5 + ,bd_invmandoc.def6 + ,bd_invmandoc.def7 + ,bd_invmandoc.def8 + ,bd_invmandoc.def9 + ,bd_invmandoc.dr + ,bd_invmandoc.expaybacktax + ,bd_invmandoc.free1 + ,bd_invmandoc.free2 + ,bd_invmandoc.free3 + ,bd_invmandoc.free4 + ,bd_invmandoc.free5 + ,bd_invmandoc.grade + ,bd_invmandoc.invlifeperiod + ,bd_invmandoc.isappendant + ,bd_invmandoc.isautoatpcheck + ,bd_invmandoc.iscancalculatedinvcost + ,bd_invmandoc.iscanpurchased + ,bd_invmandoc.iscansaleinvoice + ,bd_invmandoc.iscansold + ,bd_invmandoc.isconfigable + ,bd_invmandoc.isctlprodplanprice + ,bd_invmandoc.isfatherofbom + ,bd_invmandoc.isinvretfreeofchk + ,bd_invmandoc.isinvretinstobychk + ,bd_invmandoc.isinvreturned + ,bd_invmandoc.isnoconallowed + ,bd_invmandoc.isprimarybarcode + ,bd_invmandoc.isrecurrentcheck + ,bd_invmandoc.issalable + ,bd_invmandoc.issecondarybarcode + ,bd_invmandoc.isselfapprsupplier + ,bd_invmandoc.isspecialty + ,bd_invmandoc.issupplierstock + ,bd_invmandoc.isused + ,bd_invmandoc.isvirtual + ,bd_invmandoc.keepwasterate + ,bd_invmandoc.lowestprice + ,bd_invmandoc.mantaxitem + ,bd_invmandoc.maxprice + ,bd_invmandoc.memo + ,bd_invmandoc.modifier + ,bd_invmandoc.modifytime + ,bd_invmandoc.negallowed + ,bd_invmandoc.outpriority + ,bd_invmandoc.outtrackin + ,bd_invmandoc.pebegin + ,bd_invmandoc.peend + ,bd_invmandoc.pk_corp + ,bd_invmandoc.pk_cumandoc + ,bd_invmandoc.pk_dftfactory + ,bd_invmandoc.pk_invbasdoc + ,bd_invmandoc.pk_invmandoc + ,bd_invmandoc.pk_sealuser + ,bd_invmandoc.planprice + ,bd_invmandoc.prodarea + ,bd_invmandoc.purchasestge + ,bd_invmandoc.purwasterate + ,bd_invmandoc.qualitydaynum + ,bd_invmandoc.qualitymanflag + ,bd_invmandoc.qualityperiodunit + ,bd_invmandoc.recurrentchkcyc + ,bd_invmandoc.refsaleprice + ,bd_invmandoc.sealdate + ,bd_invmandoc.sealflag + ,bd_invmandoc.sellproxyflag + ,bd_invmandoc.serialmanaflag + ,bd_invmandoc.ts + ,bd_invmandoc.wholemanaflag + ,bd_invbasdoc.invcode + from bd_invmandoc left join bd_invbasdoc on bd_invbasdoc.pk_invbasdoc = bd_invmandoc.pk_invbasdoc + where bd_invmandoc.pk_invbasdoc in ( + select pk_invbasdoc from bd_invbasdoc bib + where bib.dr = 0 + + and bib.invcode = #{invcode} - + + and bib.invcode in (${invcodes}) + + + and bib.invmnecode = #{invmnecode} + + ) and bd_invmandoc.dr = 0 + + and bd_invmandoc.pk_corp = #{pkCorp} + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.java index 396b7ef4..c9895b65 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * (BdTaxitems)实体类-税目税率 @@ -8,6 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * @author makejava * @since 2023-08-30 18:32:17 */ +@Data public class BdTaxitemsEntity extends BaseEntity { private Integer dr; @@ -22,74 +24,14 @@ public class BdTaxitemsEntity extends BaseEntity { */ private String invcode; + /** + * 多个存货编码 + */ + private String invcodes; + /** * 存货档案主键 */ private String pk_invbasdoc; - - public String getPk_invbasdoc() { - return pk_invbasdoc; - } - - public void setPk_invbasdoc(String pk_invbasdoc) { - this.pk_invbasdoc = pk_invbasdoc; - } - - public String getInvcode() { - return invcode; - } - - public void setInvcode(String invcode) { - this.invcode = invcode; - } - - public Integer getDr() { - return dr; - } - - public void setDr(Integer dr) { - this.dr = dr; - } - - public String getPkTaxitems() { - return pkTaxitems; - } - - public void setPkTaxitems(String pkTaxitems) { - this.pkTaxitems = pkTaxitems; - } - - public String getTaxcode() { - return taxcode; - } - - public void setTaxcode(String taxcode) { - this.taxcode = taxcode; - } - - public String getTaxname() { - return taxname; - } - - public void setTaxname(String taxname) { - this.taxname = taxname; - } - - public Double getTaxratio() { - return taxratio; - } - - public void setTaxratio(Double taxratio) { - this.taxratio = taxratio; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml index 53dd9574..a9f53b6c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml @@ -206,6 +206,9 @@ and bd_invbasdoc.invcode = #{invcode} + + and bd_invbasdoc.invcode in ${invcodes} + \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 3dc3fba0..bde7848b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -113,7 +113,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { if (ProfilesActiveConstant.TYPE_VBILLCODE.equals(requestJson.get("type"))) { //按单号 if (param != null && !"".equals(param)) { - startImplementStockByCode(param); + startImplementStockByCode(param, sceneType); } } else if (ProfilesActiveConstant.TYPE_TIME_FRAME.equals(requestJson.get("type"))) { //前台页面功能日期推送,或者接口调用也行 @@ -155,7 +155,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { private static final String NOTHING = "无"; - private static final String ADD = "+"; + private static final String ADD = "@0216@"; @Autowired private ShopTobOrToCUtil shopTobOrToCUtil; @@ -238,7 +238,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { * @param code O销售出库单编码 * @author liuyang */ - public void startImplementStockByCode(String code) { + public void startImplementStockByCode(String code, String sceneType) { long startMillis = System.currentTimeMillis(); String threadNameStrStart = StrUtil.format("OFS销售出库(TOC)同步U8C销售订单 开始 出库单单据号:{}", code); logger.info(threadNameStrStart); @@ -249,6 +249,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { LOCK.lock(); try { Assert.notNull(code, "O出库单编码不能为空!code is null!"); + Assert.notNull(sceneType, "场景类型不能为空!"); String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); List headerDetailsDtoList = new ArrayList<>(); @@ -263,7 +264,11 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数:{}", headerDetailsDtoList.size()); if (headerDetailsDtoList.size() > 0) { - getSetStock(headerDetailsDtoList); + if (sceneType.equals("stock")) { + getSetStock(headerDetailsDtoList); + } else if (sceneType.equals("tran")) { + getSetTran(headerDetailsDtoList); + } } else { logger.info("没有查询到任何数据!不需要同步"); } @@ -453,7 +458,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } } if (idStr.length() > 0) { - return idStr.substring(0, idStr.length()); + return idStr.substring(0, idStr.length() - 1); } return null; } @@ -583,14 +588,14 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { * * @author liuyang */ - private List filterDataSTran(List headerDetailsDtoList) { - List headerDetailsDtoList1 = new ArrayList<>(); - if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) { - //TODO 出库单明细主键,需要O返回,目前没有,已经提需求 - headerDetailsDtoList1.addAll(headerDetailsDtoList); - } - return headerDetailsDtoList1; - } +// private List filterDataSTran(List headerDetailsDtoList) { +// List headerDetailsDtoList1 = new ArrayList<>(); +// if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) { +// //TODO 出库单明细主键,需要O返回,目前没有,已经提需求 +// headerDetailsDtoList1.addAll(headerDetailsDtoList); +// } +// return headerDetailsDtoList1; +// } /** * 保存抓取到的数据到mysql底表,如果底表里已经存在,则会忽略 @@ -909,6 +914,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { * @author liuyang */ private String createGenerateBusinessDateStock(com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto header) { + //TODO 测试 + header.setShipAt("2024-09-14"); if (header != null && header.getShipAt() != null) { //TOC以出库日期作为业务日期 String shipAt = header.getShipAt(); @@ -970,7 +977,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) { try { //初始化档案缓存 - CacheTocMapVo cacheTocMapVo = basicArchivesCacheUtil.initCache(); + CacheTocMapVo cacheTocMapVo = basicArchivesCacheUtil.initCache(headerDetailsDtoList); //查询对应的OFS销售订单 List headerDetailsDtos = queryOfsOrder(headerDetailsDtoList); findMatchingOfsOrder(headerDetailsDtos, headerDetailsDtoList); @@ -998,6 +1005,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //表头公司:通过名称匹配U8C公司 // String corpName = "上海丽知品牌管理有限公司"; String companyCode = header.getCompanyCode(); + //TODO 测试 + companyCode = "SHLZ"; Assert.notNull(companyCode, "O出库单表头货主不能为空!"); BdCorpEntity bdCorpEntity = cacheTocMapVo.getStringBdCorpEntityMap().get(companyCode); Assert.notNull(bdCorpEntity, "根据公司编码({})没有匹配到U8C公司档案(公司编码=O货主)", companyCode); @@ -1054,12 +1063,12 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { for (int j = 0; j < details.size(); j++) { DetailsDto detailsDto = details.get(j); + //存货基本档案 + BdInvbasdocEntity bdInvbasdocEntity = cacheTocMapVo.getStringBdInvbasdocEntityMap().get(detailsDto.getSkuCode()); + Assert.notNull(bdInvbasdocEntity, "无法匹配到存货基本档案 存货管理主键:{} 公司:{}", detailsDto.getSkuCode(), bdCorpEntity.getPkCorp()); //存货管理档案,是发货公司的存货档案 BdInvmandocEntity bdInvmandocEntity = cacheTocMapVo.getStringBdInvmandocEntityMap().get(detailsDto.getSkuCode() + bdCorpEntity.getPkCorp()); Assert.notNull(bdInvmandocEntity, "无法匹配到存货管理档案 货品sku:{} 公司:{}", detailsDto.getSkuCode(), bdCorpEntity.getPkCorp()); - //存货基本档案 - BdInvbasdocEntity bdInvbasdocEntity = cacheTocMapVo.getStringBdInvbasdocEntityMap().get(bdInvmandocEntity.getPkInvmandoc() + bdCorpEntity.getPkCorp()); - Assert.notNull(bdInvbasdocEntity, "无法匹配到存货基本档案 存货管理主键:{} 公司:{}", bdInvmandocEntity.getPkInvmandoc(), bdCorpEntity.getPkCorp()); //存货税率 BdTaxitemsEntity bdTaxitemsEntity = cacheTocMapVo.getStringBdTaxitemsEntityMap().get(bdInvmandocEntity.getInvcode()); Assert.notNull(bdTaxitemsEntity, "无法匹配到存货税率 存货编码:{}", bdInvmandocEntity.getInvcode()); @@ -1266,7 +1275,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { * @author liuyang */ private BdBusitypeEntity u8cOperationFlowV2() throws Exception { - String processName = "TOC冲回发出商品"; + String processName = "TOC冲发出商品"; BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName); Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName); return bdBusitypeEntity; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 9c42aa4f..d58043a9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -508,7 +508,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { } } if (idStr.length() > 0) { - return idStr.substring(0, idStr.length()); + return idStr.substring(0, idStr.length() - 1); } return null; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index a79b7017..5bf56ed4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -138,7 +138,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { private static final String NOTHING = "无"; - private static final String ADD = "+"; + private static final String ADD = "@0216@"; @Autowired private ITocofsReturngoodsDao iTocofsReturngoodsDao; @@ -442,7 +442,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } } if (idStr.length() > 0) { - return idStr.substring(0, idStr.length()); + return idStr.substring(0, idStr.length() - 1); } return null; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java index fcf64668..507a9e3f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java @@ -1,17 +1,24 @@ package com.hzya.frame.plugin.lets.util; +import com.hzya.frame.plugin.lets.constant.OverallConstant; import com.hzya.frame.plugin.lets.dao.*; import com.hzya.frame.plugin.lets.entity.*; import com.hzya.frame.plugin.lets.plugin.sales.SoSaleOutPluginInitializerToC; import com.hzya.frame.plugin.lets.resultvo.CacheTocMapVo; +import com.hzya.frame.split.SplitListByCountUtil; +import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto; +import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; +import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 档案类缓存,TOC销售订单转换 @@ -176,24 +183,49 @@ public class TocOrderBasicArchivesCacheUtil { * @author liuyang */ // public static Map stringBdCubasdocEntityHashMap = new HashMap<>(); - private Map initBdCubasdoc() { - Map stringBdCubasdocEntityHashMap = new HashMap<>(); +// private Map initBdCubasdoc() { +// Map stringBdCubasdocEntityHashMap = new HashMap<>(); +// +// BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); +// bdCubasdocEntity.setDataSourceCode("lets_u8c"); +// bdCubasdocEntity.setDr(0L); +// List bdCumandocEntityList = iBdCubasdocDao.query(bdCubasdocEntity); +// if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) { +// for (int i = 0; i < bdCumandocEntityList.size(); i++) { +// BdCubasdocEntity bdCubasdocEntity1 = bdCumandocEntityList.get(i); +// if (stringBdCubasdocEntityHashMap.get(bdCubasdocEntity1.getDef1()) == null) { +// stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getDef1(), bdCubasdocEntity1); +// } else { +// logger.warn("客商档案def1重复,客商编码:{}", bdCubasdocEntity1.getCustcode()); +// } +// } +// } +// return stringBdCubasdocEntityHashMap; +// } + private Map initBdCubasdocV2(List headerDtoList) { + Map stringBdCubasdocEntityMap = new HashMap<>(); + List allBdCumandocEntityList = new ArrayList<>(); + if (headerDtoList != null && headerDtoList.size() > 0) { + List> splitListByCount = SplitListByCountUtil.splitListByCount(headerDtoList, 500); + for (int i = 0; i < splitListByCount.size(); i++) { + List headerDtoList1 = splitListByCount.get(i); + String codesStr = headerDtoList1.stream().map(HeaderDto::getStoreCode).map(id -> "'" + id + "'").collect(Collectors.joining(",")); - BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); - bdCubasdocEntity.setDataSourceCode("lets_u8c"); - bdCubasdocEntity.setDr(0L); - List bdCumandocEntityList = iBdCubasdocDao.query(bdCubasdocEntity); - if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) { - for (int i = 0; i < bdCumandocEntityList.size(); i++) { - BdCubasdocEntity bdCubasdocEntity1 = bdCumandocEntityList.get(i); - if (stringBdCubasdocEntityHashMap.get(bdCubasdocEntity1.getDef1()) == null) { - stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getDef1(), bdCubasdocEntity1); - } else { - logger.warn("客商档案def1重复,客商编码:{}", bdCubasdocEntity1.getCustcode()); - } + BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); + bdCubasdocEntity.setDataSourceCode("lets_u8c"); + bdCubasdocEntity.setDr(0L); + bdCubasdocEntity.setCustcodes(codesStr); + List bdCumandocEntityList = iBdCubasdocDao.query(bdCubasdocEntity); + allBdCumandocEntityList.addAll(bdCumandocEntityList); } } - return stringBdCubasdocEntityHashMap; + if (allBdCumandocEntityList.size() > 0) { + for (int i = 0; i < allBdCumandocEntityList.size(); i++) { + BdCubasdocEntity bdCubasdocEntity = allBdCumandocEntityList.get(i); + stringBdCubasdocEntityMap.put(bdCubasdocEntity.getCustcode(), bdCubasdocEntity); + } + } + return stringBdCubasdocEntityMap; } /** @@ -202,17 +234,47 @@ public class TocOrderBasicArchivesCacheUtil { * @author liuyang */ // public static Map stringBdCumandocEntityMap = new HashMap<>(); - private Map initBdCumandoc() { - Map stringBdCumandocEntityMap = new HashMap<>(); +// private Map initBdCumandoc() { +// Map stringBdCumandocEntityMap = new HashMap<>(); +// +// BdCumandocEntity bdCumandocEntity1 = new BdCumandocEntity(); +// bdCumandocEntity1.setDataSourceCode("lets_u8c"); +// bdCumandocEntity1.setDr(0L); +//// bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER);//客商:2客户 +// List bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); +// if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) { +// for (int i = 0; i < bdCumandocEntityList.size(); i++) { +// BdCumandocEntity bdCumandocEntity = bdCumandocEntityList.get(i); +// stringBdCumandocEntityMap.put(bdCumandocEntity.getPkCubasdoc() + bdCumandocEntity.getPkCorp(), bdCumandocEntity); +// } +// } +// return stringBdCumandocEntityMap; +// } - BdCumandocEntity bdCumandocEntity1 = new BdCumandocEntity(); - bdCumandocEntity1.setDataSourceCode("lets_u8c"); - bdCumandocEntity1.setDr(0L); -// bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER);//客商:2客户 - List bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); - if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) { - for (int i = 0; i < bdCumandocEntityList.size(); i++) { - BdCumandocEntity bdCumandocEntity = bdCumandocEntityList.get(i); + /** + * 查询客商管理档案 + */ + private Map initBdCumandocV2(List headerDtoList) throws Exception { + Map stringBdCumandocEntityMap = new HashMap<>(); + List allBdCumandocEntityList = new ArrayList<>(); + + if (headerDtoList != null && headerDtoList.size() > 0) { + List> splitListByCount = SplitListByCountUtil.splitListByCount(headerDtoList, 500); + for (int i = 0; i < splitListByCount.size(); i++) { + List headerDtoList1 = splitListByCount.get(i); + String codesStr = headerDtoList1.stream().map(HeaderDto::getStoreCode).map(id -> "'" + id + "'").collect(Collectors.joining(",")); + + BdCumandocEntity bdCumandocEntity = new BdCumandocEntity(); + bdCumandocEntity.setDataSourceCode("lets_u8c"); + bdCumandocEntity.setDr(0L); + bdCumandocEntity.setCustcodes(codesStr); + List bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity); + allBdCumandocEntityList.addAll(bdCumandocEntityList); + } + } + if (allBdCumandocEntityList.size() > 0) { + for (int i = 0; i < allBdCumandocEntityList.size(); i++) { + BdCumandocEntity bdCumandocEntity = allBdCumandocEntityList.get(i); stringBdCumandocEntityMap.put(bdCumandocEntity.getPkCubasdoc() + bdCumandocEntity.getPkCorp(), bdCumandocEntity); } } @@ -223,18 +285,42 @@ public class TocOrderBasicArchivesCacheUtil { * 初始化存货管理档案 */ // public static Map stringBdInvmandocEntityMap = new HashMap<>(); - private Map initInventoryFile() throws Exception { +// private Map initInventoryFile() throws Exception { +// Map stringBdInvmandocEntityMap = new HashMap<>(); +// +// BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity(); +//// bdInvmandocEntity.setInvcode(copyRowDetailsListVo.getSpec_no()); +//// bdInvmandocEntity.setPkCorp(shippingCompanyBdCorpEntity.getPkCorp()); +// List bdInvmandocEntity2 = iBdInvmandocDao.queryBdInvmandocByInvcodeList(bdInvmandocEntity); +// if (bdInvmandocEntity2 != null && bdInvmandocEntity2.size() > 0) { +// for (int i = 0; i < bdInvmandocEntity2.size(); i++) { +// BdInvmandocEntity bdInvmandocEntity1 = bdInvmandocEntity2.get(i); +// //2024年8月6日 14:27:45 通过存货编码+公司缓存 +// stringBdInvmandocEntityMap.put(bdInvmandocEntity1.getInvcode() + bdInvmandocEntity1.getPkCorp(), bdInvmandocEntity1); +// } +// } +// return stringBdInvmandocEntityMap; +// } + public Map initInventoryFileV2(List detailsDtos) throws Exception { + List allBdInvmandocEntity = new ArrayList<>(); Map stringBdInvmandocEntityMap = new HashMap<>(); - BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity(); -// bdInvmandocEntity.setInvcode(copyRowDetailsListVo.getSpec_no()); -// bdInvmandocEntity.setPkCorp(shippingCompanyBdCorpEntity.getPkCorp()); - List bdInvmandocEntity2 = iBdInvmandocDao.queryBdInvmandocByInvcodeList(bdInvmandocEntity); - if (bdInvmandocEntity2 != null && bdInvmandocEntity2.size() > 0) { - for (int i = 0; i < bdInvmandocEntity2.size(); i++) { - BdInvmandocEntity bdInvmandocEntity1 = bdInvmandocEntity2.get(i); - //2024年8月6日 14:27:45 通过存货编码+公司缓存 - stringBdInvmandocEntityMap.put(bdInvmandocEntity1.getInvcode() + bdInvmandocEntity1.getPkCorp(), bdInvmandocEntity1); + if (detailsDtos != null && detailsDtos.size() > 0) { + List> lists = SplitListByCountUtil.splitListByCount(detailsDtos, 500); + for (int i = 0; i < lists.size(); i++) { + List detailsDtos1 = lists.get(i); + String idsStr = detailsDtos1.stream().map(DetailsDto::getSkuCode).map(id -> "'" + id + "'").collect(Collectors.joining(",")); + + BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity(); + bdInvmandocEntity.setInvcodes(idsStr); + List bdInvmandocEntity2 = iBdInvmandocDao.queryBdInvmandocByInvcodeList(bdInvmandocEntity); + allBdInvmandocEntity.addAll(bdInvmandocEntity2); + } + } + if (allBdInvmandocEntity.size() > 0) { + for (int i = 0; i < allBdInvmandocEntity.size(); i++) { + BdInvmandocEntity bdInvmandocEntity = allBdInvmandocEntity.get(i); + stringBdInvmandocEntityMap.put(bdInvmandocEntity.getInvcode() + bdInvmandocEntity.getPkCorp(), bdInvmandocEntity); } } return stringBdInvmandocEntityMap; @@ -245,20 +331,47 @@ public class TocOrderBasicArchivesCacheUtil { * 2024年8月7日 10:57:55 */ // public static Map stringBdInvbasdocEntityHashMap = new HashMap<>(); - private Map initBasicInventoryFile() throws Exception { - Map stringBdInvbasdocEntityHashMap = new HashMap<>(); +// private Map initBasicInventoryFile() throws Exception { +// Map stringBdInvbasdocEntityHashMap = new HashMap<>(); +// +// BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity(); +//// bdInvbasdocEntity.setPk_invmandoc(bdInvmandocEntity1.getPkInvmandoc()); +//// bdInvbasdocEntity.setPk_corp(shippingCompanyBdCorpEntity.getPkCorp()); +// List bdInvbasdocEntity2 = iBdInvbasdocDao.queryBdInvbasdocByPkInvmandocV2(bdInvbasdocEntity); +// if (bdInvbasdocEntity2 != null && bdInvbasdocEntity2.size() > 0) { +// for (int i = 0; i < bdInvbasdocEntity2.size(); i++) { +// BdInvbasdocEntity bdInvbasdocEntity1 = bdInvbasdocEntity2.get(i); +// stringBdInvbasdocEntityHashMap.put(bdInvbasdocEntity1.getPk_invmandoc() + bdInvbasdocEntity1.getPk_corp_man(), bdInvbasdocEntity1); +// } +// } +// return stringBdInvbasdocEntityHashMap; +// } - BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity(); -// bdInvbasdocEntity.setPk_invmandoc(bdInvmandocEntity1.getPkInvmandoc()); -// bdInvbasdocEntity.setPk_corp(shippingCompanyBdCorpEntity.getPkCorp()); - List bdInvbasdocEntity2 = iBdInvbasdocDao.queryBdInvbasdocByPkInvmandocV2(bdInvbasdocEntity); - if (bdInvbasdocEntity2 != null && bdInvbasdocEntity2.size() > 0) { - for (int i = 0; i < bdInvbasdocEntity2.size(); i++) { - BdInvbasdocEntity bdInvbasdocEntity1 = bdInvbasdocEntity2.get(i); - stringBdInvbasdocEntityHashMap.put(bdInvbasdocEntity1.getPk_invmandoc() + bdInvbasdocEntity1.getPk_corp_man(), bdInvbasdocEntity1); + /** + * 根据O存货商家编码初始化存货基本档案 + * + * @author liuyang + */ + private Map initBasicInventoryFileV2(List detailsDtoList) throws Exception { + List allBdInvbasdocEntityList = new ArrayList<>(); + if (detailsDtoList != null && detailsDtoList.size() > 0) { + List> lists = SplitListByCountUtil.splitListByCount(detailsDtoList, 500); + for (int i = 0; i < lists.size(); i++) { + List detailsDtos = lists.get(i); + String idsStr = detailsDtos.stream().map(DetailsDto::getSkuCode).map(id -> "'" + id + "'").collect(Collectors.joining(",")); + + BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity(); + bdInvbasdocEntity.setInvcodes(idsStr); + List bdInvbasdocEntities = iBdInvbasdocDao.queryBdInvbasdocByPkInvmandocV3(bdInvbasdocEntity); + allBdInvbasdocEntityList.addAll(bdInvbasdocEntities); } } - return stringBdInvbasdocEntityHashMap; + Map stringBdInvbasdocEntityMap = new HashMap<>(); + for (int i = 0; i < allBdInvbasdocEntityList.size(); i++) { + BdInvbasdocEntity bdInvbasdocEntity = allBdInvbasdocEntityList.get(i); + stringBdInvbasdocEntityMap.put(bdInvbasdocEntity.getInvcode(), bdInvbasdocEntity); + } + return stringBdInvbasdocEntityMap; } /** @@ -268,23 +381,48 @@ public class TocOrderBasicArchivesCacheUtil { * @author liuyang */ // public static Map stringBdTaxitemsEntityHashMap = new HashMap<>(); - private Map initBdTaxitemsEntity() throws Exception { - Map stringBdTaxitemsEntityHashMap = new HashMap<>(); +// private Map initBdTaxitemsEntity() throws Exception { +// Map stringBdTaxitemsEntityHashMap = new HashMap<>(); +// +// BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity(); +// List bdTaxitemsEntityList = iBdTaxitemsDao.queryBdInvbasdocByInvcodeV2(bdTaxitemsEntity); +// if (bdTaxitemsEntityList != null && bdTaxitemsEntityList.size() > 0) { +// for (int i = 0; i < bdTaxitemsEntityList.size(); i++) { +// BdTaxitemsEntity bdTaxitemsEntity1 = bdTaxitemsEntityList.get(i); +// stringBdTaxitemsEntityHashMap.put(bdTaxitemsEntity1.getInvcode(), bdTaxitemsEntity1); +// } +// } +// +// return stringBdTaxitemsEntityHashMap; +// } - BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity(); - List bdTaxitemsEntityList = iBdTaxitemsDao.queryBdInvbasdocByInvcodeV2(bdTaxitemsEntity); - if (bdTaxitemsEntityList != null && bdTaxitemsEntityList.size() > 0) { - for (int i = 0; i < bdTaxitemsEntityList.size(); i++) { - BdTaxitemsEntity bdTaxitemsEntity1 = bdTaxitemsEntityList.get(i); - stringBdTaxitemsEntityHashMap.put(bdTaxitemsEntity1.getInvcode(), bdTaxitemsEntity1); +// public static Map stringBdTaxitemsEntityHashMap = new HashMap<>(); + private Map initBdTaxitemsEntityV2(List detailsDtos) throws Exception { + List allBdTaxitemsEntityList = new ArrayList<>(); + Map stringBdTaxitemsEntityMap = new HashMap<>(); + if (detailsDtos != null && detailsDtos.size() > 0) { + List> lists = SplitListByCountUtil.splitListByCount(detailsDtos, 500); + for (int i = 0; i < lists.size(); i++) { + List detailsDtos1 = lists.get(i); + String codesStr = detailsDtos1.stream().map(DetailsDto::getSkuCode).map(id -> "'" + id + "'").collect(Collectors.joining(",")); + + BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity(); + bdTaxitemsEntity.setInvcodes(codesStr); + List bdTaxitemsEntityList = iBdTaxitemsDao.queryBdInvbasdocByInvcodeV2(bdTaxitemsEntity); + allBdTaxitemsEntityList.addAll(bdTaxitemsEntityList); } } - - return stringBdTaxitemsEntityHashMap; + if (allBdTaxitemsEntityList.size() > 0) { + for (int i = 0; i < allBdTaxitemsEntityList.size(); i++) { + BdTaxitemsEntity bdTaxitemsEntity = allBdTaxitemsEntityList.get(i); + stringBdTaxitemsEntityMap.put(bdTaxitemsEntity.getInvcode(), bdTaxitemsEntity); + } + } + return stringBdTaxitemsEntityMap; } /** - * 缓存来源平台逻辑 + * 缓存来源平台 * * @author liuyang */ @@ -292,8 +430,9 @@ public class TocOrderBasicArchivesCacheUtil { private Map initSourcePlatform() { Map stringBdDefdocEntityHashMap = new HashMap<>(); + String platformZdyId2 = OverallConstant.getOverAllValue("u8c自定义项档案-平台主键"); BdDefdocEntity bdDefdocEntity = new BdDefdocEntity(); - bdDefdocEntity.setPkDefdoclist("0001A210000000000JUD"); + bdDefdocEntity.setPkDefdoclist(platformZdyId2); bdDefdocEntity.setDr(0); bdDefdocEntity.setDataSourceCode("lets_u8c"); List bdDefdocEntityList = iBdDefdocDao.query(bdDefdocEntity); @@ -313,8 +452,9 @@ public class TocOrderBasicArchivesCacheUtil { private Map initShopDiy() { Map shopDefdocEntityHashMap = new HashMap<>(); + String platformZdyId2 = OverallConstant.getOverAllValue("u8c自定义项档案-店铺主键"); BdDefdocEntity bdDefdocEntity = new BdDefdocEntity(); - bdDefdocEntity.setPkDefdoclist("0001A210000000000XZX"); + bdDefdocEntity.setPkDefdoclist(platformZdyId2); bdDefdocEntity.setDr(0); bdDefdocEntity.setDataSourceCode("lets_u8c"); List bdDefdocEntityList = iBdDefdocDao.query(bdDefdocEntity); @@ -370,8 +510,10 @@ public class TocOrderBasicArchivesCacheUtil { * * @author liuyang */ - public CacheTocMapVo initCache() throws Exception { + public CacheTocMapVo initCache(List headerDetailsDtoList) throws Exception { // clearCache(); + List detailsDtos = initOfsDetailsDto(headerDetailsDtoList); + List headerDtoList = initOFsHeadDto(headerDetailsDtoList); long startMillis = System.currentTimeMillis(); logger.info("初始化缓存开始"); @@ -380,11 +522,11 @@ public class TocOrderBasicArchivesCacheUtil { Map stringBdCalbodyEntityMap = initBdCalbody(); Map stringBdSalestruEntityMap = initBdSalestru(); Map stringBdDeptdocEntityMap = initDept(); - Map stringBdCumandocEntityMap = initBdCumandoc(); - Map stringBdInvmandocEntityMap = initInventoryFile(); - Map stringBdInvbasdocEntityMap = initBasicInventoryFile(); - Map stringBdTaxitemsEntityMap = initBdTaxitemsEntity(); - Map stringBdCubasdocEntityMap = initBdCubasdoc(); + Map stringBdCumandocEntityMap = initBdCumandocV2(headerDtoList); + Map stringBdInvmandocEntityMap = initInventoryFileV2(detailsDtos); + Map stringBdInvbasdocEntityMap = initBasicInventoryFileV2(detailsDtos); + Map stringBdTaxitemsEntityMap = initBdTaxitemsEntityV2(detailsDtos); + Map stringBdCubasdocEntityMap = initBdCubasdocV2(headerDtoList); Map stringBdDefdocEntityMap = initSourcePlatform(); Map stringBdDefdocEntityMap1 = initShopDiy(); Map stringBdRdclEntityMap = initBdRdcl(); @@ -407,4 +549,40 @@ public class TocOrderBasicArchivesCacheUtil { cacheTocMapVo.setStringBdRdclEntityMap(stringBdRdclEntityMap); return cacheTocMapVo; } + + /** + * 初始化OFS明细行 + * + * @author liuyang + */ + private List initOfsDetailsDto(List headerDetailsDtoList) throws Exception { + List allDetails = new ArrayList<>(); + if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) { + for (int i = 0; i < headerDetailsDtoList.size(); i++) { + HeaderDetailsDto headerDetailsDto = headerDetailsDtoList.get(i); +// HeaderDto header = headerDetailsDto.getHeader(); + List details = headerDetailsDto.getDetails(); + allDetails.addAll(details); + } + } + return allDetails; + } + + /** + * 初始化OFS表头 + * + * @author liuyang + */ + private List initOFsHeadDto(List headerDetailsDtoList) throws Exception { + List allHeader = new ArrayList<>(); + if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) { + for (int i = 0; i < headerDetailsDtoList.size(); i++) { + HeaderDetailsDto headerDetailsDto = headerDetailsDtoList.get(i); + HeaderDto header = headerDetailsDto.getHeader(); +// List details = headerDetailsDto.getDetails(); + allHeader.add(header); + } + } + return allHeader; + } } \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 50d1601d..818ec5ea 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -78,7 +78,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.splitDateAndPush(computingTime, "tran"); - String s = "LETS-SH2024081900000001"; - soSaleOutPluginInitializerToC.startImplementStockByCode(s); + String s = "LETS-SH2024032800000001"; + soSaleOutPluginInitializerToC.startImplementStockByCode(s, "tran"); } } \ No newline at end of file