优化TOC日志推送功能
This commit is contained in:
liuy
parent
962e40ff3b
commit
45bcbbf2e9
|
|
@ -0,0 +1,21 @@
|
|||
package com.hzya.frame.plugin.lets.ofs.dao;
|
||||
|
||||
import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity;
|
||||
import com.hzya.frame.basedao.dao.IBaseDao;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* root(tocofs_saleout: table)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:32
|
||||
*/
|
||||
public interface ITocofsSaleoutDao extends IBaseDao<TocofsSaleoutEntity, String> {
|
||||
/**
|
||||
* 批量插入主表信息
|
||||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
|
||||
}
|
||||
|
|
@ -6,16 +6,18 @@ import com.hzya.frame.basedao.dao.IBaseDao;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* root(tocofs_saleout: table)表数据库访问层
|
||||
* O出库单表头(TOC、TOB业务底表)(tocofs_saleout: table)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:32
|
||||
* @since 2024-09-04 17:48:16
|
||||
*/
|
||||
public interface ITocofsSaleoutDao extends IBaseDao<TocofsSaleoutEntity, String> {
|
||||
|
||||
/**
|
||||
* 批量插入主表信息
|
||||
* 批量查询或者更新
|
||||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
|
||||
}
|
||||
void entityInsertOrUpdateBatch(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@ import com.hzya.frame.basedao.dao.IBaseDao;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* tocofs_saleout_detailed(tocofs_saleout_detailed: table)表数据库访问层
|
||||
* O出库单明细表(TOC、TOB业务底表)(tocofs_saleout_detailed: table)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:53
|
||||
* @since 2024-09-04 17:48:28
|
||||
*/
|
||||
public interface ITocofsSaleoutDetailedDao extends IBaseDao<TocofsSaleoutDetailedEntity, String> {
|
||||
|
||||
/**
|
||||
* 批量查询明细信息
|
||||
* 批量插入或者更新
|
||||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
void entityInsertBatchV2(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntity) throws Exception;
|
||||
void entityInsertOrUpdateBatch(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities) throws Exception;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,15 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* root(TocofsSaleout)表数据库访问层
|
||||
* O出库单表头(TOC、TOB业务底表)(TocofsSaleout)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:32
|
||||
* @since 2024-09-04 17:48:16
|
||||
*/
|
||||
public class TocofsSaleoutDaoImpl extends MybatisGenericDao<TocofsSaleoutEntity, String> implements ITocofsSaleoutDao {
|
||||
@Override
|
||||
public void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
|
||||
this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertBatchV2", tocofsSaleoutEntityList);
|
||||
public void entityInsertOrUpdateBatch(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
|
||||
insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertOrUpdateBatch", tocofsSaleoutEntityList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
package com.hzya.frame.plugin.lets.ofs.dao.impl;
|
||||
|
||||
import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity;
|
||||
import com.hzya.frame.plugin.lets.ofs.dao.ITocofsSaleoutDao;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* root(TocofsSaleout)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:32
|
||||
*/
|
||||
public class TocofsSaleoutDaoImpl extends MybatisGenericDao<TocofsSaleoutEntity, String> implements ITocofsSaleoutDao {
|
||||
@Override
|
||||
public void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
|
||||
this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertBatchV2", tocofsSaleoutEntityList);
|
||||
}
|
||||
}
|
||||
|
|
@ -8,14 +8,14 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* tocofs_saleout_detailed(TocofsSaleoutDetailed)表数据库访问层
|
||||
* O出库单明细表(TOC、TOB业务底表)(TocofsSaleoutDetailed)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:53
|
||||
* @since 2024-09-04 17:48:28
|
||||
*/
|
||||
public class TocofsSaleoutDetailedDaoImpl extends MybatisGenericDao<TocofsSaleoutDetailedEntity, String> implements ITocofsSaleoutDetailedDao {
|
||||
@Override
|
||||
public void entityInsertBatchV2(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntity) throws Exception {
|
||||
this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDetailedDaoImpl.entityInsertBatchV2", tocofsSaleoutDetailedEntity);
|
||||
public void entityInsertOrUpdateBatch(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities) throws Exception {
|
||||
insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDetailedDaoImpl.entityInsertOrUpdateBatch", tocofsSaleoutDetailedEntities);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +1,19 @@
|
|||
package com.hzya.frame.plugin.lets.ofs.entity;
|
||||
|
||||
import com.hzya.frame.web.entity.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* tocofs_saleout_detailed(TocofsSaleoutDetailed)实体类
|
||||
* O出库单明细表(TOC、TOB业务底表)(TocofsSaleoutDetailed)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:53
|
||||
* @since 2024-09-04 17:48:28
|
||||
*/
|
||||
//@Data
|
||||
//2024年9月5日 11:00:32 抛出异常，There is no getter for property named 'primaryKey' in 'class com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity'
|
||||
//2024年9月5日 11:05:13 没用，不是@data这里的问题
|
||||
@Data
|
||||
public class TocofsSaleoutDetailedEntity extends BaseEntity {
|
||||
/**
|
||||
* rootId
|
||||
*/
|
||||
// private Long rootid;
|
||||
/**
|
||||
* LETS
|
||||
*/
|
||||
|
|
@ -30,7 +31,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
|
|||
*/
|
||||
private String shipmentcode;
|
||||
/**
|
||||
* 22814582
|
||||
* 22814582 主键
|
||||
*/
|
||||
private Long reforderid;
|
||||
/**
|
||||
|
|
@ -57,6 +58,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
|
|||
* LETS-SO2024031900000002
|
||||
*/
|
||||
private String sourceordercode;
|
||||
private String sourcelinenum;
|
||||
/**
|
||||
* AVAILABLE
|
||||
*/
|
||||
|
|
@ -73,6 +75,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
|
|||
* 0
|
||||
*/
|
||||
private Long shipqty;
|
||||
private String shipat;
|
||||
/**
|
||||
* EA
|
||||
*/
|
||||
|
|
@ -125,327 +128,236 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
|
|||
* LETS-ADMIN
|
||||
*/
|
||||
private String lastupdatedby;
|
||||
|
||||
// public Long getRootid() {
|
||||
// return rootid;
|
||||
// }
|
||||
//
|
||||
// public void setRootid(Long rootid) {
|
||||
// this.rootid = rootid;
|
||||
// }
|
||||
|
||||
private String newTransmitInfo;
|
||||
|
||||
private String newPushDate;
|
||||
|
||||
private String newState;
|
||||
|
||||
private String newSystemNumber;
|
||||
|
||||
private String newSystemPrimary;
|
||||
|
||||
/**
|
||||
* 主表主键
|
||||
*/
|
||||
private String primaryKey;
|
||||
|
||||
private String maintableid;
|
||||
/**
|
||||
* 业务类型
|
||||
* (销售)推送时间
|
||||
*/
|
||||
private String businessType;
|
||||
|
||||
private String newpushdate;
|
||||
/**
|
||||
* 业务日期
|
||||
* (销售)报错详情
|
||||
*/
|
||||
private String businessDate;
|
||||
|
||||
public String getBusinessDate() {
|
||||
return businessDate;
|
||||
}
|
||||
|
||||
public void setBusinessDate(String businessDate) {
|
||||
this.businessDate = businessDate;
|
||||
}
|
||||
|
||||
public String getBusinessType() {
|
||||
return businessType;
|
||||
}
|
||||
|
||||
public void setBusinessType(String businessType) {
|
||||
this.businessType = businessType;
|
||||
}
|
||||
|
||||
public String getNewTransmitInfo() {
|
||||
return newTransmitInfo;
|
||||
}
|
||||
|
||||
public void setNewTransmitInfo(String newTransmitInfo) {
|
||||
this.newTransmitInfo = newTransmitInfo;
|
||||
}
|
||||
|
||||
public String getNewPushDate() {
|
||||
return newPushDate;
|
||||
}
|
||||
|
||||
public void setNewPushDate(String newPushDate) {
|
||||
this.newPushDate = newPushDate;
|
||||
}
|
||||
|
||||
public String getNewState() {
|
||||
return newState;
|
||||
}
|
||||
|
||||
public void setNewState(String newState) {
|
||||
this.newState = newState;
|
||||
}
|
||||
|
||||
public String getNewSystemNumber() {
|
||||
return newSystemNumber;
|
||||
}
|
||||
|
||||
public void setNewSystemNumber(String newSystemNumber) {
|
||||
this.newSystemNumber = newSystemNumber;
|
||||
}
|
||||
|
||||
public String getNewSystemPrimary() {
|
||||
return newSystemPrimary;
|
||||
}
|
||||
|
||||
public void setNewSystemPrimary(String newSystemPrimary) {
|
||||
this.newSystemPrimary = newSystemPrimary;
|
||||
}
|
||||
|
||||
public String getPrimaryKey() {
|
||||
return primaryKey;
|
||||
}
|
||||
|
||||
public void setPrimaryKey(String primaryKey) {
|
||||
this.primaryKey = primaryKey;
|
||||
}
|
||||
|
||||
public String getClientcode() {
|
||||
return clientcode;
|
||||
}
|
||||
|
||||
public void setClientcode(String clientcode) {
|
||||
this.clientcode = clientcode;
|
||||
}
|
||||
|
||||
public String getCompanycode() {
|
||||
return companycode;
|
||||
}
|
||||
|
||||
public void setCompanycode(String companycode) {
|
||||
this.companycode = companycode;
|
||||
}
|
||||
|
||||
public String getFacilitycode() {
|
||||
return facilitycode;
|
||||
}
|
||||
|
||||
public void setFacilitycode(String facilitycode) {
|
||||
this.facilitycode = facilitycode;
|
||||
}
|
||||
|
||||
public String getShipmentcode() {
|
||||
return shipmentcode;
|
||||
}
|
||||
|
||||
public void setShipmentcode(String shipmentcode) {
|
||||
this.shipmentcode = shipmentcode;
|
||||
}
|
||||
|
||||
public Long getReforderid() {
|
||||
return reforderid;
|
||||
}
|
||||
|
||||
public void setReforderid(Long reforderid) {
|
||||
this.reforderid = reforderid;
|
||||
}
|
||||
|
||||
public Long getReforderdetailid() {
|
||||
return reforderdetailid;
|
||||
}
|
||||
|
||||
public void setReforderdetailid(Long reforderdetailid) {
|
||||
this.reforderdetailid = reforderdetailid;
|
||||
}
|
||||
|
||||
public String getRefordercode() {
|
||||
return refordercode;
|
||||
}
|
||||
|
||||
public void setRefordercode(String refordercode) {
|
||||
this.refordercode = refordercode;
|
||||
}
|
||||
|
||||
public Long getAllocinvid() {
|
||||
return allocinvid;
|
||||
}
|
||||
|
||||
public void setAllocinvid(Long allocinvid) {
|
||||
this.allocinvid = allocinvid;
|
||||
}
|
||||
|
||||
public String getSkucode() {
|
||||
return skucode;
|
||||
}
|
||||
|
||||
public void setSkucode(String skucode) {
|
||||
this.skucode = skucode;
|
||||
}
|
||||
|
||||
public String getSkuname() {
|
||||
return skuname;
|
||||
}
|
||||
|
||||
public void setSkuname(String skuname) {
|
||||
this.skuname = skuname;
|
||||
}
|
||||
|
||||
public String getSourceordercode() {
|
||||
return sourceordercode;
|
||||
}
|
||||
|
||||
public void setSourceordercode(String sourceordercode) {
|
||||
this.sourceordercode = sourceordercode;
|
||||
}
|
||||
|
||||
public String getInventorysts() {
|
||||
return inventorysts;
|
||||
}
|
||||
|
||||
public void setInventorysts(String inventorysts) {
|
||||
this.inventorysts = inventorysts;
|
||||
}
|
||||
|
||||
public Long getIsgift() {
|
||||
return isgift;
|
||||
}
|
||||
|
||||
public void setIsgift(Long isgift) {
|
||||
this.isgift = isgift;
|
||||
}
|
||||
|
||||
public Long getRequestqty() {
|
||||
return requestqty;
|
||||
}
|
||||
|
||||
public void setRequestqty(Long requestqty) {
|
||||
this.requestqty = requestqty;
|
||||
}
|
||||
|
||||
public Long getShipqty() {
|
||||
return shipqty;
|
||||
}
|
||||
|
||||
public void setShipqty(Long shipqty) {
|
||||
this.shipqty = shipqty;
|
||||
}
|
||||
|
||||
public String getQuantityum() {
|
||||
return quantityum;
|
||||
}
|
||||
|
||||
public void setQuantityum(String quantityum) {
|
||||
this.quantityum = quantityum;
|
||||
}
|
||||
|
||||
public Long getListprice() {
|
||||
return listprice;
|
||||
}
|
||||
|
||||
public void setListprice(Long listprice) {
|
||||
this.listprice = listprice;
|
||||
}
|
||||
|
||||
public Long getItemtotalamount() {
|
||||
return itemtotalamount;
|
||||
}
|
||||
|
||||
public void setItemtotalamount(Long itemtotalamount) {
|
||||
this.itemtotalamount = itemtotalamount;
|
||||
}
|
||||
|
||||
public Long getTotalpayamount() {
|
||||
return totalpayamount;
|
||||
}
|
||||
|
||||
public void setTotalpayamount(Long totalpayamount) {
|
||||
this.totalpayamount = totalpayamount;
|
||||
}
|
||||
|
||||
public Long getTotalweight() {
|
||||
return totalweight;
|
||||
}
|
||||
|
||||
public void setTotalweight(Long totalweight) {
|
||||
this.totalweight = totalweight;
|
||||
}
|
||||
|
||||
public Long getTotalvolume() {
|
||||
return totalvolume;
|
||||
}
|
||||
|
||||
public void setTotalvolume(Long totalvolume) {
|
||||
this.totalvolume = totalvolume;
|
||||
}
|
||||
|
||||
public Long getTotalvolumeweight() {
|
||||
return totalvolumeweight;
|
||||
}
|
||||
|
||||
public void setTotalvolumeweight(Long totalvolumeweight) {
|
||||
this.totalvolumeweight = totalvolumeweight;
|
||||
}
|
||||
|
||||
public String getWeightum() {
|
||||
return weightum;
|
||||
}
|
||||
|
||||
public void setWeightum(String weightum) {
|
||||
this.weightum = weightum;
|
||||
}
|
||||
|
||||
public String getVolumeum() {
|
||||
return volumeum;
|
||||
}
|
||||
|
||||
public void setVolumeum(String volumeum) {
|
||||
this.volumeum = volumeum;
|
||||
}
|
||||
|
||||
public String getCreated() {
|
||||
return created;
|
||||
}
|
||||
|
||||
public void setCreated(String created) {
|
||||
this.created = created;
|
||||
}
|
||||
|
||||
public String getCreatedby() {
|
||||
return createdby;
|
||||
}
|
||||
|
||||
public void setCreatedby(String createdby) {
|
||||
this.createdby = createdby;
|
||||
}
|
||||
|
||||
public String getLastupdated() {
|
||||
return lastupdated;
|
||||
}
|
||||
|
||||
public void setLastupdated(String lastupdated) {
|
||||
this.lastupdated = lastupdated;
|
||||
}
|
||||
|
||||
public String getLastupdatedby() {
|
||||
return lastupdatedby;
|
||||
}
|
||||
|
||||
public void setLastupdatedby(String lastupdatedby) {
|
||||
this.lastupdatedby = lastupdatedby;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private String newtransmitinfo;
|
||||
/**
|
||||
* (销售)出库同步是否成功
|
||||
*/
|
||||
private String newstate;
|
||||
/**
|
||||
* (销售)交易成功(红)是否成功
|
||||
*/
|
||||
private String newstate2;
|
||||
/**
|
||||
* (销售)交易成功(蓝)是否成功
|
||||
*/
|
||||
private String newstate3;
|
||||
/**
|
||||
* (销售)交易成功(TOB发票)是否成功
|
||||
*/
|
||||
private String newstate4;
|
||||
/**
|
||||
* (销售)下游系统编码(库存)
|
||||
*/
|
||||
private String newsystemnumber;
|
||||
/**
|
||||
* (销售)下游系统主键(库存)
|
||||
*/
|
||||
private String newsystemprimary;
|
||||
/**
|
||||
* (销售)下游系统编码(交易成功红)
|
||||
*/
|
||||
private String newsystemnumber2;
|
||||
/**
|
||||
* (销售)下游系统主键(交易成功红)
|
||||
*/
|
||||
private String newsystemprimary2;
|
||||
/**
|
||||
* (销售)下游系统编码(交易成功蓝)
|
||||
*/
|
||||
private String newsystemnumber3;
|
||||
/**
|
||||
* (销售)下游系统主键(交易成功蓝)
|
||||
*/
|
||||
private String newsystemprimary3;
|
||||
/**
|
||||
* (销售)下游系统编码(交易成功TOB发票)
|
||||
*/
|
||||
private String newsystemnumber4;
|
||||
/**
|
||||
* (销售)下游系统主键(交易成功TOB发票)
|
||||
*/
|
||||
private String newsystemprimary4;
|
||||
/**
|
||||
* (销售)业务日期-出库日期
|
||||
*/
|
||||
private String businessdate;
|
||||
/**
|
||||
* (销售)业务日期-交易日期
|
||||
*/
|
||||
private String successfultradedate;
|
||||
/**
|
||||
* (销售)业务发生类型
|
||||
*/
|
||||
private String businesstype;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def1;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def2;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def3;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def4;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def5;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def6;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def7;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def8;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def9;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def10;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def11;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def12;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def13;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def14;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def15;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def16;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def17;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def18;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def19;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def20;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def21;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def22;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def23;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def24;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def25;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def26;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def27;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def28;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def29;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def30;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def31;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def32;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def33;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def34;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def35;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def36;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def37;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def38;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def39;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def40;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,14 +1,17 @@
|
|||
package com.hzya.frame.plugin.lets.ofs.entity;
|
||||
|
||||
import com.hzya.frame.web.entity.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* root(TocofsSaleout)实体类
|
||||
* O出库单表头(TOC、TOB业务底表)(TocofsSaleout)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-08-01 17:01:32
|
||||
* @since 2024-09-04 17:48:16
|
||||
*/
|
||||
@Data
|
||||
public class TocofsSaleoutEntity extends BaseEntity {
|
||||
|
||||
/**
|
||||
* LETS
|
||||
*/
|
||||
|
|
@ -73,14 +76,14 @@ public class TocofsSaleoutEntity extends BaseEntity {
|
|||
* LETS-SO2024031900000002
|
||||
*/
|
||||
private String sourceordercode;
|
||||
/**
|
||||
* TB
|
||||
*/
|
||||
private String sourceuseraccount;
|
||||
/**
|
||||
* 杨
|
||||
*/
|
||||
private String shiptoattentionto;
|
||||
/**
|
||||
* TB
|
||||
*/
|
||||
private String sourceuseraccount;
|
||||
/**
|
||||
* AAA
|
||||
*/
|
||||
|
|
@ -157,10 +160,19 @@ public class TocofsSaleoutEntity extends BaseEntity {
|
|||
* 640
|
||||
*/
|
||||
private Long itemtotalamount;
|
||||
private String totalfulfillqty;
|
||||
private String totalfulfillweight;
|
||||
private String totalfulfillvolume;
|
||||
private String totalfulfillvolumeweight;
|
||||
/**
|
||||
* 发货日期
|
||||
*/
|
||||
private String shipat;
|
||||
/**
|
||||
* ZTO
|
||||
*/
|
||||
private String carriercode;
|
||||
private String primarywaybillcode;
|
||||
/**
|
||||
* 1
|
||||
*/
|
||||
|
|
@ -212,6 +224,14 @@ public class TocofsSaleoutEntity extends BaseEntity {
|
|||
* 1
|
||||
*/
|
||||
private Long taxpaid;
|
||||
/**
|
||||
* 交易成功时间
|
||||
*/
|
||||
private String tradesuccessat;
|
||||
/**
|
||||
* 交易成功状态
|
||||
*/
|
||||
private String sourceorderstatus;
|
||||
/**
|
||||
* 上海市
|
||||
*/
|
||||
|
|
@ -224,491 +244,168 @@ public class TocofsSaleoutEntity extends BaseEntity {
|
|||
* 杨浦区
|
||||
*/
|
||||
private String shiptodistrictname;
|
||||
|
||||
/**
|
||||
* 发货时间
|
||||
* 出库类型
|
||||
*/
|
||||
private String shipAt;
|
||||
|
||||
public String getShipAt() {
|
||||
return shipAt;
|
||||
}
|
||||
|
||||
public void setShipAt(String shipAt) {
|
||||
this.shipAt = shipAt;
|
||||
}
|
||||
|
||||
public String getClientcode() {
|
||||
return clientcode;
|
||||
}
|
||||
|
||||
public void setClientcode(String clientcode) {
|
||||
this.clientcode = clientcode;
|
||||
}
|
||||
|
||||
public String getCompanycode() {
|
||||
return companycode;
|
||||
}
|
||||
|
||||
public void setCompanycode(String companycode) {
|
||||
this.companycode = companycode;
|
||||
}
|
||||
|
||||
public String getStorecode() {
|
||||
return storecode;
|
||||
}
|
||||
|
||||
public void setStorecode(String storecode) {
|
||||
this.storecode = storecode;
|
||||
}
|
||||
|
||||
public String getFacilitycode() {
|
||||
return facilitycode;
|
||||
}
|
||||
|
||||
public void setFacilitycode(String facilitycode) {
|
||||
this.facilitycode = facilitycode;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public Long getReforderid() {
|
||||
return reforderid;
|
||||
}
|
||||
|
||||
public void setReforderid(Long reforderid) {
|
||||
this.reforderid = reforderid;
|
||||
}
|
||||
|
||||
public String getRefordercode() {
|
||||
return refordercode;
|
||||
}
|
||||
|
||||
public void setRefordercode(String refordercode) {
|
||||
this.refordercode = refordercode;
|
||||
}
|
||||
|
||||
public String getRefordertype() {
|
||||
return refordertype;
|
||||
}
|
||||
|
||||
public void setRefordertype(String refordertype) {
|
||||
this.refordertype = refordertype;
|
||||
}
|
||||
|
||||
public Long getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(Long status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Long getConsolidated() {
|
||||
return consolidated;
|
||||
}
|
||||
|
||||
public void setConsolidated(Long consolidated) {
|
||||
this.consolidated = consolidated;
|
||||
}
|
||||
|
||||
public String getInternalinstructiontype() {
|
||||
return internalinstructiontype;
|
||||
}
|
||||
|
||||
public void setInternalinstructiontype(String internalinstructiontype) {
|
||||
this.internalinstructiontype = internalinstructiontype;
|
||||
}
|
||||
|
||||
public String getBizchannel() {
|
||||
return bizchannel;
|
||||
}
|
||||
|
||||
public void setBizchannel(String bizchannel) {
|
||||
this.bizchannel = bizchannel;
|
||||
}
|
||||
|
||||
public String getSourceplatformcode() {
|
||||
return sourceplatformcode;
|
||||
}
|
||||
|
||||
public void setSourceplatformcode(String sourceplatformcode) {
|
||||
this.sourceplatformcode = sourceplatformcode;
|
||||
}
|
||||
|
||||
public String getProcesstype() {
|
||||
return processtype;
|
||||
}
|
||||
|
||||
public void setProcesstype(String processtype) {
|
||||
this.processtype = processtype;
|
||||
}
|
||||
|
||||
public Long getSourceorderid() {
|
||||
return sourceorderid;
|
||||
}
|
||||
|
||||
public void setSourceorderid(Long sourceorderid) {
|
||||
this.sourceorderid = sourceorderid;
|
||||
}
|
||||
|
||||
public String getSourceordercode() {
|
||||
return sourceordercode;
|
||||
}
|
||||
|
||||
public void setSourceordercode(String sourceordercode) {
|
||||
this.sourceordercode = sourceordercode;
|
||||
}
|
||||
|
||||
public String getSourceuseraccount() {
|
||||
return sourceuseraccount;
|
||||
}
|
||||
|
||||
public void setSourceuseraccount(String sourceuseraccount) {
|
||||
this.sourceuseraccount = sourceuseraccount;
|
||||
}
|
||||
|
||||
public String getShiptoattentionto() {
|
||||
return shiptoattentionto;
|
||||
}
|
||||
|
||||
public void setShiptoattentionto(String shiptoattentionto) {
|
||||
this.shiptoattentionto = shiptoattentionto;
|
||||
}
|
||||
|
||||
public String getShiptoaddress() {
|
||||
return shiptoaddress;
|
||||
}
|
||||
|
||||
public void setShiptoaddress(String shiptoaddress) {
|
||||
this.shiptoaddress = shiptoaddress;
|
||||
}
|
||||
|
||||
public String getShiptocountry() {
|
||||
return shiptocountry;
|
||||
}
|
||||
|
||||
public void setShiptocountry(String shiptocountry) {
|
||||
this.shiptocountry = shiptocountry;
|
||||
}
|
||||
|
||||
public String getShiptostate() {
|
||||
return shiptostate;
|
||||
}
|
||||
|
||||
public void setShiptostate(String shiptostate) {
|
||||
this.shiptostate = shiptostate;
|
||||
}
|
||||
|
||||
public String getShiptocity() {
|
||||
return shiptocity;
|
||||
}
|
||||
|
||||
public void setShiptocity(String shiptocity) {
|
||||
this.shiptocity = shiptocity;
|
||||
}
|
||||
|
||||
public String getShiptodistrict() {
|
||||
return shiptodistrict;
|
||||
}
|
||||
|
||||
public void setShiptodistrict(String shiptodistrict) {
|
||||
this.shiptodistrict = shiptodistrict;
|
||||
}
|
||||
|
||||
public String getShiptomobile() {
|
||||
return shiptomobile;
|
||||
}
|
||||
|
||||
public void setShiptomobile(String shiptomobile) {
|
||||
this.shiptomobile = shiptomobile;
|
||||
}
|
||||
|
||||
public Long getTotallines() {
|
||||
return totallines;
|
||||
}
|
||||
|
||||
public void setTotallines(Long totallines) {
|
||||
this.totallines = totallines;
|
||||
}
|
||||
|
||||
public Long getTotalqty() {
|
||||
return totalqty;
|
||||
}
|
||||
|
||||
public void setTotalqty(Long totalqty) {
|
||||
this.totalqty = totalqty;
|
||||
}
|
||||
|
||||
public Long getTotalcontainers() {
|
||||
return totalcontainers;
|
||||
}
|
||||
|
||||
public void setTotalcontainers(Long totalcontainers) {
|
||||
this.totalcontainers = totalcontainers;
|
||||
}
|
||||
|
||||
public Long getTotalcases() {
|
||||
return totalcases;
|
||||
}
|
||||
|
||||
public void setTotalcases(Long totalcases) {
|
||||
this.totalcases = totalcases;
|
||||
}
|
||||
|
||||
public Long getTotalweight() {
|
||||
return totalweight;
|
||||
}
|
||||
|
||||
public void setTotalweight(Long totalweight) {
|
||||
this.totalweight = totalweight;
|
||||
}
|
||||
|
||||
public Long getTotalvolume() {
|
||||
return totalvolume;
|
||||
}
|
||||
|
||||
public void setTotalvolume(Long totalvolume) {
|
||||
this.totalvolume = totalvolume;
|
||||
}
|
||||
|
||||
public Long getTotalvolumeweight() {
|
||||
return totalvolumeweight;
|
||||
}
|
||||
|
||||
public void setTotalvolumeweight(Long totalvolumeweight) {
|
||||
this.totalvolumeweight = totalvolumeweight;
|
||||
}
|
||||
|
||||
public String getWeightum() {
|
||||
return weightum;
|
||||
}
|
||||
|
||||
public void setWeightum(String weightum) {
|
||||
this.weightum = weightum;
|
||||
}
|
||||
|
||||
public String getVolumeum() {
|
||||
return volumeum;
|
||||
}
|
||||
|
||||
public void setVolumeum(String volumeum) {
|
||||
this.volumeum = volumeum;
|
||||
}
|
||||
|
||||
public Long getTotalamount() {
|
||||
return totalamount;
|
||||
}
|
||||
|
||||
public void setTotalamount(Long totalamount) {
|
||||
this.totalamount = totalamount;
|
||||
}
|
||||
|
||||
public Long getTotalpayamount() {
|
||||
return totalpayamount;
|
||||
}
|
||||
|
||||
public void setTotalpayamount(Long totalpayamount) {
|
||||
this.totalpayamount = totalpayamount;
|
||||
}
|
||||
|
||||
public Long getPostageamount() {
|
||||
return postageamount;
|
||||
}
|
||||
|
||||
public void setPostageamount(Long postageamount) {
|
||||
this.postageamount = postageamount;
|
||||
}
|
||||
|
||||
public Long getItemtotalamount() {
|
||||
return itemtotalamount;
|
||||
}
|
||||
|
||||
public void setItemtotalamount(Long itemtotalamount) {
|
||||
this.itemtotalamount = itemtotalamount;
|
||||
}
|
||||
|
||||
public String getCarriercode() {
|
||||
return carriercode;
|
||||
}
|
||||
|
||||
public void setCarriercode(String carriercode) {
|
||||
this.carriercode = carriercode;
|
||||
}
|
||||
|
||||
public Long getPaymentstatus() {
|
||||
return paymentstatus;
|
||||
}
|
||||
|
||||
public void setPaymentstatus(Long paymentstatus) {
|
||||
this.paymentstatus = paymentstatus;
|
||||
}
|
||||
|
||||
public String getCodrequired() {
|
||||
return codrequired;
|
||||
}
|
||||
|
||||
public void setCodrequired(String codrequired) {
|
||||
this.codrequired = codrequired;
|
||||
}
|
||||
|
||||
public String getInvoicerequired() {
|
||||
return invoicerequired;
|
||||
}
|
||||
|
||||
public void setInvoicerequired(String invoicerequired) {
|
||||
this.invoicerequired = invoicerequired;
|
||||
}
|
||||
|
||||
public String getPaidat() {
|
||||
return paidat;
|
||||
}
|
||||
|
||||
public void setPaidat(String paidat) {
|
||||
this.paidat = paidat;
|
||||
}
|
||||
|
||||
public String getShipfromattentionto() {
|
||||
return shipfromattentionto;
|
||||
}
|
||||
|
||||
public void setShipfromattentionto(String shipfromattentionto) {
|
||||
this.shipfromattentionto = shipfromattentionto;
|
||||
}
|
||||
|
||||
public String getShipfromaddress() {
|
||||
return shipfromaddress;
|
||||
}
|
||||
|
||||
public void setShipfromaddress(String shipfromaddress) {
|
||||
this.shipfromaddress = shipfromaddress;
|
||||
}
|
||||
|
||||
public String getShipfromdistrict() {
|
||||
return shipfromdistrict;
|
||||
}
|
||||
|
||||
public void setShipfromdistrict(String shipfromdistrict) {
|
||||
this.shipfromdistrict = shipfromdistrict;
|
||||
}
|
||||
|
||||
public String getShipfromcity() {
|
||||
return shipfromcity;
|
||||
}
|
||||
|
||||
public void setShipfromcity(String shipfromcity) {
|
||||
this.shipfromcity = shipfromcity;
|
||||
}
|
||||
|
||||
public String getShipfromstate() {
|
||||
return shipfromstate;
|
||||
}
|
||||
|
||||
public void setShipfromstate(String shipfromstate) {
|
||||
this.shipfromstate = shipfromstate;
|
||||
}
|
||||
|
||||
public String getShipfromcountry() {
|
||||
return shipfromcountry;
|
||||
}
|
||||
|
||||
public void setShipfromcountry(String shipfromcountry) {
|
||||
this.shipfromcountry = shipfromcountry;
|
||||
}
|
||||
|
||||
public String getShipfrompostalcode() {
|
||||
return shipfrompostalcode;
|
||||
}
|
||||
|
||||
public void setShipfrompostalcode(String shipfrompostalcode) {
|
||||
this.shipfrompostalcode = shipfrompostalcode;
|
||||
}
|
||||
|
||||
public String getShipfromphone() {
|
||||
return shipfromphone;
|
||||
}
|
||||
|
||||
public void setShipfromphone(String shipfromphone) {
|
||||
this.shipfromphone = shipfromphone;
|
||||
}
|
||||
|
||||
public String getShipfrommobile() {
|
||||
return shipfrommobile;
|
||||
}
|
||||
|
||||
public void setShipfrommobile(String shipfrommobile) {
|
||||
this.shipfrommobile = shipfrommobile;
|
||||
}
|
||||
|
||||
public String getShipfromfax() {
|
||||
return shipfromfax;
|
||||
}
|
||||
|
||||
public void setShipfromfax(String shipfromfax) {
|
||||
this.shipfromfax = shipfromfax;
|
||||
}
|
||||
|
||||
public String getShipfromemail() {
|
||||
return shipfromemail;
|
||||
}
|
||||
|
||||
public void setShipfromemail(String shipfromemail) {
|
||||
this.shipfromemail = shipfromemail;
|
||||
}
|
||||
|
||||
public Long getCodamount() {
|
||||
return codamount;
|
||||
}
|
||||
|
||||
public void setCodamount(Long codamount) {
|
||||
this.codamount = codamount;
|
||||
}
|
||||
|
||||
public Long getTax() {
|
||||
return tax;
|
||||
}
|
||||
|
||||
public void setTax(Long tax) {
|
||||
this.tax = tax;
|
||||
}
|
||||
|
||||
public Long getTaxpaid() {
|
||||
return taxpaid;
|
||||
}
|
||||
|
||||
public void setTaxpaid(Long taxpaid) {
|
||||
this.taxpaid = taxpaid;
|
||||
}
|
||||
|
||||
public String getShiptostatename() {
|
||||
return shiptostatename;
|
||||
}
|
||||
|
||||
public void setShiptostatename(String shiptostatename) {
|
||||
this.shiptostatename = shiptostatename;
|
||||
}
|
||||
|
||||
public String getShiptocityname() {
|
||||
return shiptocityname;
|
||||
}
|
||||
|
||||
public void setShiptocityname(String shiptocityname) {
|
||||
this.shiptocityname = shiptocityname;
|
||||
}
|
||||
|
||||
public String getShiptodistrictname() {
|
||||
return shiptodistrictname;
|
||||
}
|
||||
|
||||
public void setShiptodistrictname(String shiptodistrictname) {
|
||||
this.shiptodistrictname = shiptodistrictname;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private String shipmenttype;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def1;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def2;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def3;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def4;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def5;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def6;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def7;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def8;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def9;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def10;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def11;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def12;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def13;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def14;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def15;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def16;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def17;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def18;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def19;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def20;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def21;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def22;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def23;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def24;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def25;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def26;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def27;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def28;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def29;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def30;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def31;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def32;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def33;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def34;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def35;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def36;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def37;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def38;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def39;
|
||||
/**
|
||||
* 自定义项
|
||||
*/
|
||||
private String def40;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -840,12 +840,12 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
private BdTaxitemsEntity queryBdTaxitems(String invcode) {
|
||||
Assert.notNull(invcode, "存货编码不能为空");
|
||||
BdTaxitemsEntity bdTaxitemsEntity = TocOrderBasicArchivesCacheUtil.stringBdTaxitemsEntityHashMap.get(invcode);
|
||||
Assert.notNull(bdTaxitemsEntity, "根据存货编码({})，无法匹配到税率！", invcode);
|
||||
return bdTaxitemsEntity;
|
||||
}
|
||||
// private BdTaxitemsEntity queryBdTaxitems(String invcode) {
|
||||
// Assert.notNull(invcode, "存货编码不能为空");
|
||||
// BdTaxitemsEntity bdTaxitemsEntity = TocOrderBasicArchivesCacheUtil.stringBdTaxitemsEntityHashMap.get(invcode);
|
||||
// Assert.notNull(bdTaxitemsEntity, "根据存货编码({})，无法匹配到税率！", invcode);
|
||||
// return bdTaxitemsEntity;
|
||||
// }
|
||||
|
||||
/**
|
||||
* 2024年8月20日 16:42:14
|
||||
|
|
|
|||
|
|
@ -395,8 +395,8 @@ public class ProxyPurchaseWarehous extends PluginBaseEntity {
|
|||
OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, stockinB);
|
||||
|
||||
//TODO 测试
|
||||
stockinB.setReceivedQty("1");
|
||||
ofsPoOrderDetail.setFulfillAmount("10");
|
||||
// stockinB.setReceivedQty("1");
|
||||
// ofsPoOrderDetail.setFulfillAmount("10");
|
||||
|
||||
//2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑
|
||||
BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(stockinB, bdCorpEntity.getPkCorp());
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
|
|||
List<TocofsSaleoutEntity> tocofsSaleoutEntityList = copyHeaderDto(headerDtoList);
|
||||
if (tocofsSaleoutEntityList.size() > 0) {
|
||||
logger.info("TOBofsSaleoutDetailedEntities：插入底表{}个对象（表头）", tocofsSaleoutEntityList.size());
|
||||
iTocofsSaleoutDao.entityInsertBatchV2(tocofsSaleoutEntityList);
|
||||
iTocofsSaleoutDao.entityInsertOrUpdateBatch(tocofsSaleoutEntityList);
|
||||
} else {
|
||||
logger.info("TOBofsSaleoutEntityList：没有对象被插入表头底表");
|
||||
}
|
||||
|
|
@ -395,7 +395,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
|
|||
List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities = copyDetailsDto(detailsDtos);
|
||||
if (tocofsSaleoutDetailedEntities.size() > 0) {
|
||||
logger.info("TOBofsSaleoutDetailedEntities：插入底表{}个对象（表体）", tocofsSaleoutDetailedEntities.size());
|
||||
iTocofsSaleoutDetailedDao.entityInsertBatchV2(tocofsSaleoutDetailedEntities);
|
||||
iTocofsSaleoutDetailedDao.entityInsertOrUpdateBatch(tocofsSaleoutDetailedEntities);
|
||||
} else {
|
||||
logger.info("TOBofsSaleoutDetailedEntities：没有对象被插入表头底表");
|
||||
}
|
||||
|
|
@ -1091,9 +1091,16 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
|
|||
if (tocofsSaleoutDetailedEntity != null && detailsDto != null && detailsDto.getHeaderDto() != null) {
|
||||
HeaderDto headerDto = detailsDto.getHeaderDto();
|
||||
|
||||
tocofsSaleoutDetailedEntity.setPrimaryKey(headerDto.getId());//主表主键
|
||||
tocofsSaleoutDetailedEntity.setBusinessDate(headerDto.getShipAt());//业务日期
|
||||
tocofsSaleoutDetailedEntity.setBusinessType("TOB_ORDER");//业务类型
|
||||
if (headerDto.getId() != null) {
|
||||
tocofsSaleoutDetailedEntity.setMaintableid(headerDto.getId());//主表主键
|
||||
}
|
||||
if (headerDto.getShipAt() != null) {
|
||||
tocofsSaleoutDetailedEntity.setBusinessdate(headerDto.getShipAt());//业务日期-出库日期
|
||||
}
|
||||
if (headerDto.getTradeSuccessAt() != null) {
|
||||
tocofsSaleoutDetailedEntity.setSuccessfultradedate(headerDto.getTradeSuccessAt());//业务日期-交易时间
|
||||
}
|
||||
tocofsSaleoutDetailedEntity.setBusinesstype("TOB_ORDER");//业务类型
|
||||
} else {
|
||||
logger.info("createPrimaryKeyAndBusinessDateAndBusinessType方法存在false！");
|
||||
}
|
||||
|
|
@ -1471,7 +1478,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
|
|||
isblargessflag = true;
|
||||
}
|
||||
//TODO 测试
|
||||
detailsDto.setShipQty("1");
|
||||
// detailsDto.setShipQty("1");
|
||||
SalesInvoiceBodyDto salesInvoiceBodyDto = new SalesInvoiceBodyDto();
|
||||
salesInvoiceBodyDto.setCinventoryid(bdInvmandocEntity.getPkInvmandoc());
|
||||
salesInvoiceBodyDto.setCupreceipttype("4C");//来源单据类型
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,31 @@
|
|||
package com.hzya.frame.plugin.lets.resultvo;
|
||||
|
||||
import com.hzya.frame.plugin.lets.entity.*;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Author：liuyang
|
||||
* @Package：com.hzya.frame.plugin.lets.resultvo
|
||||
* @Project：kangarooDataCenterV3
|
||||
* @name：CacheMapVo
|
||||
* @Date：2024/9/4 13:35
|
||||
* @Filename：CacheMapVo
|
||||
*/
|
||||
@Data
|
||||
public class CacheTocMapVo {
|
||||
private Map<String, BdCorpEntity> stringBdCorpEntityMap;
|
||||
private Map<String, BdStordocEntity> stringBdStordocEntityMap;
|
||||
private Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap;
|
||||
private Map<String, BdSalestruEntity> stringBdSalestruEntityMap;
|
||||
private Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap;
|
||||
private Map<String, BdCumandocEntity> stringBdCumandocEntityMap;
|
||||
private Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap;
|
||||
private Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityMap;
|
||||
private Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityMap;
|
||||
private Map<String, BdCubasdocEntity> stringBdCubasdocEntityMap;
|
||||
private Map<String, BdDefdocEntity> stringBdDefdocPlatformEntityMap;
|
||||
private Map<String, BdDefdocEntity> stringBdDefdocShopEntityMap;
|
||||
private Map<String, BdRdclEntity> stringBdRdclEntityMap;
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ package com.hzya.frame.plugin.lets.u8cdto;
|
|||
import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto;
|
||||
import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto;
|
||||
import com.hzya.frame.plugin.lets.entity.*;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
|
@ -14,213 +15,62 @@ import java.math.BigDecimal;
|
|||
* @Date：2024/8/5 16:07
|
||||
* @Filename：SonDetailsDto
|
||||
*/
|
||||
@Data
|
||||
public class SonDetailsDto extends DetailsDto {
|
||||
|
||||
/**
|
||||
* 表头对象
|
||||
*/
|
||||
//表头对象
|
||||
private HeaderDto header;
|
||||
|
||||
/**
|
||||
* 表头公司（销售公司）
|
||||
*/
|
||||
//表头公司（销售公司）
|
||||
private BdCorpEntity bdCorpEntity;
|
||||
|
||||
/**
|
||||
* 发货库存组织
|
||||
*/
|
||||
//发货库存组织
|
||||
private BdCalbodyEntity bdCalbodyEntity;
|
||||
|
||||
/**
|
||||
* 发货仓库
|
||||
*/
|
||||
//发货仓库
|
||||
private BdStordocEntity bdStordocEntity;
|
||||
|
||||
/**
|
||||
* 收货库存组织
|
||||
*/
|
||||
//收货库存组织
|
||||
private BdCalbodyEntity bdCalbodyEntity1;
|
||||
|
||||
/**
|
||||
* 收货仓库
|
||||
*/
|
||||
//收货仓库
|
||||
private BdStordocEntity bdStordocEntity1;
|
||||
|
||||
/**
|
||||
* 销售组织
|
||||
*/
|
||||
//销售组织
|
||||
private BdSalestruEntity bdSalestruEntity;
|
||||
|
||||
/**
|
||||
* 业务部门
|
||||
*/
|
||||
//业务部门
|
||||
private BdDeptdocEntity bdDeptdocEntity;
|
||||
|
||||
/**
|
||||
* 客商管理档案
|
||||
*/
|
||||
//客商管理档案
|
||||
private BdCumandocEntity bdCumandocEntity;
|
||||
|
||||
/**
|
||||
* 客商基本档案
|
||||
*/
|
||||
//客商基本档案
|
||||
private BdCubasdocEntity bdCubasdocEntity;
|
||||
|
||||
/**
|
||||
* 生成汇总维度字符串
|
||||
*/
|
||||
//生成汇总维度字符串
|
||||
private String summaryDimensionStr;
|
||||
|
||||
/**
|
||||
* 汇总总金额
|
||||
*/
|
||||
//汇总总金额
|
||||
private BigDecimal groupTotalPayAmount;
|
||||
|
||||
/**
|
||||
* 汇总实发数量
|
||||
*/
|
||||
//汇总实发数量
|
||||
private BigDecimal groupShipQty;
|
||||
|
||||
/**
|
||||
* 发货公司
|
||||
*/
|
||||
//发货公司
|
||||
private BdCorpEntity deliverGoodsCorp;
|
||||
|
||||
/**
|
||||
* U8C平台档案
|
||||
*/
|
||||
//U8C平台档案
|
||||
private BdDefdocEntity platformArchives;
|
||||
|
||||
/**
|
||||
* U8C店铺档案
|
||||
*/
|
||||
//U8C店铺档案
|
||||
private BdDefdocEntity shopArchives;
|
||||
|
||||
public BdDefdocEntity getShopArchives() {
|
||||
return shopArchives;
|
||||
}
|
||||
//存货管理档案，是发货公司的存货档案
|
||||
private BdInvmandocEntity bdInvmandocEntity;
|
||||
|
||||
public void setShopArchives(BdDefdocEntity shopArchives) {
|
||||
this.shopArchives = shopArchives;
|
||||
}
|
||||
//存货基本档案
|
||||
private BdInvbasdocEntity bdInvbasdocEntity;
|
||||
|
||||
public BdDefdocEntity getPlatformArchives() {
|
||||
return platformArchives;
|
||||
}
|
||||
|
||||
public void setPlatformArchives(BdDefdocEntity platformArchives) {
|
||||
this.platformArchives = platformArchives;
|
||||
}
|
||||
|
||||
public BdCorpEntity getDeliverGoodsCorp() {
|
||||
return deliverGoodsCorp;
|
||||
}
|
||||
|
||||
public void setDeliverGoodsCorp(BdCorpEntity deliverGoodsCorp) {
|
||||
this.deliverGoodsCorp = deliverGoodsCorp;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupShipQty() {
|
||||
return groupShipQty;
|
||||
}
|
||||
|
||||
public void setGroupShipQty(BigDecimal groupShipQty) {
|
||||
this.groupShipQty = groupShipQty;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupTotalPayAmount() {
|
||||
return groupTotalPayAmount;
|
||||
}
|
||||
|
||||
public void setGroupTotalPayAmount(BigDecimal groupTotalPayAmount) {
|
||||
this.groupTotalPayAmount = groupTotalPayAmount;
|
||||
}
|
||||
|
||||
public String getSummaryDimensionStr() {
|
||||
return summaryDimensionStr;
|
||||
}
|
||||
|
||||
public void setSummaryDimensionStr(String summaryDimensionStr) {
|
||||
this.summaryDimensionStr = summaryDimensionStr;
|
||||
}
|
||||
|
||||
public BdCorpEntity getBdCorpEntity() {
|
||||
return bdCorpEntity;
|
||||
}
|
||||
|
||||
public void setBdCorpEntity(BdCorpEntity bdCorpEntity) {
|
||||
this.bdCorpEntity = bdCorpEntity;
|
||||
}
|
||||
|
||||
public BdCalbodyEntity getBdCalbodyEntity() {
|
||||
return bdCalbodyEntity;
|
||||
}
|
||||
|
||||
public void setBdCalbodyEntity(BdCalbodyEntity bdCalbodyEntity) {
|
||||
this.bdCalbodyEntity = bdCalbodyEntity;
|
||||
}
|
||||
|
||||
public BdStordocEntity getBdStordocEntity() {
|
||||
return bdStordocEntity;
|
||||
}
|
||||
|
||||
public void setBdStordocEntity(BdStordocEntity bdStordocEntity) {
|
||||
this.bdStordocEntity = bdStordocEntity;
|
||||
}
|
||||
|
||||
public BdCalbodyEntity getBdCalbodyEntity1() {
|
||||
return bdCalbodyEntity1;
|
||||
}
|
||||
|
||||
public void setBdCalbodyEntity1(BdCalbodyEntity bdCalbodyEntity1) {
|
||||
this.bdCalbodyEntity1 = bdCalbodyEntity1;
|
||||
}
|
||||
|
||||
public BdStordocEntity getBdStordocEntity1() {
|
||||
return bdStordocEntity1;
|
||||
}
|
||||
|
||||
public void setBdStordocEntity1(BdStordocEntity bdStordocEntity1) {
|
||||
this.bdStordocEntity1 = bdStordocEntity1;
|
||||
}
|
||||
|
||||
public BdSalestruEntity getBdSalestruEntity() {
|
||||
return bdSalestruEntity;
|
||||
}
|
||||
|
||||
public void setBdSalestruEntity(BdSalestruEntity bdSalestruEntity) {
|
||||
this.bdSalestruEntity = bdSalestruEntity;
|
||||
}
|
||||
|
||||
public BdDeptdocEntity getBdDeptdocEntity() {
|
||||
return bdDeptdocEntity;
|
||||
}
|
||||
|
||||
public void setBdDeptdocEntity(BdDeptdocEntity bdDeptdocEntity) {
|
||||
this.bdDeptdocEntity = bdDeptdocEntity;
|
||||
}
|
||||
|
||||
public BdCumandocEntity getBdCumandocEntity() {
|
||||
return bdCumandocEntity;
|
||||
}
|
||||
|
||||
public void setBdCumandocEntity(BdCumandocEntity bdCumandocEntity) {
|
||||
this.bdCumandocEntity = bdCumandocEntity;
|
||||
}
|
||||
|
||||
public HeaderDto getHeader() {
|
||||
return header;
|
||||
}
|
||||
|
||||
public void setHeader(HeaderDto header) {
|
||||
this.header = header;
|
||||
}
|
||||
|
||||
public BdCubasdocEntity getBdCubasdocEntity() {
|
||||
return bdCubasdocEntity;
|
||||
}
|
||||
|
||||
public void setBdCubasdocEntity(BdCubasdocEntity bdCubasdocEntity) {
|
||||
this.bdCubasdocEntity = bdCubasdocEntity;
|
||||
}
|
||||
//存货税率
|
||||
private BdTaxitemsEntity bdTaxitemsEntity;
|
||||
}
|
||||
|
|
@ -2,6 +2,10 @@ package com.hzya.frame.plugin.lets.util;
|
|||
|
||||
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 org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
|
@ -22,6 +26,8 @@ import java.util.Map;
|
|||
@Component
|
||||
public class TocOrderBasicArchivesCacheUtil {
|
||||
|
||||
Logger logger = LoggerFactory.getLogger(TocOrderBasicArchivesCacheUtil.class);
|
||||
|
||||
@Autowired
|
||||
private IBdCorpDao iBdCorpDao;
|
||||
|
||||
|
|
@ -55,13 +61,17 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
@Autowired
|
||||
private IBdDefdocDao iBdDefdocDao;
|
||||
|
||||
@Autowired
|
||||
private IBdRdclDao iBdRdclDao;
|
||||
|
||||
/**
|
||||
* 初始化公司档案-表头公司
|
||||
* 2024年7月31日 11:16:23
|
||||
*/
|
||||
public static Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
|
||||
private Map<String, BdCorpEntity> initShop() throws Exception {
|
||||
Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
|
||||
|
||||
private void initShop() throws Exception {
|
||||
BdCorpEntity bdCorpEntity = new BdCorpEntity();
|
||||
bdCorpEntity.setDr(0);
|
||||
bdCorpEntity.setDataSourceCode("lets_u8c");
|
||||
|
|
@ -69,9 +79,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
if (bdCorpEntityList != null && bdCorpEntityList.size() > 0) {
|
||||
for (int i = 0; i < bdCorpEntityList.size(); i++) {
|
||||
BdCorpEntity bdCorpEntity1 = bdCorpEntityList.get(i);
|
||||
stringBdCorpEntityMap.put(bdCorpEntity1.getUnitname(), bdCorpEntity1);
|
||||
stringBdCorpEntityMap.put(bdCorpEntity1.getUnitcode(), bdCorpEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdCorpEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -79,9 +90,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
* 2024年7月31日 11:16:27
|
||||
* 202403011513：仓库根据仓库编码+库存组织编码去查询，之前是仓库编码+公司主键，和李佳妮确认好了
|
||||
*/
|
||||
public static Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
|
||||
private Map<String, BdStordocEntity> initBdStordoc() throws Exception {
|
||||
Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
|
||||
|
||||
private void initBdStordoc() throws Exception {
|
||||
BdStordocEntity bdStordocEntity = new BdStordocEntity();
|
||||
bdStordocEntity.setDr(0L);
|
||||
bdStordocEntity.setDataSourceCode("lets_u8c");
|
||||
|
|
@ -92,14 +104,16 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdStordocEntityMap.put(bdStordocEntity1.getStorcode() + bdStordocEntity1.getPkCalbody(), bdStordocEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdStordocEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 2024年7月31日 11:09:12 查询发货库存组织
|
||||
*/
|
||||
public static Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
|
||||
private Map<String, BdCalbodyEntity> initBdCalbody() throws Exception {
|
||||
Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
|
||||
|
||||
private void initBdCalbody() throws Exception {
|
||||
BdCalbodyEntity bdCalbodyEntity = new BdCalbodyEntity();
|
||||
bdCalbodyEntity.setDr(0);
|
||||
bdCalbodyEntity.setDataSourceCode("lets_u8c");
|
||||
|
|
@ -110,14 +124,16 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdCalbodyEntityMap.put(bdCalbodyEntity1.getPkCorp(), bdCalbodyEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdCalbodyEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化销售组织
|
||||
*/
|
||||
public static Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
|
||||
private Map<String, BdSalestruEntity> initBdSalestru() throws Exception {
|
||||
Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
|
||||
|
||||
private void initBdSalestru() throws Exception {
|
||||
BdSalestruEntity bdSalestruEntity = new BdSalestruEntity();
|
||||
bdSalestruEntity.setDr(0);
|
||||
bdSalestruEntity.setDataSourceCode("lets_u8c");
|
||||
|
|
@ -128,6 +144,7 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdSalestruEntityMap.put(bdSalestruEntity1.getVsalestruname(), bdSalestruEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdSalestruEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -135,9 +152,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public static Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
|
||||
private Map<String, BdDeptdocEntity> initDept() {
|
||||
Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
|
||||
|
||||
private void initDept() {
|
||||
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
|
||||
bdDeptdocEntity.setDataSourceCode("lets_u8c");
|
||||
bdDeptdocEntity.setDr(0);
|
||||
|
|
@ -149,6 +167,7 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdDeptdocEntityMap.put(bdDeptdocEntity1.getPkCorp(), bdDeptdocEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdDeptdocEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -156,9 +175,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public static Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
|
||||
// public static Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
|
||||
private Map<String, BdCubasdocEntity> initBdCubasdoc() {
|
||||
Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
|
||||
|
||||
private void initBdCubasdoc() {
|
||||
BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity();
|
||||
bdCubasdocEntity.setDataSourceCode("lets_u8c");
|
||||
bdCubasdocEntity.setDr(0L);
|
||||
|
|
@ -166,9 +186,14 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) {
|
||||
for (int i = 0; i < bdCumandocEntityList.size(); i++) {
|
||||
BdCubasdocEntity bdCubasdocEntity1 = bdCumandocEntityList.get(i);
|
||||
stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getCustname(), bdCubasdocEntity1);
|
||||
if (stringBdCubasdocEntityHashMap.get(bdCubasdocEntity1.getDef1()) == null) {
|
||||
stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getDef1(), bdCubasdocEntity1);
|
||||
} else {
|
||||
logger.warn("客商档案def1重复，客商编码：{}", bdCubasdocEntity1.getCustcode());
|
||||
}
|
||||
}
|
||||
}
|
||||
return stringBdCubasdocEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -176,9 +201,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public static Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
|
||||
private Map<String, BdCumandocEntity> initBdCumandoc() {
|
||||
Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
|
||||
|
||||
private void initBdCumandoc() {
|
||||
BdCumandocEntity bdCumandocEntity1 = new BdCumandocEntity();
|
||||
bdCumandocEntity1.setDataSourceCode("lets_u8c");
|
||||
bdCumandocEntity1.setDr(0L);
|
||||
|
|
@ -190,14 +216,16 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdCumandocEntityMap.put(bdCumandocEntity.getPkCubasdoc() + bdCumandocEntity.getPkCorp(), bdCumandocEntity);
|
||||
}
|
||||
}
|
||||
return stringBdCumandocEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化存货管理档案
|
||||
*/
|
||||
public static Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
|
||||
// public static Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
|
||||
private Map<String, BdInvmandocEntity> initInventoryFile() throws Exception {
|
||||
Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
|
||||
|
||||
private void initInventoryFile() throws Exception {
|
||||
BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity();
|
||||
// bdInvmandocEntity.setInvcode(copyRowDetailsListVo.getSpec_no());
|
||||
// bdInvmandocEntity.setPkCorp(shippingCompanyBdCorpEntity.getPkCorp());
|
||||
|
|
@ -209,15 +237,17 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdInvmandocEntityMap.put(bdInvmandocEntity1.getInvcode() + bdInvmandocEntity1.getPkCorp(), bdInvmandocEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdInvmandocEntityMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化存货基本档案
|
||||
* 2024年8月7日 10:57:55
|
||||
*/
|
||||
public static Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
|
||||
// public static Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
|
||||
private Map<String, BdInvbasdocEntity> initBasicInventoryFile() throws Exception {
|
||||
Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
|
||||
|
||||
private void initBasicInventoryFile() throws Exception {
|
||||
BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity();
|
||||
// bdInvbasdocEntity.setPk_invmandoc(bdInvmandocEntity1.getPkInvmandoc());
|
||||
// bdInvbasdocEntity.setPk_corp(shippingCompanyBdCorpEntity.getPkCorp());
|
||||
|
|
@ -228,6 +258,7 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdInvbasdocEntityHashMap.put(bdInvbasdocEntity1.getPk_invmandoc() + bdInvbasdocEntity1.getPk_corp_man(), bdInvbasdocEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdInvbasdocEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -236,9 +267,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public static Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
|
||||
// public static Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
|
||||
private Map<String, BdTaxitemsEntity> initBdTaxitemsEntity() throws Exception {
|
||||
Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
|
||||
|
||||
private void initBdTaxitemsEntity() throws Exception {
|
||||
BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity();
|
||||
List<BdTaxitemsEntity> bdTaxitemsEntityList = iBdTaxitemsDao.queryBdInvbasdocByInvcodeV2(bdTaxitemsEntity);
|
||||
if (bdTaxitemsEntityList != null && bdTaxitemsEntityList.size() > 0) {
|
||||
|
|
@ -247,6 +279,8 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdTaxitemsEntityHashMap.put(bdTaxitemsEntity1.getInvcode(), bdTaxitemsEntity1);
|
||||
}
|
||||
}
|
||||
|
||||
return stringBdTaxitemsEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -254,9 +288,10 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public static Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
|
||||
// public static Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
|
||||
private Map<String, BdDefdocEntity> initSourcePlatform() {
|
||||
Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
|
||||
|
||||
private void initSourcePlatform() {
|
||||
BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
|
||||
bdDefdocEntity.setPkDefdoclist("0001A210000000000JUD");
|
||||
bdDefdocEntity.setDr(0);
|
||||
|
|
@ -268,14 +303,16 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
stringBdDefdocEntityHashMap.put(bdDefdocEntity1.getDoccode(), bdDefdocEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdDefdocEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 2024年8月14日 15:17:48 缓存U8C店铺自定义档案逻辑
|
||||
*/
|
||||
public static Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
|
||||
// public static Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
|
||||
private Map<String, BdDefdocEntity> initShopDiy() {
|
||||
Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
|
||||
|
||||
private void initShopDiy() {
|
||||
BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
|
||||
bdDefdocEntity.setPkDefdoclist("0001A210000000000XZX");
|
||||
bdDefdocEntity.setDr(0);
|
||||
|
|
@ -287,6 +324,25 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
shopDefdocEntityHashMap.put(bdDefdocEntity1.getDoccode(), bdDefdocEntity1);
|
||||
}
|
||||
}
|
||||
return shopDefdocEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化收发类别
|
||||
*/
|
||||
private Map<String, BdRdclEntity> initBdRdcl() {
|
||||
Map<String, BdRdclEntity> stringBdRdclEntityHashMap = new HashMap<>();
|
||||
BdRdclEntity bdRdclEntity = new BdRdclEntity();
|
||||
bdRdclEntity.setDr(0);
|
||||
bdRdclEntity.setDataSourceCode("lets_u8c");
|
||||
List<BdRdclEntity> bdRdclEntityList = iBdRdclDao.query(bdRdclEntity);
|
||||
if (bdRdclEntityList != null && bdRdclEntityList.size() > 0) {
|
||||
for (int i = 0; i < bdRdclEntityList.size(); i++) {
|
||||
BdRdclEntity bdRdclEntity1 = bdRdclEntityList.get(i);
|
||||
stringBdRdclEntityHashMap.put(bdRdclEntity1.getRdcode(), bdRdclEntity1);
|
||||
}
|
||||
}
|
||||
return stringBdRdclEntityHashMap;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -294,40 +350,61 @@ public class TocOrderBasicArchivesCacheUtil {
|
|||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public void clearCache() throws Exception {
|
||||
stringBdCorpEntityMap.clear();
|
||||
stringBdStordocEntityMap.clear();
|
||||
stringBdCalbodyEntityMap.clear();
|
||||
stringBdSalestruEntityMap.clear();
|
||||
stringBdDeptdocEntityMap.clear();
|
||||
stringBdCumandocEntityMap.clear();
|
||||
stringBdInvmandocEntityMap.clear();
|
||||
stringBdInvbasdocEntityHashMap.clear();
|
||||
stringBdTaxitemsEntityHashMap.clear();
|
||||
stringBdCubasdocEntityHashMap.clear();
|
||||
stringBdDefdocEntityHashMap.clear();
|
||||
shopDefdocEntityHashMap.clear();
|
||||
}
|
||||
// public void clearCache() throws Exception {
|
||||
// stringBdCorpEntityMap.clear();
|
||||
// stringBdStordocEntityMap.clear();
|
||||
// stringBdCalbodyEntityMap.clear();
|
||||
// stringBdSalestruEntityMap.clear();
|
||||
// stringBdDeptdocEntityMap.clear();
|
||||
// stringBdCumandocEntityMap.clear();
|
||||
// stringBdInvmandocEntityMap.clear();
|
||||
// stringBdInvbasdocEntityHashMap.clear();
|
||||
// stringBdTaxitemsEntityHashMap.clear();
|
||||
// stringBdCubasdocEntityHashMap.clear();
|
||||
// stringBdDefdocEntityHashMap.clear();
|
||||
// shopDefdocEntityHashMap.clear();
|
||||
// }
|
||||
|
||||
/**
|
||||
* 初始化缓存
|
||||
*
|
||||
* @author liuyang
|
||||
*/
|
||||
public void initCache() throws Exception {
|
||||
clearCache();
|
||||
public CacheTocMapVo initCache() throws Exception {
|
||||
// clearCache();
|
||||
|
||||
initShop();
|
||||
initBdStordoc();
|
||||
initBdCalbody();
|
||||
initBdSalestru();
|
||||
initDept();
|
||||
initBdCumandoc();
|
||||
initInventoryFile();
|
||||
initBasicInventoryFile();
|
||||
initBdTaxitemsEntity();
|
||||
initBdCubasdoc();
|
||||
initSourcePlatform();
|
||||
initShopDiy();
|
||||
long startMillis = System.currentTimeMillis();
|
||||
logger.info("初始化缓存开始");
|
||||
Map<String, BdCorpEntity> stringBdCorpEntityMap = initShop();
|
||||
Map<String, BdStordocEntity> stringBdStordocEntityMap = initBdStordoc();
|
||||
Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = initBdCalbody();
|
||||
Map<String, BdSalestruEntity> stringBdSalestruEntityMap = initBdSalestru();
|
||||
Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = initDept();
|
||||
Map<String, BdCumandocEntity> stringBdCumandocEntityMap = initBdCumandoc();
|
||||
Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = initInventoryFile();
|
||||
Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityMap = initBasicInventoryFile();
|
||||
Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityMap = initBdTaxitemsEntity();
|
||||
Map<String, BdCubasdocEntity> stringBdCubasdocEntityMap = initBdCubasdoc();
|
||||
Map<String, BdDefdocEntity> stringBdDefdocEntityMap = initSourcePlatform();
|
||||
Map<String, BdDefdocEntity> stringBdDefdocEntityMap1 = initShopDiy();
|
||||
Map<String, BdRdclEntity> stringBdRdclEntityMap = initBdRdcl();
|
||||
long endMillis = System.currentTimeMillis();
|
||||
logger.info("初始化缓存完成 耗时：{}", (endMillis - startMillis));
|
||||
|
||||
CacheTocMapVo cacheTocMapVo = new CacheTocMapVo();
|
||||
cacheTocMapVo.setStringBdCorpEntityMap(stringBdCorpEntityMap);
|
||||
cacheTocMapVo.setStringBdStordocEntityMap(stringBdStordocEntityMap);
|
||||
cacheTocMapVo.setStringBdCalbodyEntityMap(stringBdCalbodyEntityMap);
|
||||
cacheTocMapVo.setStringBdSalestruEntityMap(stringBdSalestruEntityMap);
|
||||
cacheTocMapVo.setStringBdDeptdocEntityMap(stringBdDeptdocEntityMap);
|
||||
cacheTocMapVo.setStringBdCumandocEntityMap(stringBdCumandocEntityMap);
|
||||
cacheTocMapVo.setStringBdInvmandocEntityMap(stringBdInvmandocEntityMap);
|
||||
cacheTocMapVo.setStringBdInvbasdocEntityMap(stringBdInvbasdocEntityMap);
|
||||
cacheTocMapVo.setStringBdTaxitemsEntityMap(stringBdTaxitemsEntityMap);
|
||||
cacheTocMapVo.setStringBdCubasdocEntityMap(stringBdCubasdocEntityMap);
|
||||
cacheTocMapVo.setStringBdDefdocPlatformEntityMap(stringBdDefdocEntityMap);
|
||||
cacheTocMapVo.setStringBdDefdocShopEntityMap(stringBdDefdocEntityMap1);
|
||||
cacheTocMapVo.setStringBdRdclEntityMap(stringBdRdclEntityMap);
|
||||
return cacheTocMapVo;
|
||||
}
|
||||
}
|
||||
|
|
@ -32,10 +32,10 @@ class SoSaleOutPluginInitializerToCTest {
|
|||
|
||||
try {
|
||||
// QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
|
||||
// queryOfsSoSaleOutVo.setCode("LETS-SO2024070500000001");
|
||||
soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024081500000001");
|
||||
// soSaleOutPluginInitializerToC.getOfsOrder(queryOfsSoSaleOutVo, 1L);
|
||||
|
||||
soSaleOutPluginInitializerToC.startImplement("2024-04-28 00:00:00", "2024-04-28 23:59:59");
|
||||
// soSaleOutPluginInitializerToC.startImplement("2024-04-28 00:00:00", "2024-04-28 23:59:59");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,9 +34,6 @@ public class DetailsDto {
|
|||
private String createdBy;
|
||||
private String lastUpdated;
|
||||
private String lastUpdatedBy;
|
||||
|
||||
/**
|
||||
* 表头对象
|
||||
*/
|
||||
//表头对象
|
||||
private HeaderDto headerDto;
|
||||
}
|
||||
|
|
@ -68,13 +68,9 @@ public class HeaderDto {
|
|||
private String tradeSuccessAt;
|
||||
private String sourceOrderStatus;
|
||||
|
||||
/**
|
||||
* 发货日期
|
||||
*/
|
||||
//发货日期
|
||||
private String shipAt;
|
||||
|
||||
/**
|
||||
* 出库类型
|
||||
*/
|
||||
//出库类型
|
||||
private String shipmentType;
|
||||
}
|
||||
Loading…
Reference in New Issue