From 16650807f46d7b141cd99869d71dc240babed9ac Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:15:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E6=9B=B4=E6=96=B0Toc?= =?UTF-8?q?ofsReturngoods=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=BF=E9=97=AE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重构TocofsReturngoods和TocofsReturngoodsDetailed实体类，以符合最新项目需求。 - 更新数据访问层方法，以支持批量插入或更新操作。 - 重命名字段并添加新字段以增加功能和数据一致性。 - 删除过时的列表插入方法，以避免未来的错误和混淆。 --- .../lets/ofs/dao/ITocofsReturngoodsDao.java | 6 +- .../dao/ITocofsReturngoodsDetailedDao.java | 35 +- .../dao/impl/TocofsReturngoodsDaoImpl.java | 9 +- .../TocofsReturngoodsDetailedDaoImpl.java | 31 +- .../TocofsReturngoodsDetailedEntity.java | 315 +++- .../TocofsReturngoodsDetailedEntity.xml | 1437 ++++++++++++----- .../ofs/entity/TocofsReturngoodsEntity.java | 573 +------ .../ofs/entity/TocofsReturngoodsEntity.xml | 1055 ++++++------ .../SoSaleReturnPluginInitializerToB.java | 605 +++++-- .../SoSaleReturnPluginInitializerToC.java | 877 ++++++++-- .../u8cdto/ErrorHeaderDetailsDtoDtoV2.java | 33 + .../dto/stock/StockinOrderSearchResponse.java | 3 + 12 files changed, 3202 insertions(+), 1777 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ErrorHeaderDetailsDtoDtoV2.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDao.java index 6a9a65e4..6c5a321c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDao.java @@ -9,14 +9,14 @@ import java.util.List; * OFS售后入库单(tocofs_returngoods: table)表数据库访问层 * * @author makejava - * @since 2024-08-09 11:08:40 + * @since 2024-09-13 11:58:10 */ public interface ITocofsReturngoodsDao extends IBaseDao { /** - * 批量插入 + * 批量保存或者更新数据行底表 * * @author liuyang */ - void entityInsertBatchV2(List tocofsReturngoodsEntityList) throws Exception; + void entityInsertOrUpdateBatch(List tocofsReturngoodsEntityList) throws Exception; } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDetailedDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDetailedDao.java index 9275a893..f28e0527 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDetailedDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsReturngoodsDetailedDao.java @@ -2,7 +2,6 @@ package com.hzya.frame.plugin.lets.ofs.dao; import com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsEntity; import java.util.List; @@ -10,13 +9,41 @@ import java.util.List; * root(tocofs_returngoods_detailed: table)表数据库访问层 * * @author makejava - * @since 2024-08-09 13:45:47 + * @since 2024-09-13 11:58:26 */ public interface ITocofsReturngoodsDetailedDao extends IBaseDao { /** - * 批量插入 + * 批量插入或更新到底表 * * @author liuyang */ - void entityInsertBatchV2(List tocofsReturngoodsEntityList) throws Exception; + void entityInsertOrUpdateBatch(List tocofsReturngoodsDetailedEntityList) throws Exception; + + /** + * 批量新增或者修改，TOC退货-库存 + * + * @author liuyang + */ + void entityInsertOrUpdateBatchByTocRerturnStock(List tocofsReturngoodsDetailedEntityList) throws Exception; + + /** + * 批量新增或者修改，TOC退货-确认收入 + * + * @author liuyang + */ + void entityInsertOrUpdateBatchByTocRerturnTran(List tocofsReturngoodsDetailedEntityList) throws Exception; + + /** + * 批量新增或者修改，TOB退货-库存 + * + * @author liuyang + */ + void entityInsertOrUpdateBatchByTobRerturnStock(List tocofsReturngoodsDetailedEntityList) throws Exception; + + /** + * 批量新增或者修改，TOB退货-确认收入 + * + * @author liuyang + */ + void entityInsertOrUpdateBatchByTobRerturnTran(List tocofsReturngoodsDetailedEntityList) throws Exception; } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDaoImpl.java index c5829a8f..55ab8454 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDaoImpl.java @@ -11,12 +11,11 @@ import java.util.List; * OFS售后入库单(TocofsReturngoods)表数据库访问层 * * @author makejava - * @since 2024-08-09 11:08:40 + * @since 2024-09-13 11:58:10 */ public class TocofsReturngoodsDaoImpl extends MybatisGenericDao implements ITocofsReturngoodsDao { - @Override - public void entityInsertBatchV2(List tocofsReturngoodsEntityList) throws Exception { - this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDaoImpl.entityInsertBatchV2", tocofsReturngoodsEntityList); + public void entityInsertOrUpdateBatch(List tocofsReturngoodsEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDaoImpl.entityInsertOrUpdateBatch", tocofsReturngoodsEntityList); } -} +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDetailedDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDetailedDaoImpl.java index e87fd8d9..f1f49e16 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDetailedDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsReturngoodsDetailedDaoImpl.java @@ -2,7 +2,6 @@ package com.hzya.frame.plugin.lets.ofs.dao.impl; import com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity; import com.hzya.frame.plugin.lets.ofs.dao.ITocofsReturngoodsDetailedDao; -import com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; @@ -12,11 +11,33 @@ import java.util.List; * root(TocofsReturngoodsDetailed)表数据库访问层 * * @author makejava - * @since 2024-08-09 13:45:47 + * @since 2024-09-13 11:58:26 */ public class TocofsReturngoodsDetailedDaoImpl extends MybatisGenericDao implements ITocofsReturngoodsDetailedDao { + @Override - public void entityInsertBatchV2(List tocofsReturngoodsDetailedEntityList) throws Exception { - this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertBatchV2", tocofsReturngoodsDetailedEntityList); + public void entityInsertOrUpdateBatch(List tocofsReturngoodsDetailedEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertOrUpdateBatch", tocofsReturngoodsDetailedEntityList); } -} \ No newline at end of file + + @Override + public void entityInsertOrUpdateBatchByTocRerturnStock(List tocofsReturngoodsDetailedEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertOrUpdateBatchByTocRerturnStock", tocofsReturngoodsDetailedEntityList); + } + + @Override + public void entityInsertOrUpdateBatchByTocRerturnTran(List tocofsReturngoodsDetailedEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertOrUpdateBatchByTocRerturnTran", tocofsReturngoodsDetailedEntityList); + } + + @Override + public void entityInsertOrUpdateBatchByTobRerturnStock(List tocofsReturngoodsDetailedEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertOrUpdateBatchByTobRerturnStock", tocofsReturngoodsDetailedEntityList); + } + + @Override + public void entityInsertOrUpdateBatchByTobRerturnTran(List tocofsReturngoodsDetailedEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsReturngoodsDetailedDaoImpl.entityInsertOrUpdateBatchByTobRerturnTran", tocofsReturngoodsDetailedEntityList); + } +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.java index 3ca7cfa2..3e42b584 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.java @@ -1,6 +1,5 @@ package com.hzya.frame.plugin.lets.ofs.entity; -import com.hzya.frame.ttxofs.dto.returngoodsearch.ReturnGoodSearchHeaderDto; import com.hzya.frame.web.entity.BaseEntity; import lombok.Data; @@ -8,98 +7,100 @@ import lombok.Data; * root(TocofsReturngoodsDetailed)实体类 * * @author makejava - * @since 2024-08-09 13:45:47 + * @since 2024-09-13 11:58:26 */ @Data public class TocofsReturngoodsDetailedEntity extends BaseEntity { + /** * 81159 */ - private String receiptId; + private String receiptid; /** * LETS-RE2024071600000001 */ - private String receiptCode; + private String receiptcode; /** * 128 */ - private String refOrderId; + private String reforderid; /** * 299 */ - private String refOrderDetailId; + private String reforderdetailid; /** * LETS-SO2024070500000001 */ - private String sourceOrderCode; + private String sourceordercode; + private String sourcelinenum; /** * LETS */ - private String clientCode; + private String clientcode; /** * SHLZ */ - private String companyCode; + private String companycode; /** * intoyou-tmxs */ - private String facilityCode; + private String facilitycode; /** * 6973391730617 */ - private String skuCode; + private String skucode; /** * INTOYOU心慕与你水感裸雾唇釉W01 */ - private String skuName; + private String skuname; /** * 2 */ - private String requestQty; + private String requestqty; /** * 2 */ - private String receivedQty; + private String receivedqty; /** * 0 */ - private String openQty; + private String openqty; /** * EA */ - private String quantityUM; + private String quantityum; /** * 0 */ - private String totalWeight; + private String totalweight; /** * 0 */ - private String totalVolume; + private String totalvolume; /** * 0 */ - private String totalVolumeWeight; + private String totalvolumeweight; /** * 118 */ - private String totalAmount; + private String totalamount; /** * G */ - private String weightUM; + private String weightum; /** * CM3 */ - private String volumeUM; + private String volumeum; /** * AVAILABLE */ - private String inventorySts; + private String inventorysts; /** * 30796 */ - private String inTransInvId; + private String intransinvid; /** * 0 */ @@ -111,52 +112,278 @@ public class TocofsReturngoodsDetailedEntity extends BaseEntity { /** * admin */ - private String createdBy; + private String createdby; /** * 2024-07-16 16:44:01 */ - private String lastUpdated; + private String lastupdated; /** * api */ - private String lastUpdatedBy; + private String lastupdatedby; /** * 59 */ - private String discountPrice; + private String discountprice; + /** + * 主表主键 + */ + private String maintableid; /** * 报错内容 */ - private String newTransmitinfo; + private String newtransmitinfo; /** * 推送时间 */ - private String newPushdate; + private String newpushdate; /** * 是否成功 */ - private String newState; + private String newstate; /** * 下游系统编码 */ - private String newSystemNumber; + private String newsystemnumber; /** * 下游系统主键 */ - private String newSystemPrimary; + private String newsystemprimary; /** - * 主表主键 + * 报错内容 */ - private String primaryKey; + private String newtransmitinfo2; /** - * 业务日期 + * 推送时间 */ - private String businessDate; + private String newpushdate2; + /** + * 是否成功 + */ + private String newstate2; + /** + * 下游系统编码 + */ + private String newsystemnumber2; + /** + * 下游系统主键 + */ + private String newsystemprimary2; + /** + * 报错内容 + */ + private String newtransmitinfo3; + /** + * 推送时间 + */ + private String newpushdate3; + /** + * 是否成功 + */ + private String newstate3; + /** + * 下游系统编码 + */ + private String newsystemnumber3; + /** + * 下游系统主键 + */ + private String newsystemprimary3; + /** + * 报错内容 + */ + private String newtransmitinfo4; + /** + * 推送时间 + */ + private String newpushdate4; + /** + * 是否成功 + */ + private String newstate4; + /** + * 下游系统编码 + */ + private String newsystemnumber4; + /** + * 下游系统主键 + */ + private String newsystemprimary4; + /** + * 业务日期-入库时间 + */ + private String businessdate; + /** + * 业务日期-退款完成时间 + */ + private String refundedat; + /** + * 业务类型(TOC退货orTOB退货) + */ + 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; + /** + * 补充的查询条件 + */ + private String ids; +} - /** - * 主表主键 - */ -// private String returngoodsId; - - private String businessType; -} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml index dfd0b4cd..b0cb98c8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml @@ -4,83 +4,196 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id - ,receipt_id - ,receipt_code - ,ref_order_id - ,ref_order_detail_id - ,source_order_code - ,client_code - ,company_code - ,facility_code - ,sku_code - ,sku_name - ,request_qty - ,received_qty - ,open_qty - ,quantity_u_m - ,total_weight - ,total_volume - ,total_volume_weight - ,total_amount - ,weight_u_m - ,volume_u_m - ,inventory_sts - ,in_trans_inv_id + ,receiptId + ,receiptCode + ,refOrderId + ,refOrderDetailId + ,sourceOrderCode + ,sourceLineNum + ,clientCode + ,companyCode + ,facilityCode + ,skuCode + ,skuName + ,requestQty + ,receivedQty + ,openQty + ,quantityUM + ,totalWeight + ,totalVolume + ,totalVolumeWeight + ,totalAmount + ,weightUM + ,volumeUM + ,inventorySts + ,inTransInvId ,closed ,created - ,created_by - ,last_updated - ,last_updated_by - ,discount_price - ,new_transmitInfo - ,new_pushDate - ,new_state - ,new_system_number - ,new_system_primary - ,primary_key - ,business_date - ,business_type + ,createdBy + ,lastUpdated + ,lastUpdatedBy + ,discountPrice + ,mainTableId + ,newTransmitInfo + ,newPushDate + ,newState + ,newSystemNumber + ,newSystemPrimary + ,newTransmitInfo2 + ,newPushDate2 + ,newState2 + ,newSystemNumber2 + ,newSystemPrimary2 + ,newTransmitInfo3 + ,newPushDate3 + ,newState3 + ,newSystemNumber3 + ,newSystemPrimary3 + ,newTransmitInfo4 + ,newPushDate4 + ,newState4 + ,newSystemNumber4 + ,newSystemPrimary4 + ,businessDate + ,refundedAt + ,businessType + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,def11 + ,def12 + ,def13 + ,def14 + ,def15 + ,def16 + ,def17 + ,def18 + ,def19 + ,def20 + ,def21 + ,def22 + ,def23 + ,def24 + ,def25 + ,def26 + ,def27 + ,def28 + ,def29 + ,def30 + ,def31 + ,def32 + ,def33 + ,def34 + ,def35 + ,def36 + ,def37 + ,def38 + ,def39 + ,def40 @@ -90,46 +203,106 @@ from tocofs_returngoods_detailed and id = #{id} - and receipt_id = #{receiptId} - and receipt_code = #{receiptCode} - and ref_order_id = #{refOrderId} - and ref_order_detail_id = #{refOrderDetailId} - and source_order_code = #{sourceOrderCode} - and client_code = #{clientCode} - and company_code = #{companyCode} - and facility_code = #{facilityCode} - and sku_code = #{skuCode} - and sku_name = #{skuName} - and request_qty = #{requestQty} - and received_qty = #{receivedQty} - and open_qty = #{openQty} - and quantity_u_m = #{quantityUM} - and total_weight = #{totalWeight} - and total_volume = #{totalVolume} - and total_volume_weight = #{totalVolumeWeight} - and total_amount = #{totalAmount} - and weight_u_m = #{weightUM} - and volume_u_m = #{volumeUM} - and inventory_sts = #{inventorySts} - and in_trans_inv_id = #{inTransInvId} + and receiptId = #{receiptid} + and receiptCode = #{receiptcode} + and refOrderId = #{reforderid} + and refOrderDetailId = #{reforderdetailid} + and sourceOrderCode = #{sourceordercode} + and sourceLineNum = #{sourcelinenum} + and clientCode = #{clientcode} + and companyCode = #{companycode} + and facilityCode = #{facilitycode} + and skuCode = #{skucode} + and skuName = #{skuname} + and requestQty = #{requestqty} + and receivedQty = #{receivedqty} + and openQty = #{openqty} + and quantityUM = #{quantityum} + and totalWeight = #{totalweight} + and totalVolume = #{totalvolume} + and totalVolumeWeight = #{totalvolumeweight} + and totalAmount = #{totalamount} + and weightUM = #{weightum} + and volumeUM = #{volumeum} + and inventorySts = #{inventorysts} + and inTransInvId = #{intransinvid} and closed = #{closed} and created = #{created} - and created_by = #{createdBy} - and last_updated = #{lastUpdated} - and last_updated_by = #{lastUpdatedBy} - and discount_price = #{discountPrice} - and new_transmitInfo = #{newTransmitinfo} - and new_pushDate = #{newPushdate} - and new_state = #{newState} - and new_system_number = #{newSystemNumber} - and new_system_primary = #{newSystemPrimary} - and primary_key = #{primaryKey} - and business_date = #{businessDate} - and business_type = #{businessType} - and sts='Y' + and createdBy = #{createdby} + and lastUpdated = #{lastupdated} + and lastUpdatedBy = #{lastupdatedby} + and discountPrice = #{discountprice} + and mainTableId = #{maintableid} + and newTransmitInfo = #{newtransmitinfo} + and newPushDate = #{newpushdate} + and newState = #{newstate} + and newSystemNumber = #{newsystemnumber} + and newSystemPrimary = #{newsystemprimary} + and newTransmitInfo2 = #{newtransmitinfo2} + and newPushDate2 = #{newpushdate2} + and newState2 = #{newstate2} + and newSystemNumber2 = #{newsystemnumber2} + and newSystemPrimary2 = #{newsystemprimary2} + and newTransmitInfo3 = #{newtransmitinfo3} + and newPushDate3 = #{newpushdate3} + and newState3 = #{newstate3} + and newSystemNumber3 = #{newsystemnumber3} + and newSystemPrimary3 = #{newsystemprimary3} + and newTransmitInfo4 = #{newtransmitinfo4} + and newPushDate4 = #{newpushdate4} + and newState4 = #{newstate4} + and newSystemNumber4 = #{newsystemnumber4} + and newSystemPrimary4 = #{newsystemprimary4} + and businessDate = #{businessdate} + and refundedAt = #{refundedat} + and businessType = #{businesstype} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and def11 = #{def11} + and def12 = #{def12} + and def13 = #{def13} + and def14 = #{def14} + and def15 = #{def15} + and def16 = #{def16} + and def17 = #{def17} + and def18 = #{def18} + and def19 = #{def19} + and def20 = #{def20} + and def21 = #{def21} + and def22 = #{def22} + and def23 = #{def23} + and def24 = #{def24} + and def25 = #{def25} + and def26 = #{def26} + and def27 = #{def27} + and def28 = #{def28} + and def29 = #{def29} + and def30 = #{def30} + and def31 = #{def31} + and def32 = #{def32} + and def33 = #{def33} + and def34 = #{def34} + and def35 = #{def35} + and def36 = #{def36} + and def37 = #{def37} + and def38 = #{def38} + and def39 = #{def39} + and def40 = #{def40} + + and id in (${ids}) + +-- and sts='Y' - order by sorts asc - order by ${sort} ${order} + + @@ -137,42 +310,99 @@ select count(1) from tocofs_returngoods_detailed and id = #{id} - and receipt_id = #{receiptId} - and receipt_code = #{receiptCode} - and ref_order_id = #{refOrderId} - and ref_order_detail_id = #{refOrderDetailId} - and source_order_code = #{sourceOrderCode} - and client_code = #{clientCode} - and company_code = #{companyCode} - and facility_code = #{facilityCode} - and sku_code = #{skuCode} - and sku_name = #{skuName} - and request_qty = #{requestQty} - and received_qty = #{receivedQty} - and open_qty = #{openQty} - and quantity_u_m = #{quantityUM} - and total_weight = #{totalWeight} - and total_volume = #{totalVolume} - and total_volume_weight = #{totalVolumeWeight} - and total_amount = #{totalAmount} - and weight_u_m = #{weightUM} - and volume_u_m = #{volumeUM} - and inventory_sts = #{inventorySts} - and in_trans_inv_id = #{inTransInvId} + and receiptId = #{receiptid} + and receiptCode = #{receiptcode} + and refOrderId = #{reforderid} + and refOrderDetailId = #{reforderdetailid} + and sourceOrderCode = #{sourceordercode} + and sourceLineNum = #{sourcelinenum} + and clientCode = #{clientcode} + and companyCode = #{companycode} + and facilityCode = #{facilitycode} + and skuCode = #{skucode} + and skuName = #{skuname} + and requestQty = #{requestqty} + and receivedQty = #{receivedqty} + and openQty = #{openqty} + and quantityUM = #{quantityum} + and totalWeight = #{totalweight} + and totalVolume = #{totalvolume} + and totalVolumeWeight = #{totalvolumeweight} + and totalAmount = #{totalamount} + and weightUM = #{weightum} + and volumeUM = #{volumeum} + and inventorySts = #{inventorysts} + and inTransInvId = #{intransinvid} and closed = #{closed} and created = #{created} - and created_by = #{createdBy} - and last_updated = #{lastUpdated} - and last_updated_by = #{lastUpdatedBy} - and discount_price = #{discountPrice} - and new_transmitInfo = #{newTransmitinfo} - and new_pushDate = #{newPushdate} - and new_state = #{newState} - and new_system_number = #{newSystemNumber} - and new_system_primary = #{newSystemPrimary} - and primary_key = #{primaryKey} - and business_date = #{businessDate} - and business_type = #{businessType} + and createdBy = #{createdby} + and lastUpdated = #{lastupdated} + and lastUpdatedBy = #{lastupdatedby} + and discountPrice = #{discountprice} + and mainTableId = #{maintableid} + and newTransmitInfo = #{newtransmitinfo} + and newPushDate = #{newpushdate} + and newState = #{newstate} + and newSystemNumber = #{newsystemnumber} + and newSystemPrimary = #{newsystemprimary} + and newTransmitInfo2 = #{newtransmitinfo2} + and newPushDate2 = #{newpushdate2} + and newState2 = #{newstate2} + and newSystemNumber2 = #{newsystemnumber2} + and newSystemPrimary2 = #{newsystemprimary2} + and newTransmitInfo3 = #{newtransmitinfo3} + and newPushDate3 = #{newpushdate3} + and newState3 = #{newstate3} + and newSystemNumber3 = #{newsystemnumber3} + and newSystemPrimary3 = #{newsystemprimary3} + and newTransmitInfo4 = #{newtransmitinfo4} + and newPushDate4 = #{newpushdate4} + and newState4 = #{newstate4} + and newSystemNumber4 = #{newsystemnumber4} + and newSystemPrimary4 = #{newsystemprimary4} + and businessDate = #{businessdate} + and refundedAt = #{refundedat} + and businessType = #{businesstype} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and def11 = #{def11} + and def12 = #{def12} + and def13 = #{def13} + and def14 = #{def14} + and def15 = #{def15} + and def16 = #{def16} + and def17 = #{def17} + and def18 = #{def18} + and def19 = #{def19} + and def20 = #{def20} + and def21 = #{def21} + and def22 = #{def22} + and def23 = #{def23} + and def24 = #{def24} + and def25 = #{def25} + and def26 = #{def26} + and def27 = #{def27} + and def28 = #{def28} + and def29 = #{def29} + and def30 = #{def30} + and def31 = #{def31} + and def32 = #{def32} + and def33 = #{def33} + and def34 = #{def34} + and def35 = #{def35} + and def36 = #{def36} + and def37 = #{def37} + and def38 = #{def38} + and def39 = #{def39} + and def40 = #{def40} and sts='Y' order by sorts asc @@ -186,42 +416,99 @@ from tocofs_returngoods_detailed and id like concat('%',#{id},'%') - and receipt_id like concat('%',#{receiptId},'%') - and receipt_code like concat('%',#{receiptCode},'%') - and ref_order_id like concat('%',#{refOrderId},'%') - and ref_order_detail_id like concat('%',#{refOrderDetailId},'%') - and source_order_code like concat('%',#{sourceOrderCode},'%') - and client_code like concat('%',#{clientCode},'%') - and company_code like concat('%',#{companyCode},'%') - and facility_code like concat('%',#{facilityCode},'%') - and sku_code like concat('%',#{skuCode},'%') - and sku_name like concat('%',#{skuName},'%') - and request_qty like concat('%',#{requestQty},'%') - and received_qty like concat('%',#{receivedQty},'%') - and open_qty like concat('%',#{openQty},'%') - and quantity_u_m like concat('%',#{quantityUM},'%') - and total_weight like concat('%',#{totalWeight},'%') - and total_volume like concat('%',#{totalVolume},'%') - and total_volume_weight like concat('%',#{totalVolumeWeight},'%') - and total_amount like concat('%',#{totalAmount},'%') - and weight_u_m like concat('%',#{weightUM},'%') - and volume_u_m like concat('%',#{volumeUM},'%') - and inventory_sts like concat('%',#{inventorySts},'%') - and in_trans_inv_id like concat('%',#{inTransInvId},'%') + and receiptId like concat('%',#{receiptid},'%') + and receiptCode like concat('%',#{receiptcode},'%') + and refOrderId like concat('%',#{reforderid},'%') + and refOrderDetailId like concat('%',#{reforderdetailid},'%') + and sourceOrderCode like concat('%',#{sourceordercode},'%') + and sourceLineNum like concat('%',#{sourcelinenum},'%') + and clientCode like concat('%',#{clientcode},'%') + and companyCode like concat('%',#{companycode},'%') + and facilityCode like concat('%',#{facilitycode},'%') + and skuCode like concat('%',#{skucode},'%') + and skuName like concat('%',#{skuname},'%') + and requestQty like concat('%',#{requestqty},'%') + and receivedQty like concat('%',#{receivedqty},'%') + and openQty like concat('%',#{openqty},'%') + and quantityUM like concat('%',#{quantityum},'%') + and totalWeight like concat('%',#{totalweight},'%') + and totalVolume like concat('%',#{totalvolume},'%') + and totalVolumeWeight like concat('%',#{totalvolumeweight},'%') + and totalAmount like concat('%',#{totalamount},'%') + and weightUM like concat('%',#{weightum},'%') + and volumeUM like concat('%',#{volumeum},'%') + and inventorySts like concat('%',#{inventorysts},'%') + and inTransInvId like concat('%',#{intransinvid},'%') and closed like concat('%',#{closed},'%') and created like concat('%',#{created},'%') - and created_by like concat('%',#{createdBy},'%') - and last_updated like concat('%',#{lastUpdated},'%') - and last_updated_by like concat('%',#{lastUpdatedBy},'%') - and discount_price like concat('%',#{discountPrice},'%') - and new_transmitInfo like concat('%',#{newTransmitinfo},'%') - and new_pushDate like concat('%',#{newPushdate},'%') - and new_state like concat('%',#{newState},'%') - and new_system_number like concat('%',#{newSystemNumber},'%') - and new_system_primary like concat('%',#{newSystemPrimary},'%') - and primary_key like concat('%',#{primaryKey},'%') - and business_date like concat('%',#{businessDate},'%') - and business_type like concat('%',#{businessType},'%') + and createdBy like concat('%',#{createdby},'%') + and lastUpdated like concat('%',#{lastupdated},'%') + and lastUpdatedBy like concat('%',#{lastupdatedby},'%') + and discountPrice like concat('%',#{discountprice},'%') + and mainTableId like concat('%',#{maintableid},'%') + and newTransmitInfo like concat('%',#{newtransmitinfo},'%') + and newPushDate like concat('%',#{newpushdate},'%') + and newState like concat('%',#{newstate},'%') + and newSystemNumber like concat('%',#{newsystemnumber},'%') + and newSystemPrimary like concat('%',#{newsystemprimary},'%') + and newTransmitInfo2 like concat('%',#{newtransmitinfo2},'%') + and newPushDate2 like concat('%',#{newpushdate2},'%') + and newState2 like concat('%',#{newstate2},'%') + and newSystemNumber2 like concat('%',#{newsystemnumber2},'%') + and newSystemPrimary2 like concat('%',#{newsystemprimary2},'%') + and newTransmitInfo3 like concat('%',#{newtransmitinfo3},'%') + and newPushDate3 like concat('%',#{newpushdate3},'%') + and newState3 like concat('%',#{newstate3},'%') + and newSystemNumber3 like concat('%',#{newsystemnumber3},'%') + and newSystemPrimary3 like concat('%',#{newsystemprimary3},'%') + and newTransmitInfo4 like concat('%',#{newtransmitinfo4},'%') + and newPushDate4 like concat('%',#{newpushdate4},'%') + and newState4 like concat('%',#{newstate4},'%') + and newSystemNumber4 like concat('%',#{newsystemnumber4},'%') + and newSystemPrimary4 like concat('%',#{newsystemprimary4},'%') + and businessDate like concat('%',#{businessdate},'%') + and refundedAt like concat('%',#{refundedat},'%') + and businessType like concat('%',#{businesstype},'%') + and def1 like concat('%',#{def1},'%') + and def2 like concat('%',#{def2},'%') + and def3 like concat('%',#{def3},'%') + and def4 like concat('%',#{def4},'%') + and def5 like concat('%',#{def5},'%') + and def6 like concat('%',#{def6},'%') + and def7 like concat('%',#{def7},'%') + and def8 like concat('%',#{def8},'%') + and def9 like concat('%',#{def9},'%') + and def10 like concat('%',#{def10},'%') + and def11 like concat('%',#{def11},'%') + and def12 like concat('%',#{def12},'%') + and def13 like concat('%',#{def13},'%') + and def14 like concat('%',#{def14},'%') + and def15 like concat('%',#{def15},'%') + and def16 like concat('%',#{def16},'%') + and def17 like concat('%',#{def17},'%') + and def18 like concat('%',#{def18},'%') + and def19 like concat('%',#{def19},'%') + and def20 like concat('%',#{def20},'%') + and def21 like concat('%',#{def21},'%') + and def22 like concat('%',#{def22},'%') + and def23 like concat('%',#{def23},'%') + and def24 like concat('%',#{def24},'%') + and def25 like concat('%',#{def25},'%') + and def26 like concat('%',#{def26},'%') + and def27 like concat('%',#{def27},'%') + and def28 like concat('%',#{def28},'%') + and def29 like concat('%',#{def29},'%') + and def30 like concat('%',#{def30},'%') + and def31 like concat('%',#{def31},'%') + and def32 like concat('%',#{def32},'%') + and def33 like concat('%',#{def33},'%') + and def34 like concat('%',#{def34},'%') + and def35 like concat('%',#{def35},'%') + and def36 like concat('%',#{def36},'%') + and def37 like concat('%',#{def37},'%') + and def38 like concat('%',#{def38},'%') + and def39 like concat('%',#{def39},'%') + and def40 like concat('%',#{def40},'%') and sts='Y' order by sorts asc @@ -235,42 +522,99 @@ from tocofs_returngoods_detailed or id = #{id} - or receipt_id = #{receiptId} - or receipt_code = #{receiptCode} - or ref_order_id = #{refOrderId} - or ref_order_detail_id = #{refOrderDetailId} - or source_order_code = #{sourceOrderCode} - or client_code = #{clientCode} - or company_code = #{companyCode} - or facility_code = #{facilityCode} - or sku_code = #{skuCode} - or sku_name = #{skuName} - or request_qty = #{requestQty} - or received_qty = #{receivedQty} - or open_qty = #{openQty} - or quantity_u_m = #{quantityUM} - or total_weight = #{totalWeight} - or total_volume = #{totalVolume} - or total_volume_weight = #{totalVolumeWeight} - or total_amount = #{totalAmount} - or weight_u_m = #{weightUM} - or volume_u_m = #{volumeUM} - or inventory_sts = #{inventorySts} - or in_trans_inv_id = #{inTransInvId} + or receiptId = #{receiptid} + or receiptCode = #{receiptcode} + or refOrderId = #{reforderid} + or refOrderDetailId = #{reforderdetailid} + or sourceOrderCode = #{sourceordercode} + or sourceLineNum = #{sourcelinenum} + or clientCode = #{clientcode} + or companyCode = #{companycode} + or facilityCode = #{facilitycode} + or skuCode = #{skucode} + or skuName = #{skuname} + or requestQty = #{requestqty} + or receivedQty = #{receivedqty} + or openQty = #{openqty} + or quantityUM = #{quantityum} + or totalWeight = #{totalweight} + or totalVolume = #{totalvolume} + or totalVolumeWeight = #{totalvolumeweight} + or totalAmount = #{totalamount} + or weightUM = #{weightum} + or volumeUM = #{volumeum} + or inventorySts = #{inventorysts} + or inTransInvId = #{intransinvid} or closed = #{closed} or created = #{created} - or created_by = #{createdBy} - or last_updated = #{lastUpdated} - or last_updated_by = #{lastUpdatedBy} - or discount_price = #{discountPrice} - or new_transmitInfo = #{newTransmitinfo} - or new_pushDate = #{newPushdate} - or new_state = #{newState} - or new_system_number = #{newSystemNumber} - or new_system_primary = #{newSystemPrimary} - or primary_key = #{primaryKey} - or business_date = #{businessDate} - or business_type = #{businessType} + or createdBy = #{createdby} + or lastUpdated = #{lastupdated} + or lastUpdatedBy = #{lastupdatedby} + or discountPrice = #{discountprice} + or mainTableId = #{maintableid} + or newTransmitInfo = #{newtransmitinfo} + or newPushDate = #{newpushdate} + or newState = #{newstate} + or newSystemNumber = #{newsystemnumber} + or newSystemPrimary = #{newsystemprimary} + or newTransmitInfo2 = #{newtransmitinfo2} + or newPushDate2 = #{newpushdate2} + or newState2 = #{newstate2} + or newSystemNumber2 = #{newsystemnumber2} + or newSystemPrimary2 = #{newsystemprimary2} + or newTransmitInfo3 = #{newtransmitinfo3} + or newPushDate3 = #{newpushdate3} + or newState3 = #{newstate3} + or newSystemNumber3 = #{newsystemnumber3} + or newSystemPrimary3 = #{newsystemprimary3} + or newTransmitInfo4 = #{newtransmitinfo4} + or newPushDate4 = #{newpushdate4} + or newState4 = #{newstate4} + or newSystemNumber4 = #{newsystemnumber4} + or newSystemPrimary4 = #{newsystemprimary4} + or businessDate = #{businessdate} + or refundedAt = #{refundedat} + or businessType = #{businesstype} + or def1 = #{def1} + or def2 = #{def2} + or def3 = #{def3} + or def4 = #{def4} + or def5 = #{def5} + or def6 = #{def6} + or def7 = #{def7} + or def8 = #{def8} + or def9 = #{def9} + or def10 = #{def10} + or def11 = #{def11} + or def12 = #{def12} + or def13 = #{def13} + or def14 = #{def14} + or def15 = #{def15} + or def16 = #{def16} + or def17 = #{def17} + or def18 = #{def18} + or def19 = #{def19} + or def20 = #{def20} + or def21 = #{def21} + or def22 = #{def22} + or def23 = #{def23} + or def24 = #{def24} + or def25 = #{def25} + or def26 = #{def26} + or def27 = #{def27} + or def28 = #{def28} + or def29 = #{def29} + or def30 = #{def30} + or def31 = #{def31} + or def32 = #{def32} + or def33 = #{def33} + or def34 = #{def34} + or def35 = #{def35} + or def36 = #{def36} + or def37 = #{def37} + or def38 = #{def38} + or def39 = #{def39} + or def40 = #{def40} and sts='Y' order by sorts asc @@ -282,248 +626,529 @@ insert into tocofs_returngoods_detailed( id , - receipt_id , - receipt_code , - ref_order_id , - ref_order_detail_id , - source_order_code , - client_code , - company_code , - facility_code , - sku_code , - sku_name , - request_qty , - received_qty , - open_qty , - quantity_u_m , - total_weight , - total_volume , - total_volume_weight , - total_amount , - weight_u_m , - volume_u_m , - inventory_sts , - in_trans_inv_id , + receiptId , + receiptCode , + refOrderId , + refOrderDetailId , + sourceOrderCode , + sourceLineNum , + clientCode , + companyCode , + facilityCode , + skuCode , + skuName , + requestQty , + receivedQty , + openQty , + quantityUM , + totalWeight , + totalVolume , + totalVolumeWeight , + totalAmount , + weightUM , + volumeUM , + inventorySts , + inTransInvId , closed , created , - created_by , - last_updated , - last_updated_by , - discount_price , - new_transmitInfo , - new_pushDate , - new_state , - new_system_number , - new_system_primary , - primary_key , - business_date , - business_type , + createdBy , + lastUpdated , + lastUpdatedBy , + discountPrice , + mainTableId , + newTransmitInfo , + newPushDate , + newState , + newSystemNumber , + newSystemPrimary , + newTransmitInfo2 , + newPushDate2 , + newState2 , + newSystemNumber2 , + newSystemPrimary2 , + newTransmitInfo3 , + newPushDate3 , + newState3 , + newSystemNumber3 , + newSystemPrimary3 , + newTransmitInfo4 , + newPushDate4 , + newState4 , + newSystemNumber4 , + newSystemPrimary4 , + businessDate , + refundedAt , + businessType , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + def11 , + def12 , + def13 , + def14 , + def15 , + def16 , + def17 , + def18 , + def19 , + def20 , + def21 , + def22 , + def23 , + def24 , + def25 , + def26 , + def27 , + def28 , + def29 , + def30 , + def31 , + def32 , + def33 , + def34 , + def35 , + def36 , + def37 , + def38 , + def39 , + def40 , sorts, sts, )values( #{id} , - #{receiptId} , - #{receiptCode} , - #{refOrderId} , - #{refOrderDetailId} , - #{sourceOrderCode} , - #{clientCode} , - #{companyCode} , - #{facilityCode} , - #{skuCode} , - #{skuName} , - #{requestQty} , - #{receivedQty} , - #{openQty} , - #{quantityUM} , - #{totalWeight} , - #{totalVolume} , - #{totalVolumeWeight} , - #{totalAmount} , - #{weightUM} , - #{volumeUM} , - #{inventorySts} , - #{inTransInvId} , + #{receiptid} , + #{receiptcode} , + #{reforderid} , + #{reforderdetailid} , + #{sourceordercode} , + #{sourcelinenum} , + #{clientcode} , + #{companycode} , + #{facilitycode} , + #{skucode} , + #{skuname} , + #{requestqty} , + #{receivedqty} , + #{openqty} , + #{quantityum} , + #{totalweight} , + #{totalvolume} , + #{totalvolumeweight} , + #{totalamount} , + #{weightum} , + #{volumeum} , + #{inventorysts} , + #{intransinvid} , #{closed} , #{created} , - #{createdBy} , - #{lastUpdated} , - #{lastUpdatedBy} , - #{discountPrice} , - #{newTransmitinfo} , - #{newPushdate} , - #{newState} , - #{newSystemNumber} , - #{newSystemPrimary} , - #{primaryKey} , - #{businessDate} , - #{businessType} , + #{createdby} , + #{lastupdated} , + #{lastupdatedby} , + #{discountprice} , + #{maintableid} , + #{newtransmitinfo} , + #{newpushdate} , + #{newstate} , + #{newsystemnumber} , + #{newsystemprimary} , + #{newtransmitinfo2} , + #{newpushdate2} , + #{newstate2} , + #{newsystemnumber2} , + #{newsystemprimary2} , + #{newtransmitinfo3} , + #{newpushdate3} , + #{newstate3} , + #{newsystemnumber3} , + #{newsystemprimary3} , + #{newtransmitinfo4} , + #{newpushdate4} , + #{newstate4} , + #{newsystemnumber4} , + #{newsystemprimary4} , + #{businessdate} , + #{refundedat} , + #{businesstype} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{def11} , + #{def12} , + #{def13} , + #{def14} , + #{def15} , + #{def16} , + #{def17} , + #{def18} , + #{def19} , + #{def20} , + #{def21} , + #{def22} , + #{def23} , + #{def24} , + #{def25} , + #{def26} , + #{def27} , + #{def28} , + #{def29} , + #{def30} , + #{def31} , + #{def32} , + #{def33} , + #{def34} , + #{def35} , + #{def36} , + #{def37} , + #{def38} , + #{def39} , + #{def40} , (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from tocofs_returngoods_detailed a WHERE a.sts = 'Y' ), 'Y', ) - - - insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type) - values - - (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType}) - - - - - insert IGNORE into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type) - values - - (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType}) - - - - - - insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type) + + + insert into tocofs_returngoods_detailed(receiptId, receiptCode, refOrderId, refOrderDetailId, sourceOrderCode, sourceLineNum, clientCode, companyCode, facilityCode, skuCode, skuName, requestQty, receivedQty, openQty, quantityUM, totalWeight, totalVolume, totalVolumeWeight, totalAmount, weightUM, volumeUM, inventorySts, inTransInvId, closed, created, createdBy, lastUpdated, lastUpdatedBy, discountPrice, mainTableId, newTransmitInfo, newPushDate, newState, newSystemNumber, newSystemPrimary, newTransmitInfo2, newPushDate2, newState2, newSystemNumber2, newSystemPrimary2, newTransmitInfo3, newPushDate3, newState3, newSystemNumber3, newSystemPrimary3, newTransmitInfo4, newPushDate4, newState4, newSystemNumber4, newSystemPrimary4, businessDate, refundedAt, businessType, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, def11, def12, def13, def14, def15, def16, def17, def18, def19, def20, def21, def22, def23, def24, def25, def26, def27, def28, def29, def30, def31, def32, def33, def34, def35, def36, def37, def38, def39, def40) values - (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType}) + (#{entity.receiptid},#{entity.receiptcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.skucode},#{entity.skuname},#{entity.requestqty},#{entity.receivedqty},#{entity.openqty},#{entity.quantityum},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.totalamount},#{entity.weightum},#{entity.volumeum},#{entity.inventorysts},#{entity.intransinvid},#{entity.closed},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.discountprice},#{entity.maintableid},#{entity.newtransmitinfo},#{entity.newpushdate},#{entity.newstate},#{entity.newsystemnumber},#{entity.newsystemprimary},#{entity.newtransmitinfo2},#{entity.newpushdate2},#{entity.newstate2},#{entity.newsystemnumber2},#{entity.newsystemprimary2},#{entity.newtransmitinfo3},#{entity.newpushdate3},#{entity.newstate3},#{entity.newsystemnumber3},#{entity.newsystemprimary3},#{entity.newtransmitinfo4},#{entity.newpushdate4},#{entity.newstate4},#{entity.newsystemnumber4},#{entity.newsystemprimary4},#{entity.businessdate},#{entity.refundedat},#{entity.businesstype},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.def11},#{entity.def12},#{entity.def13},#{entity.def14},#{entity.def15},#{entity.def16},#{entity.def17},#{entity.def18},#{entity.def19},#{entity.def20},#{entity.def21},#{entity.def22},#{entity.def23},#{entity.def24},#{entity.def25},#{entity.def26},#{entity.def27},#{entity.def28},#{entity.def29},#{entity.def30},#{entity.def31},#{entity.def32},#{entity.def33},#{entity.def34},#{entity.def35},#{entity.def36},#{entity.def37},#{entity.def38},#{entity.def39},#{entity.def40}) - on duplicate key update - receipt_id = values(receipt_id), - receipt_code = values(receipt_code), - ref_order_id = values(ref_order_id), - ref_order_detail_id = values(ref_order_detail_id), - source_order_code = values(source_order_code), - client_code = values(client_code), - company_code = values(company_code), - facility_code = values(facility_code), - sku_code = values(sku_code), - sku_name = values(sku_name), - request_qty = values(request_qty), - received_qty = values(received_qty), - open_qty = values(open_qty), - quantity_u_m = values(quantity_u_m), - total_weight = values(total_weight), - total_volume = values(total_volume), - total_volume_weight = values(total_volume_weight), - total_amount = values(total_amount), - weight_u_m = values(weight_u_m), - volume_u_m = values(volume_u_m), - inventory_sts = values(inventory_sts), - in_trans_inv_id = values(in_trans_inv_id), - closed = values(closed), - created = values(created), - created_by = values(created_by), - last_updated = values(last_updated), - last_updated_by = values(last_updated_by), - discount_price = values(discount_price), - new_transmitInfo = values(new_transmitInfo), - new_pushDate = values(new_pushDate), - new_state = values(new_state), - new_system_number = values(new_system_number), - new_system_primary = values(new_system_primary), - primary_key = values(primary_key), - business_date = values(business_date), - business_type = values(business_type) - + + + insert into tocofs_returngoods_detailed(id,receiptId, receiptCode, refOrderId, refOrderDetailId, sourceOrderCode, sourceLineNum, clientCode, companyCode, facilityCode, skuCode, skuName, requestQty, receivedQty, openQty, quantityUM, totalWeight, totalVolume, totalVolumeWeight, totalAmount, weightUM, volumeUM, inventorySts, inTransInvId, closed, created, createdBy, lastUpdated, lastUpdatedBy, discountPrice, mainTableId, businessDate, refundedAt, businessType) + values + + (#{entity.id},#{entity.receiptid},#{entity.receiptcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.skucode},#{entity.skuname},#{entity.requestqty},#{entity.receivedqty},#{entity.openqty},#{entity.quantityum},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.totalamount},#{entity.weightum},#{entity.volumeum},#{entity.inventorysts},#{entity.intransinvid},#{entity.closed},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.discountprice},#{entity.maintableid},#{entity.businessdate},#{entity.refundedat},#{entity.businesstype}) + + on duplicate key update + id = values(id), + receiptId = values(receiptId), + receiptCode = values(receiptCode), + refOrderId = values(refOrderId), + refOrderDetailId = values(refOrderDetailId), + sourceOrderCode = values(sourceOrderCode), + sourceLineNum = values(sourceLineNum), + clientCode = values(clientCode), + companyCode = values(companyCode), + facilityCode = values(facilityCode), + skuCode = values(skuCode), + skuName = values(skuName), + requestQty = values(requestQty), + receivedQty = values(receivedQty), + openQty = values(openQty), + quantityUM = values(quantityUM), + totalWeight = values(totalWeight), + totalVolume = values(totalVolume), + totalVolumeWeight = values(totalVolumeWeight), + totalAmount = values(totalAmount), + weightUM = values(weightUM), + volumeUM = values(volumeUM), + inventorySts = values(inventorySts), + inTransInvId = values(inTransInvId), + closed = values(closed), + created = values(created), + createdBy = values(createdBy), + lastUpdated = values(lastUpdated), + lastUpdatedBy = values(lastUpdatedBy), + discountPrice = values(discountPrice), + mainTableId = values(mainTableId), + businessDate = values(businessDate), + refundedAt = values(refundedAt), + businessType = values(businessType) + + + + + insert into tocofs_returngoods_detailed(id,newPushDate3,newTransmitInfo3,newState3,newSystemNumber3,newSystemPrimary3) + values + + (#{entity.id},#{entity.newpushdate3},#{entity.newtransmitinfo3},#{newstate3},#{newsystemnumber3},#{newSystemPrimary3}) + + on duplicate key update + id = values(id), + newPushDate3 = values(newPushDate3), + newTransmitInfo3 = values(newTransmitInfo3), + newState3 = values(newState3), + newSystemNumber3 = values(newSystemNumber3), + newSystemPrimary3 = values(newSystemPrimary3) + + + + + insert into tocofs_returngoods_detailed(id,newPushDate4,newTransmitInfo4,newState4,newSystemNumber4,newSystemPrimary4) + values + + (#{entity.id},#{entity.newpushdate4},#{entity.newtransmitinfo4},#{newstate4},#{newsystemnumber4},#{newsystemprimary4}) + + on duplicate key update + id = values(id), + newPushDate4 = values(newPushDate4), + newTransmitInfo4 = values(newTransmitInfo4), + newState4 = values(newState4), + newSystemNumber4 = values(newSystemNumber4), + newSystemPrimary4 = values(newSystemPrimary4) + + + + + insert into tocofs_returngoods_detailed(id,newPushDate,newTransmitInfo,newState,newSystemNumber,newSystemPrimary) + values + + (#{entity.id},#{entity.newpushdate},#{entity.newtransmitinfo},#{newstate},#{newsystemnumber},#{newSystemPrimary}) + + on duplicate key update + id = values(id), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newSystemNumber = values(newSystemNumber), + newSystemPrimary = values(newSystemPrimary) + + + + + insert into tocofs_returngoods_detailed(id,newPushDate2,newTransmitInfo2,newState2,newSystemNumber2,newSystemPrimary2) + values + + (#{entity.id},#{entity.newpushdate2},#{entity.newtransmitinfo2},#{newstate2},#{newsystemnumber2},#{newsystemprimary2}) + + on duplicate key update + id = values(id), + newPushDate2 = values(newPushDate2), + newTransmitInfo2 = values(newTransmitInfo2), + newState2 = values(newState2), + newSystemNumber2 = values(newSystemNumber2), + newSystemPrimary2 = values(newSystemPrimary2) + + + + + update tocofs_returngoods_detailed set - receipt_id = #{receiptId}, - receipt_code = #{receiptCode}, - ref_order_id = #{refOrderId}, - ref_order_detail_id = #{refOrderDetailId}, - source_order_code = #{sourceOrderCode}, - client_code = #{clientCode}, - company_code = #{companyCode}, - facility_code = #{facilityCode}, - sku_code = #{skuCode}, - sku_name = #{skuName}, - request_qty = #{requestQty}, - received_qty = #{receivedQty}, - open_qty = #{openQty}, - quantity_u_m = #{quantityUM}, - total_weight = #{totalWeight}, - total_volume = #{totalVolume}, - total_volume_weight = #{totalVolumeWeight}, - total_amount = #{totalAmount}, - weight_u_m = #{weightUM}, - volume_u_m = #{volumeUM}, - inventory_sts = #{inventorySts}, - in_trans_inv_id = #{inTransInvId}, + receiptId = #{receiptid}, + receiptCode = #{receiptcode}, + refOrderId = #{reforderid}, + refOrderDetailId = #{reforderdetailid}, + sourceOrderCode = #{sourceordercode}, + sourceLineNum = #{sourcelinenum}, + clientCode = #{clientcode}, + companyCode = #{companycode}, + facilityCode = #{facilitycode}, + skuCode = #{skucode}, + skuName = #{skuname}, + requestQty = #{requestqty}, + receivedQty = #{receivedqty}, + openQty = #{openqty}, + quantityUM = #{quantityum}, + totalWeight = #{totalweight}, + totalVolume = #{totalvolume}, + totalVolumeWeight = #{totalvolumeweight}, + totalAmount = #{totalamount}, + weightUM = #{weightum}, + volumeUM = #{volumeum}, + inventorySts = #{inventorysts}, + inTransInvId = #{intransinvid}, closed = #{closed}, created = #{created}, - created_by = #{createdBy}, - last_updated = #{lastUpdated}, - last_updated_by = #{lastUpdatedBy}, - discount_price = #{discountPrice}, - new_transmitInfo = #{newTransmitinfo}, - new_pushDate = #{newPushdate}, - new_state = #{newState}, - new_system_number = #{newSystemNumber}, - new_system_primary = #{newSystemPrimary}, - primary_key = #{primaryKey}, - business_date = #{businessDate}, - business_type = #{businessType} + createdBy = #{createdby}, + lastUpdated = #{lastupdated}, + lastUpdatedBy = #{lastupdatedby}, + discountPrice = #{discountprice}, + mainTableId = #{maintableid}, + newTransmitInfo = #{newtransmitinfo}, + newPushDate = #{newpushdate}, + newState = #{newstate}, + newSystemNumber = #{newsystemnumber}, + newSystemPrimary = #{newsystemprimary}, + newTransmitInfo2 = #{newtransmitinfo2}, + newPushDate2 = #{newpushdate2}, + newState2 = #{newstate2}, + newSystemNumber2 = #{newsystemnumber2}, + newSystemPrimary2 = #{newsystemprimary2}, + newTransmitInfo3 = #{newtransmitinfo3}, + newPushDate3 = #{newpushdate3}, + newState3 = #{newstate3}, + newSystemNumber3 = #{newsystemnumber3}, + newSystemPrimary3 = #{newsystemprimary3}, + newTransmitInfo4 = #{newtransmitinfo4}, + newPushDate4 = #{newpushdate4}, + newState4 = #{newstate4}, + newSystemNumber4 = #{newsystemnumber4}, + newSystemPrimary4 = #{newsystemprimary4}, + businessDate = #{businessdate}, + refundedAt = #{refundedat}, + businessType = #{businesstype}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + def11 = #{def11}, + def12 = #{def12}, + def13 = #{def13}, + def14 = #{def14}, + def15 = #{def15}, + def16 = #{def16}, + def17 = #{def17}, + def18 = #{def18}, + def19 = #{def19}, + def20 = #{def20}, + def21 = #{def21}, + def22 = #{def22}, + def23 = #{def23}, + def24 = #{def24}, + def25 = #{def25}, + def26 = #{def26}, + def27 = #{def27}, + def28 = #{def28}, + def29 = #{def29}, + def30 = #{def30}, + def31 = #{def31}, + def32 = #{def32}, + def33 = #{def33}, + def34 = #{def34}, + def35 = #{def35}, + def36 = #{def36}, + def37 = #{def37}, + def38 = #{def38}, + def39 = #{def39}, + def40 = #{def40}, where id = #{id} - update tocofs_returngoods_detailed set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - update tocofs_returngoods_detailed set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} - and receipt_id = #{receiptId} - and receipt_code = #{receiptCode} - and ref_order_id = #{refOrderId} - and ref_order_detail_id = #{refOrderDetailId} - and source_order_code = #{sourceOrderCode} - and client_code = #{clientCode} - and company_code = #{companyCode} - and facility_code = #{facilityCode} - and sku_code = #{skuCode} - and sku_name = #{skuName} - and request_qty = #{requestQty} - and received_qty = #{receivedQty} - and open_qty = #{openQty} - and quantity_u_m = #{quantityUM} - and total_weight = #{totalWeight} - and total_volume = #{totalVolume} - and total_volume_weight = #{totalVolumeWeight} - and total_amount = #{totalAmount} - and weight_u_m = #{weightUM} - and volume_u_m = #{volumeUM} - and inventory_sts = #{inventorySts} - and in_trans_inv_id = #{inTransInvId} + and receiptId = #{receiptid} + and receiptCode = #{receiptcode} + and refOrderId = #{reforderid} + and refOrderDetailId = #{reforderdetailid} + and sourceOrderCode = #{sourceordercode} + and sourceLineNum = #{sourcelinenum} + and clientCode = #{clientcode} + and companyCode = #{companycode} + and facilityCode = #{facilitycode} + and skuCode = #{skucode} + and skuName = #{skuname} + and requestQty = #{requestqty} + and receivedQty = #{receivedqty} + and openQty = #{openqty} + and quantityUM = #{quantityum} + and totalWeight = #{totalweight} + and totalVolume = #{totalvolume} + and totalVolumeWeight = #{totalvolumeweight} + and totalAmount = #{totalamount} + and weightUM = #{weightum} + and volumeUM = #{volumeum} + and inventorySts = #{inventorysts} + and inTransInvId = #{intransinvid} and closed = #{closed} and created = #{created} - and created_by = #{createdBy} - and last_updated = #{lastUpdated} - and last_updated_by = #{lastUpdatedBy} - and discount_price = #{discountPrice} - and new_transmitInfo = #{newTransmitinfo} - and new_pushDate = #{newPushdate} - and new_state = #{newState} - and new_system_number = #{newSystemNumber} - and new_system_primary = #{newSystemPrimary} - and primary_key = #{primaryKey} - and business_date = #{businessDate} - and business_type = #{businessType} + and createdBy = #{createdby} + and lastUpdated = #{lastupdated} + and lastUpdatedBy = #{lastupdatedby} + and discountPrice = #{discountprice} + and mainTableId = #{maintableid} + and newTransmitInfo = #{newtransmitinfo} + and newPushDate = #{newpushdate} + and newState = #{newstate} + and newSystemNumber = #{newsystemnumber} + and newSystemPrimary = #{newsystemprimary} + and newTransmitInfo2 = #{newtransmitinfo2} + and newPushDate2 = #{newpushdate2} + and newState2 = #{newstate2} + and newSystemNumber2 = #{newsystemnumber2} + and newSystemPrimary2 = #{newsystemprimary2} + and newTransmitInfo3 = #{newtransmitinfo3} + and newPushDate3 = #{newpushdate3} + and newState3 = #{newstate3} + and newSystemNumber3 = #{newsystemnumber3} + and newSystemPrimary3 = #{newsystemprimary3} + and newTransmitInfo4 = #{newtransmitinfo4} + and newPushDate4 = #{newpushdate4} + and newState4 = #{newstate4} + and newSystemNumber4 = #{newsystemnumber4} + and newSystemPrimary4 = #{newsystemprimary4} + and businessDate = #{businessdate} + and refundedAt = #{refundedat} + and businessType = #{businesstype} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and def11 = #{def11} + and def12 = #{def12} + and def13 = #{def13} + and def14 = #{def14} + and def15 = #{def15} + and def16 = #{def16} + and def17 = #{def17} + and def18 = #{def18} + and def19 = #{def19} + and def20 = #{def20} + and def21 = #{def21} + and def22 = #{def22} + and def23 = #{def23} + and def24 = #{def24} + and def25 = #{def25} + and def26 = #{def26} + and def27 = #{def27} + and def28 = #{def28} + and def29 = #{def29} + and def30 = #{def30} + and def31 = #{def31} + and def32 = #{def32} + and def33 = #{def33} + and def34 = #{def34} + and def35 = #{def35} + and def36 = #{def36} + and def37 = #{def37} + and def38 = #{def38} + and def39 = #{def39} + and def40 = #{def40} and sts='Y' - delete from tocofs_returngoods_detailed where id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.java index 3931856f..5cbf5d1a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.java @@ -1,30 +1,32 @@ package com.hzya.frame.plugin.lets.ofs.entity; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * OFS售后入库单(TocofsReturngoods)实体类 * * @author makejava - * @since 2024-08-09 11:08:40 + * @since 2024-09-13 11:58:10 */ +@Data public class TocofsReturngoodsEntity extends BaseEntity { /** * LETS */ - private String clientCode; + private String clientcode; /** * SHLZ */ - private String companyCode; + private String companycode; /** * tm-intoyou */ - private String storeCode; + private String storecode; /** * intoyou-tmxs */ - private String facilityCode; + private String facilitycode; /** * LETS-RE2024071600000001 */ @@ -32,23 +34,23 @@ public class TocofsReturngoodsEntity extends BaseEntity { /** * RETURN */ - private String internalInstructionType; + private String internalinstructiontype; /** * B2C */ - private String bizChannel; + private String bizchannel; /** * 128 */ - private String refOrderId; + private String reforderid; /** * LETS-RO2024071600000001 */ - private String refOrderCode; + private String refordercode; /** * RETURN */ - private String refOrderType; + private String refordertype; /** * 1 */ @@ -56,7 +58,7 @@ public class TocofsReturngoodsEntity extends BaseEntity { /** * api */ - private String closedBy; + private String closedby; /** * 900 */ @@ -64,540 +66,69 @@ public class TocofsReturngoodsEntity extends BaseEntity { /** * 0 */ - private String allowOverReceive; + private String allowoverreceive; /** * 张三 */ - private String shipFromAttentionTo; + private String shipfromattentionto; /** * 测试售后流程 */ - private String shipFromAddress; + private String shipfromaddress; /** * 中国 */ - private String shipFromCountry; + private String shipfromcountry; /** * 上海市 */ - private String shipFromState; + private String shipfromstate; /** * 上海市 */ - private String shipFromCity; + private String shipfromcity; /** * 金山区 */ - private String shipFromDistrict; + private String shipfromdistrict; /** * 17878787878 */ - private String shipFromMobile; - /** - * 2 - */ - private String totalLines; - /** - * 4 - */ - private String totalQty; - /** - * 236 - */ - private String totalAmount; - /** - * 0 - */ - private String totalWeight; - /** - * 0 - */ - private String totalVolume; - /** - * 0 - */ - private String totalVolumeWeight; - /** - * 236 - */ - private String totalFulfillAmount; - /** - * 0 - */ - private String totalFulfillWeight; - /** - * 0 - */ - private String totalFulfillVolume; - /** - * 0 - */ - private String totalFulfillVolumeWeight; - /** - * 4 - */ - private String totalFulfillQty; - /** - * 0 - */ - private String totalCases; - /** - * 0 - */ - private String totalContainers; - /** - * 0 - */ - private String closeAtQty; - /** - * EA - */ - private String quantityUM; - /** - * G - */ - private String weightUM; - /** - * CM3 - */ - private String volumeUM; - /** - * 2024-07-16 16:44:00 - */ - private String checkInFrom; - /** - * 2024-07-16 16:44:01 - */ - private String checkInTo; - /** - * 2024-07-16 16:44:01 - */ - private String closedAt; - /** - * OFS - */ - private String sourcePlatformCode; - /** - * LETS-SO2024070500000001 - */ - private String sourceOrderCode; + private String shipfrompostalcode; + private String shipfrommobile; + private String shipfromemail; + private String totallines; + private String totalqty; + private String totalamount; + private String totalweight; + private String totalvolume; + private String totalvolumeweight; + private String totalfulfillamount; + private String totalfulfillweight; + private String totalfulfillvolume; + private String totalfulfillvolumeweight; + private String totalfulfillqty; + private String totalcases; + private String totalcontainers; + private String closeatqty; + private String quantityum; + private String weightum; + private String volumeum; + private String checkinfrom; + private String checkinto; + private String closedat; + private String sourceplatformcode; + private String sourceordercode; /** * 2024-07-16 15:35:36 */ private String created; - /** - * admin - */ - private String createdBy; - /** - * 2024-07-16 16:44:01 - */ - private String lastUpdated; - /** - * api - */ - private String lastUpdatedBy; - /** - * YT7478903028607 - */ - private String returnWaybillCode; - /** - * YTO - */ - private String returnCarrier; - - - 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 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 getRefOrderId() { - return refOrderId; - } - - public void setRefOrderId(String 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 String getClosed() { - return closed; - } - - public void setClosed(String closed) { - this.closed = closed; - } - - public String getClosedBy() { - return closedBy; - } - - public void setClosedBy(String closedBy) { - this.closedBy = closedBy; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getAllowOverReceive() { - return allowOverReceive; - } - - public void setAllowOverReceive(String allowOverReceive) { - this.allowOverReceive = allowOverReceive; - } - - 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 getShipFromCountry() { - return shipFromCountry; - } - - public void setShipFromCountry(String shipFromCountry) { - this.shipFromCountry = shipFromCountry; - } - - public String getShipFromState() { - return shipFromState; - } - - public void setShipFromState(String shipFromState) { - this.shipFromState = shipFromState; - } - - public String getShipFromCity() { - return shipFromCity; - } - - public void setShipFromCity(String shipFromCity) { - this.shipFromCity = shipFromCity; - } - - public String getShipFromDistrict() { - return shipFromDistrict; - } - - public void setShipFromDistrict(String shipFromDistrict) { - this.shipFromDistrict = shipFromDistrict; - } - - public String getShipFromMobile() { - return shipFromMobile; - } - - public void setShipFromMobile(String shipFromMobile) { - this.shipFromMobile = shipFromMobile; - } - - public String getTotalLines() { - return totalLines; - } - - public void setTotalLines(String totalLines) { - this.totalLines = totalLines; - } - - public String getTotalQty() { - return totalQty; - } - - public void setTotalQty(String totalQty) { - this.totalQty = totalQty; - } - - public String getTotalAmount() { - return totalAmount; - } - - public void setTotalAmount(String totalAmount) { - this.totalAmount = totalAmount; - } - - public String getTotalWeight() { - return totalWeight; - } - - public void setTotalWeight(String totalWeight) { - this.totalWeight = totalWeight; - } - - public String getTotalVolume() { - return totalVolume; - } - - public void setTotalVolume(String totalVolume) { - this.totalVolume = totalVolume; - } - - public String getTotalVolumeWeight() { - return totalVolumeWeight; - } - - public void setTotalVolumeWeight(String totalVolumeWeight) { - this.totalVolumeWeight = totalVolumeWeight; - } - - public String getTotalFulfillAmount() { - return totalFulfillAmount; - } - - public void setTotalFulfillAmount(String totalFulfillAmount) { - this.totalFulfillAmount = totalFulfillAmount; - } - - public String getTotalFulfillWeight() { - return totalFulfillWeight; - } - - public void setTotalFulfillWeight(String totalFulfillWeight) { - this.totalFulfillWeight = totalFulfillWeight; - } - - public String getTotalFulfillVolume() { - return totalFulfillVolume; - } - - public void setTotalFulfillVolume(String totalFulfillVolume) { - this.totalFulfillVolume = totalFulfillVolume; - } - - public String getTotalFulfillVolumeWeight() { - return totalFulfillVolumeWeight; - } - - public void setTotalFulfillVolumeWeight(String totalFulfillVolumeWeight) { - this.totalFulfillVolumeWeight = totalFulfillVolumeWeight; - } - - public String getTotalFulfillQty() { - return totalFulfillQty; - } - - public void setTotalFulfillQty(String totalFulfillQty) { - this.totalFulfillQty = totalFulfillQty; - } - - public String getTotalCases() { - return totalCases; - } - - public void setTotalCases(String totalCases) { - this.totalCases = totalCases; - } - - public String getTotalContainers() { - return totalContainers; - } - - public void setTotalContainers(String totalContainers) { - this.totalContainers = totalContainers; - } - - public String getCloseAtQty() { - return closeAtQty; - } - - public void setCloseAtQty(String closeAtQty) { - this.closeAtQty = closeAtQty; - } - - public String getQuantityUM() { - return quantityUM; - } - - public void setQuantityUM(String quantityUM) { - this.quantityUM = quantityUM; - } - - 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 getCheckInFrom() { - return checkInFrom; - } - - public void setCheckInFrom(String checkInFrom) { - this.checkInFrom = checkInFrom; - } - - public String getCheckInTo() { - return checkInTo; - } - - public void setCheckInTo(String checkInTo) { - this.checkInTo = checkInTo; - } - - public String getClosedAt() { - return closedAt; - } - - public void setClosedAt(String closedAt) { - this.closedAt = closedAt; - } - - public String getSourcePlatformCode() { - return sourcePlatformCode; - } - - public void setSourcePlatformCode(String sourcePlatformCode) { - this.sourcePlatformCode = sourcePlatformCode; - } - - public String getSourceOrderCode() { - return sourceOrderCode; - } - - public void setSourceOrderCode(String sourceOrderCode) { - this.sourceOrderCode = sourceOrderCode; - } - - 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; - } - - public String getReturnWaybillCode() { - return returnWaybillCode; - } - - public void setReturnWaybillCode(String returnWaybillCode) { - this.returnWaybillCode = returnWaybillCode; - } - - public String getReturnCarrier() { - return returnCarrier; - } - - public void setReturnCarrier(String returnCarrier) { - this.returnCarrier = returnCarrier; - } - + private String createdby; + private String lastupdated; + private String lastupdatedby; + private String returnwaybillcode; + private String returncarrier; + private String refundedat; + private String refundstatus; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.xml index fdb6a6af..fa810a5c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsEntity.xml @@ -4,108 +4,117 @@ - - - - + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + id - ,client_code - ,company_code - ,store_code - ,facility_code + ,clientCode + ,companyCode + ,storeCode + ,facilityCode ,code - ,internal_instruction_type - ,biz_channel - ,ref_order_id - ,ref_order_code - ,ref_order_type + ,internalInstructionType + ,bizChannel + ,refOrderId + ,refOrderCode + ,refOrderType ,closed - ,closed_by + ,closedBy ,status - ,allow_over_receive - ,ship_from_attention_to - ,ship_from_address - ,ship_from_country - ,ship_from_state - ,ship_from_city - ,ship_from_district - ,ship_from_mobile - ,total_lines - ,total_qty - ,total_amount - ,total_weight - ,total_volume - ,total_volume_weight - ,total_fulfill_amount - ,total_fulfill_weight - ,total_fulfill_volume - ,total_fulfill_volume_weight - ,total_fulfill_qty - ,total_cases - ,total_containers - ,close_at_qty - ,quantity_u_m - ,weight_u_m - ,volume_u_m - ,check_in_from - ,check_in_to - ,closed_at - ,source_platform_code - ,source_order_code + ,allowOverReceive + ,shipFromAttentionTo + ,shipFromAddress + ,shipFromCountry + ,shipFromState + ,shipFromCity + ,shipFromDistrict + ,shipFromPostalCode + ,shipFromMobile + ,shipFromEmail + ,totalLines + ,totalQty + ,totalAmount + ,totalWeight + ,totalVolume + ,totalVolumeWeight + ,totalFulfillAmount + ,totalFulfillWeight + ,totalFulfillVolume + ,totalFulfillVolumeWeight + ,totalFulfillQty + ,totalCases + ,totalContainers + ,closeAtQty + ,quantityUM + ,weightUM + ,volumeUM + ,checkInFrom + ,checkInTo + ,closedAt + ,sourcePlatformCode + ,sourceOrderCode ,created - ,created_by - ,last_updated - ,last_updated_by - ,return_waybill_code - ,return_carrier + ,createdBy + ,lastUpdated + ,lastUpdatedBy + ,returnWaybillCode + ,returnCarrier + ,refundedAt + ,refundStatus