diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java index c9172fc..372a7e7 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java @@ -2,6 +2,7 @@ package com.glxp.mipsdl.admin.client.http; import cn.hutool.core.util.StrUtil; import com.glxp.mipsdl.admin.client.BaseHttpClient; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.entity.yyu8v31.ErpOrderEntity; import com.glxp.mipsdl.admin.entity.yyu8v31.YyUcloudV31SetEntity; import com.glxp.mipsdl.admin.http.UBaseResponse; @@ -122,7 +123,37 @@ public class YyUCloud31Client implements BaseHttpClient { @Override public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsOrderRequest) { - return null; + + BaseResponse> baseResponse = new BaseResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(4L); + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = new BasicThirdSysBusApiEntity(); + basicThirdSysBusApiEntity.setCode("采购入库"); + basicThirdSysBusApiEntity.setName("采购入库"); + + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity1 = new BasicThirdSysBusApiEntity(); + basicThirdSysBusApiEntity1.setCode("退货出库"); + basicThirdSysBusApiEntity1.setName("退货出库"); + + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity2 = new BasicThirdSysBusApiEntity(); + basicThirdSysBusApiEntity2.setCode("销售出库"); + basicThirdSysBusApiEntity2.setName("销售出库"); + + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity3 = new BasicThirdSysBusApiEntity(); + basicThirdSysBusApiEntity3.setCode("退货入库"); + basicThirdSysBusApiEntity3.setName("退货入库"); + + List basicThirdSysBusApiEntities = new ArrayList<>(); + basicThirdSysBusApiEntities.add(basicThirdSysBusApiEntity); + basicThirdSysBusApiEntities.add(basicThirdSysBusApiEntity1); + basicThirdSysBusApiEntities.add(basicThirdSysBusApiEntity2); + basicThirdSysBusApiEntities.add(basicThirdSysBusApiEntity3); + + pageSimpleResponse.setList(basicThirdSysBusApiEntities); + baseResponse.setData(pageSimpleResponse); + return baseResponse; + + } @Override 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 64a2b67..7617fbe 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 @@ -139,6 +139,8 @@ public class UdiWmsController { PhBusTypeRequest phBusTypeRequest = new PhBusTypeRequest(); BeanUtil.copyProperties(udiwmsBusTypeRequest, phBusTypeRequest); return zaxyyClient.getOrderTypes(phBusTypeRequest); + } else if (curFlag.equals("YONGYOU_U8_V3.1")) { + return pzhzdClient.getOrderTypes(null); } else return ResultVOUtils.error(500, "当前第三方系统不支持业务单据类型查询!"); diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 4c6bdcf..a892442 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -2,10 +2,10 @@ server.port=9997 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph3?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true #spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=Glxp@6066 #spring.datasource.password=89083fb2fc145533 logging.level.com.glxp.mipsdl.admin.dao=debug #logging.level.com.glxp.mipsdl.admin.barcode=debug @@ -33,7 +33,7 @@ FILE_VERSION_FLAG=GLXP #接口实时获取 #0.NULL(空,未配置),1.YONGYOU_U8_V3.1(用友3.1版本,片仔癀诊断) 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口,测试用),4.PHXYY(平和县医院) #5.ZAXZYY(诏安县医院) -ONLINE_VESRION_FLAG=PHXYY +ONLINE_VESRION_FLAG=YONGYOU_U8_V3.1 THIRD_ID=thirdId ok.http.connect-timeout=30000 ok.http.read-timeout=30000