From 63bc42e051cf0ea654071d75f78cbe9db77b1a26 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 25 Dec 2024 15:23:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(buildpackage):=20=E6=B7=BB=E5=8A=A0=20trad?= =?UTF-8?q?eSuccessAt=20=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=98=A0=E5=B0=84=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TocofsSaleoutDetailedEntity 中添加 tradeSuccessAt 字段 - 更新 TocofsSaleoutDetailedEntity.xml 中的映射关系和查询条件 - 在 DetailsDto 中添加 tradeSuccessAt、sourceLineNum 和 sourceOrderStatus 字段 --- .../entity/TocofsSaleoutDetailedEntity.java | 6 +++++ .../entity/TocofsSaleoutDetailedEntity.xml | 22 ++++++++++--------- .../dto/ofssaleorderoutsearch/DetailsDto.java | 6 +++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java index 10c55a7c..15d58981 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java @@ -386,4 +386,10 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity { * 查询条件：交易成功时间-结束 */ private String successfultradedateEnd; + + /** + * tradeSuccessAt + */ + private String tradesuccessat; + } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml index a3cc9a45..ec13d8ab 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml @@ -52,6 +52,7 @@ + @@ -145,6 +146,7 @@ ,successfulTradeDate ,businessType ,sourceOrderStatus + ,tradeSuccessAt ,def1 ,def2 ,def3 @@ -244,7 +246,7 @@ and businessType = #{businesstype} and sourceOrderStatus = #{sourceorderstatus} - + and tradeSuccessAt = #{tradesuccessat} and def1 = #{def1} and def2 = #{def2} and def3 = #{def3} @@ -351,7 +353,7 @@ and businessType = #{businesstype} and sourceOrderStatus = #{sourceorderstatus} - + and tradeSuccessAt = #{tradesuccessat} and def1 = #{def1} and def2 = #{def2} and def3 = #{def3} @@ -455,7 +457,7 @@ and businessType like concat('%',#{businesstype},'%') and sourceOrderStatus like concat('%',#{sourceorderstatus},'%') - + and tradeSuccessAt like concat('%',#{tradesuccessat},'%') and def1 like concat('%',#{def1},'%') and def2 like concat('%',#{def2},'%') and def3 like concat('%',#{def3},'%') @@ -559,7 +561,7 @@ or businessType = #{businesstype} or sourceOrderStatus = #{sourceorderstatus} - + or tradeSuccessAt = #{tradesuccessat} or def1 = #{def1} or def2 = #{def2} or def3 = #{def3} @@ -661,7 +663,7 @@ businessType , sourceOrderStatus , - + tradeSuccessAt , def1 , def2 , def3 , @@ -758,7 +760,7 @@ #{businesstype} , #{sourceOrderStatus} , - + #{tradeSuccessAt} , #{def1} , #{def2} , #{def3} , @@ -807,19 +809,19 @@ - insert IGNORE into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, newPushDate, newTransmitInfo, newState, newState2, newState3, newState4, newSystemNumber, newSystemPrimary, newSystemNumber2, newSystemPrimary2, newSystemNumber3, newSystemPrimary3, newSystemNumber4, newSystemPrimary4, businessDate, successfulTradeDate, businessType,sourceOrderStatus) + insert IGNORE into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, businessDate, successfulTradeDate, businessType,sourceOrderStatus,tradeSuccessAt) values - (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.newpushdate},#{entity.newtransmitinfo},#{entity.newstate},#{entity.newstate2},#{entity.newstate3},#{entity.newstate4},#{entity.newsystemnumber},#{entity.newsystemprimary},#{entity.newsystemnumber2},#{entity.newsystemprimary2},#{entity.newsystemnumber3},#{entity.newsystemprimary3},#{entity.newsystemnumber4},#{entity.newsystemprimary4},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype},#{entity.sourceorderstatus}) + (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype},#{entity.sourceorderstatus},#{entity.tradesuccessat}) - insert into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, businessDate, successfulTradeDate, businessType,sourceOrderStatus) + insert into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, businessDate, successfulTradeDate, businessType,sourceOrderStatus,tradeSuccessAt) values - (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype},#{entity.sourceorderstatus}) + (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype},#{entity.sourceorderstatus},#{entity.tradeSuccessAt}) on duplicate key update id = values(id), diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/DetailsDto.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/DetailsDto.java index ba9c48b4..aaff29a3 100755 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/DetailsDto.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/DetailsDto.java @@ -68,4 +68,10 @@ public class DetailsDto { private String def8; private String shipAt; + + private String sourceLineNum; + + private String tradeSuccessAt; + + private String sourceOrderStatus; } \ No newline at end of file