From b5b23599253ea9f8dc4ddf4d00373ee43255331d Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 7 Feb 2023 09:50:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=91=E9=9C=84=E5=8E=BF?= =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E9=99=A2=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/controller/UdiWmsController.java | 12 ++++++------ .../src/main/resources/application-pro.properties | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java index 571090b..c7cfc0f 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java @@ -67,7 +67,7 @@ public class UdiWmsController { DsUnitRequest dsUnitRequest = new DsUnitRequest(); BeanUtil.copyProperties(udiwmsUnitRequest, dsUnitRequest); return dsxyyClient.getUnit(dsUnitRequest); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { YxUnitRequest yxUnitRequest = new YxUnitRequest(); BeanUtil.copyProperties(udiwmsUnitRequest, yxUnitRequest); return yxzyyClient.getUnit(yxUnitRequest); @@ -97,7 +97,7 @@ public class UdiWmsController { DsProductRequest dsProductRequest = new DsProductRequest(); BeanUtil.copyProperties(udiwmsProductRequest, dsProductRequest); return dsxyyClient.getProducts(dsProductRequest); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { YxProductRequest yxProductRequest = new YxProductRequest(); BeanUtil.copyProperties(udiwmsProductRequest, yxProductRequest); return yxzyyClient.getProducts(yxProductRequest); @@ -130,7 +130,7 @@ public class UdiWmsController { DsWarehouseRequest dsWarehouseRequest = new DsWarehouseRequest(); BeanUtil.copyProperties(udiwmsWarehouseRequest, dsWarehouseRequest); return dsxyyClient.getWarehouse(dsWarehouseRequest); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { YxWarehouseRequest yxWarehouseRequest = new YxWarehouseRequest(); BeanUtil.copyProperties(udiwmsWarehouseRequest, yxWarehouseRequest); return yxzyyClient.getWarehouse(yxWarehouseRequest); @@ -173,7 +173,7 @@ public class UdiWmsController { DsBusTypeRequest dsBusTypeRequest = new DsBusTypeRequest(); BeanUtil.copyProperties(udiwmsBusTypeRequest, dsBusTypeRequest); return dsxyyClient.getOrderTypes(dsBusTypeRequest); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { YxBusTypeRequest yxBusTypeRequest = new YxBusTypeRequest(); BeanUtil.copyProperties(udiwmsBusTypeRequest, yxBusTypeRequest); return yxzyyClient.getOrderTypes(yxBusTypeRequest); @@ -204,7 +204,7 @@ public class UdiWmsController { DsOrderRequest dsOrderRequest = new DsOrderRequest(); BeanUtil.copyProperties(udiwmsOrderRequest, dsOrderRequest); return dsxyyClient.submitOrders(dsOrderRequest); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { YxOrderRequest yxOrderRequest = new YxOrderRequest(); BeanUtil.copyProperties(udiwmsOrderRequest, yxOrderRequest); return yxzyyClient.submitOrders(yxOrderRequest); @@ -339,7 +339,7 @@ public class UdiWmsController { return zaxyyClient.testConnect(); } else if (curFlag.equals("DSXYY")) { return dsxyyClient.testConnect(); - } else if (curFlag.equals("YXZYY")) { + } else if (curFlag.equals("YXXZYY")) { return yxzyyClient.testConnect(); } if (curFlag.equals("YONGYOU_U8_V3.1")) { diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 0f4cde6..8f21e16 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -28,12 +28,12 @@ UDIWMS_IP=http://127.0.0.1:9991 API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #\u6587\u4EF6\u5BFC\u5165 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) -FILE_VERSION_FLAG=DSXYY +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u53BF\u4E2D\u533B\u9662) +FILE_VERSION_FLAG=YXXZYY #\u63A5\u53E3\u5B9E\u65F6\u83B7\u53D6 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662),5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXXZYY(\u4E91\u9704\u53BF\u4E2D\u533B\u9662) #5.ZAXZYY(\u8BCF\u5B89\u53BF\u533B\u9662) -ONLINE_VESRION_FLAG=DSXYY +ONLINE_VESRION_FLAG=YXXZYY THIRD_ID=thirdId ok.http.connect-timeout=30000 ok.http.read-timeout=30000