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

扩展销售订单查询类型并更新API配置 

- 在SoSaleOutPluginInitializerToB和SoSaleOutPluginInitializerToC中，将内部指令类型从"SALES"扩展为"SALES,EXCHANGE,REISSUE"，以包含更多的销售订单类型
- 更新application-lets.yml中的letsofs配置，替换为正式环境的URL、appKey和secret
- 在测试类中调整订单代码查询示例，更新为新的测试订单代码
This commit is contained in:
liuy 2024-10-18 14:41:10 +08:00
parent 3bb8865e4a
commit bb7ef33c9d
5 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
View File

@ -255,7 +255,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_start(startTime);
queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setShipAt_end(endTime);
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
// queryOfsSoSaleOutVo.setCompanyCode("SHLZ"); // queryOfsSoSaleOutVo.setCompanyCode("SHLZ");
queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);
@ -301,7 +301,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime);
queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime);
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态
// queryOfsSoSaleOutVo.setStatus(900L); // queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);
@ -341,7 +341,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
List<HeaderDetailsDto> headerDetailsDtoList = new ArrayList<>(); List<HeaderDetailsDto> headerDetailsDtoList = new ArrayList<>();
QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
//2024年8月30日 10:41:55 如果按编码查询，是否应该考虑仅查询已发货的数据？ //2024年8月30日 10:41:55 如果按编码查询，是否应该考虑仅查询已发货的数据？
queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);

6
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
View File

@ -212,7 +212,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_start(startTime);
queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setShipAt_end(endTime);
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);
queryOfsSoSaleOutVo.setPageSize(100L); queryOfsSoSaleOutVo.setPageSize(100L);
@ -253,7 +253,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
List<com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto> headerDetailsDtoList = new ArrayList<>(); List<com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto> headerDetailsDtoList = new ArrayList<>();
QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
// queryOfsSoSaleOutVo.setStatus(900L); // queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);
queryOfsSoSaleOutVo.setPageSize(100L); queryOfsSoSaleOutVo.setPageSize(100L);
@ -306,7 +306,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime);
queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime);
queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setClientCode("LETS");
queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE");
queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态
// queryOfsSoSaleOutVo.setStatus(900L); // queryOfsSoSaleOutVo.setStatus(900L);
queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageNo(1L);

14
buildpackage/src/main/resources/application-lets.yml
View File

@ -38,7 +38,15 @@ cbs8:
OA: OA:
data_source_code: yc_oa data_source_code: yc_oa
#O测试
#letsofs:
# url: http://39.98.58.229/api/edi/u8c/ofs/in
# appKey: 1023142858
# secret: 382e4a2584027a36ac9431103
#O正式
letsofs: letsofs:
url: http://39.98.58.229/api/edi/u8c/ofs/in url: http://39.98.168.188:30002/api/edi/u8c/ofs/in
appKey: 1023142858 appKey: 2097046829
secret: 382e4a2584027a36ac9431103 secret: 35282f251476a3af4f00c7b36

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

@ -2,6 +2,7 @@ package com.hzya.frame.plugin.lets.plugin.sales;
import com.hzya.frame.WebappApplication; import com.hzya.frame.WebappApplication;
import com.hzya.frame.plugin.lets.util.AfterSalesOrderUtil; import com.hzya.frame.plugin.lets.util.AfterSalesOrderUtil;
import com.hzya.frame.plugin.lets.util.ShopTobOrToCUtil;
import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto;
import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDto;
import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto;
@ -33,6 +34,9 @@ public class SoSaleOutPluginInitializerToBTest {
@Autowired @Autowired
private AfterSalesOrderUtil afterSalesOrderUtil; private AfterSalesOrderUtil afterSalesOrderUtil;
@Autowired
private ShopTobOrToCUtil shopTobOrToCUtil;
@Test @Test
public void startImplement() { public void startImplement() {
// soSaleOutPluginInitializerToB.startImplement(null, null); // soSaleOutPluginInitializerToB.startImplement(null, null);
@ -60,13 +64,18 @@ public class SoSaleOutPluginInitializerToBTest {
// e.printStackTrace(); // e.printStackTrace();
// } // }
try { // try {
// soSaleOutPluginInitializerToB.startImplementByTranTime("2024-09-12 14:04:00","2024-09-12 14:12:00"); //// soSaleOutPluginInitializerToB.startImplementByTranTime("2024-09-12 14:04:00","2024-09-12 14:12:00");
// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock"); //// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock");
//
// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092600000009","stock");
// } catch (Exception e) {
// e.printStackTrace();
// }
soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092600000009","stock"); // String tobShop = shopTobOrToCUtil.getCommaShop("TOB");
} catch (Exception e) { // System.out.println(tobShop);
e.printStackTrace();
} // soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101700000270");
} }
} }

5
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
View File

@ -92,9 +92,8 @@ class SoSaleOutPluginInitializerToCTest {
// queryOfsSoSaleOutVo.setCode("LETS-SO2024092500000018"); // queryOfsSoSaleOutVo.setCode("LETS-SO2024092500000018");
// ofsStandardUtil.getOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoArrayList, 1L); // ofsStandardUtil.getOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoArrayList, 1L);
// System.out.println(headerDetailsDtoArrayList.get(0).getHeader().getDepartmentType()); // System.out.println(headerDetailsDtoArrayList.get(0).getHeader().getDepartmentType());
String s = "LETS-SH2024101700000270";
String s = "LETS-SH2024092900000029";
soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock"); soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock");
} }
} }