hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lets' into lets

This commit is contained in:
zhengyf 2024-11-08 15:06:17 +08:00
parent 99c8b3e9d2 d7d6bc7ce0
commit 88213dcf95
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
View File

@ -262,6 +262,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
queryOfsSoSaleOutVo.setClosedAt_start(startTime);
queryOfsSoSaleOutVo.setClosedAt_end(endTime);
queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L);
queryOfsSoSaleOutVo.setPageSize(50L);
queryOfsSoSaleOutVo.setStoreCode(tobShop);
@ -309,6 +310,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setPageNo(1L);
queryOfsSoSaleOutVo.setPageSize(50L);
// queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setStoreCode(tobShop);
queryOfsSoSaleOutVo.setInternalInstructionType("RETURN");
queryOfsSoSaleOutVo.setRefundStatus("900");
@ -356,6 +358,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
queryOfsSoSaleOutVo.setStoreCode(tobShop);
queryOfsSoSaleOutVo.setCode(code);
queryOfsSoSaleOutVo.setInternalInstructionType("RETURN");
// queryOfsSoSaleOutVo.setStatus(900L);
ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
View File

@ -262,7 +262,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
List<StockinOrderSearchResponse.StockinOrder> returnGoodHeaderDetailsDataDtoList = new ArrayList<>();
QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setStatus(900L);
// queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L);
queryOfsSoSaleOutVo.setPageSize(50L);
queryOfsSoSaleOutVo.setStoreCode(tocShop);

2
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java
View File

@ -88,7 +88,7 @@ public class SoSaleOutPluginInitializerToBTest {
// soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-31 14:48:41", "2024-10-31 14:48:41");
soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024110500018124", "stock");
soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024110500037199", "stock");
} catch (Exception e) {
e.printStackTrace();
}

4
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java
View File

@ -35,9 +35,9 @@ public class SoSaleReturnPluginInitializerToBTest {
//测试TOB退货-确认收入
// soSaleReturnPluginInitializerToB.startImplementByTradeTime("2024-08-30 15:54:41", "2024-08-30 15:54:43");
soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2024102500000029", "tran");
// soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2022112800000053", "stock");
// soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-09-24 16:52:49", "2024-09-24 16:52:52");
soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-11-04 00:00:00", "2024-11-04 23:59:59");
} catch (Exception e) {
e.printStackTrace();
}

6
service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
View File

@ -47,6 +47,9 @@ public class TobofsSaleoutDetailedDto {
private String businesstype;
//库存 开始
@ExcelProperty(value = "库存-O出库完成时间")
private String businessDate;
@ExcelProperty(value = "库存-推送状态")
private String newstate;
@ -64,6 +67,9 @@ public class TobofsSaleoutDetailedDto {
//库存 结束
//TOB交易红 开始
@ExcelProperty(value = "交易-O交易成功时间")
private String successfulTradeDate;
@ExcelProperty(value = "交易-推送状态")
private String newstate4;

6
service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java
View File

@ -47,6 +47,9 @@ public class TocofsSaleoutDetailedDto {
private String businesstype;
//库存 开始
@ExcelProperty(value = "库存-O出库完成时间")
private String businessDate;
@ExcelProperty(value = "库存-推送状态")
private String newstate;
@ -64,6 +67,9 @@ public class TocofsSaleoutDetailedDto {
//库存 结束
//交易红 开始
@ExcelProperty(value = "交易-O交易成功时间")
private String successfulTradeDate;
@ExcelProperty(value = "交易红-推送状态")
private String newstate2;

4
service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
View File

@ -438,6 +438,8 @@
<result property="def4" column="def4" jdbcType="VARCHAR"/>
<result property="newsystemnumber3" column="newSystemNumber3" jdbcType="VARCHAR"/>
<result property="newsystemprimary3" column="newSystemPrimary3" jdbcType="VARCHAR"/>
<result property="businessDate" column="businessDate" jdbcType="VARCHAR"/>
<result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
</resultMap>
@ -462,6 +464,8 @@
<result property="def6" column="def6" jdbcType="VARCHAR"/>
<result property="newsystemnumber4" column="newSystemNumber4" jdbcType="VARCHAR"/>
<result property="newsystemprimary4" column="newSystemPrimary4" jdbcType="VARCHAR"/>
<result property="businessDate" column="businessDate" jdbcType="VARCHAR"/>
<result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
</resultMap>
<!-- TOC通用查询 采用==查询 -->