日志优化与测试用例时间参数化

- 扩展日志信息，使其包含插件名称、O接口返回行数及时间范围。
- 将现有测试代码中的硬编码时间替换为参数，以便于灵活测试。
- 通过这些改动，提高了日志的可读性，并使测试用例更加通用。

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java

@@ -192,7 +192,7 @@ public class ConsignmachiningIn extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE");
                     queryOfsSoSaleOutVo.setStatus(900L);
                     ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSet(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java

@@ -195,7 +195,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE_RETURN");
                     queryOfsSoSaleOutVo.setStatus(900L);
                     ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSet(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java

@@ -184,15 +184,15 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
                     //OFS采退出库
                     List<HeaderDetailsDto> returnGoodHeaderDetailsDataDtoArrayList = new ArrayList<>();
                     QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
-                    queryOfsSoSaleOutVo.setAuditAt_start(startTime);
+                    queryOfsSoSaleOutVo.setShipAt_start(startTime);
-                    queryOfsSoSaleOutVo.setAuditAt_end(endTime);
+                    queryOfsSoSaleOutVo.setShipAt_end(endTime);
                     queryOfsSoSaleOutVo.setClientCode("LETS");
                     queryOfsSoSaleOutVo.setPageNo(1L);
                     queryOfsSoSaleOutVo.setPageSize(50L);
                     queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE_RETURN");
                     queryOfsSoSaleOutVo.setStatus(900L);
                     ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSet(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java

@@ -188,7 +188,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setPageNo(1L);
                     queryOfsSoSaleOutVo.setStatus(900L);
                     ofsStandardUtil.queryOfsPoOrder(queryOfsSoSaleOutVo, allOfsPoOrderList, 1L);
-                    logger.info("数据返回行数：{}", allOfsPoOrderList.size());
+                    logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), allOfsPoOrderList.size(), startTime, endTime);
                     if (allOfsPoOrderList.size() > 0) {
                         getSet(allOfsPoOrderList);
                     } else {

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java

@@ -188,7 +188,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE");
                     queryOfsSoSaleOutVo.setStatus(900L);
                     ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSet(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {

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

@@ -243,7 +243,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setStoreCode(tobShop);
 //                    queryOfsSoSaleOutVo.setCode("LETS-SH2024010200000004");
                     ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search");
-                    logger.info("数据返回行数：{}", headerDetailsDtoList.size());
+                    logger.info("插件：{} (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime);
                     if (headerDetailsDtoList.size() > 0) {
                         getSetStock(headerDetailsDtoList);
                     } else {
@@ -298,7 +298,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setPageSize(50L);
                     queryOfsSoSaleOutVo.setStoreCode(tobShop);
                     ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search");
-                    logger.info("数据返回行数：{}", headerDetailsDtoList.size());
+                    logger.info("插件：{}  (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime);
                     if (headerDetailsDtoList.size() > 0) {
                         getSetStockTran(headerDetailsDtoList);
                     } else {

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

@@ -247,7 +247,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setInternalInstructionType("RETURN");
 //                    queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001");
                     ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{}  (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSetStock(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {
@@ -303,7 +303,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
                     queryOfsSoSaleOutVo.setRefundStatus("900");
 //                    queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001");
                     ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
-                    logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
+                    logger.info("插件：{}  (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime);
                     if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
                         getSetTrade(returnGoodHeaderDetailsDataDtoArrayList);
                     } else {

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInTest.java

@@ -27,7 +27,9 @@ public class ConsignmachiningInTest {
     @Test
     public void startImplement() {
 //        String code = "LETS-RE2024082300000007";
-        String code = "LETS-RE2024090300000001";
+//        String code = "LETS-RE2024090300000001";
-        consignmachiningIn.startImplement(code);
+//        consignmachiningIn.startImplement(code);
+
+        consignmachiningIn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17");
     }
 }

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturnTest.java

@@ -32,6 +32,8 @@ public class ProxyPurchaseReturnTest {
 
 
 //            proxyPurchaseReturn.u8cOperationFlow();
+
+            proxyPurchaseReturn.startImplement("2024-09-24 13:49:15", "2024-09-24 13:49:17");
         } catch (Exception e) {
             e.printStackTrace();
         }

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java

@@ -27,7 +27,9 @@ public class ProxyPurchaseWarehousOrderTest {
     @Test
     public void startImplementByCode() {
         try {
-            proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024091800000002");
+//            proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024091800000002");
+
+            proxyPurchaseWarehousOrder.startImplementByTime("2024-09-24 13:49:15", "2024-09-24 13:49:17");
         } catch (Exception e) {
             e.printStackTrace();
         }