diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java index c7dad25..11156b4 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java @@ -184,11 +184,11 @@ public class TestClient { msg = "第三方系统ID不能为空"; } else if (StrUtil.isBlank(udiwmsOrderRequest.getBillDate()) || StrUtil.isBlank(udiwmsOrderRequest.getBillFlag()) || StrUtil.isBlank(udiwmsOrderRequest.getCorpName()) || StrUtil.isBlank(udiwmsOrderRequest.getCorpId()) || StrUtil.isBlank(udiwmsOrderRequest.getBillType()) || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) - || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) || CollUtil.isEmpty(udiwmsOrderRequest.getItems())) { + || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) || CollUtil.isEmpty(udiwmsOrderRequest.getItem())) { flag = false; msg = "订单关键参数缺失或错误"; } else { - List items = udiwmsOrderRequest.getItems(); + List items = udiwmsOrderRequest.getItem(); for (UdiwmsOrderDetail item : items) { if (StrUtil.isBlank(item.getProductId()) || StrUtil.isBlank(item.getProductName()) || null == item.getPrice() || null == item.getCount() || 0 >= item.getPrice().compareTo(BigDecimal.ZERO) || 0 >= item.getCount() diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/zy/ZyProductEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/zy/ZyProductEntity.java index 5c2867c..c9bdd76 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/zy/ZyProductEntity.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/zy/ZyProductEntity.java @@ -22,6 +22,8 @@ public class ZyProductEntity { private String manufactory; @Excel(name = "产品证号") private String registerNo; + @Excel(name = "进货价") + private String price; } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java index 41d12d6..4173d4b 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java @@ -27,4 +27,5 @@ public class UdiwmsOrderDetail { private String remark2; //备注2/型号 private String remark3; //备注3/规格 + } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java index 3cb5c8d..3d4cc25 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java @@ -20,6 +20,7 @@ public class UdiwmsOrderRequest { private String billDate; //单据日期 private String billType; //单据类型 + private String billName; //单据类型 private Integer createUser; private Integer reviewUser; private String remark; //备注 @@ -31,10 +32,11 @@ public class UdiwmsOrderRequest { private String detailCode; //明细编码 private String thirdSys; //第三方系统ID private String status; //单据状态 + private String locStorageCode; + private String locStorageName; - - private List items; //单据详情数组 + private List item; //单据详情数组 } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhBusTypeRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhBusTypeRequest.java index 0f4e717..e853c4d 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhBusTypeRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhBusTypeRequest.java @@ -1,9 +1,10 @@ package com.glxp.mipsdl.admin.req.phxyy; +import com.glxp.mipsdl.admin.req.ListPageRequest; import lombok.Data; @Data -public class PhBusTypeRequest { +public class PhBusTypeRequest extends ListPageRequest { //单据类型编码 private String code; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhOrderRequest.java index 61eccfb..15b1b32 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/PhOrderRequest.java @@ -17,7 +17,8 @@ public class PhOrderRequest { private String remark; //备注 private String corpId; //第三方单据往来单位ID private String corpName; //往来单位 - - private List items; //单据详情数组 + private String locStorageCode; + private String locStorageName; + private List item; //单据详情数组 } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsProductInfoResponse.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsProductInfoResponse.java index 201a04f..9a04f0e 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsProductInfoResponse.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsProductInfoResponse.java @@ -14,7 +14,6 @@ import java.util.Date; public class UdiwmsProductInfoResponse { - private String code; //产品编码 private String name; //通用名称 private String measname; //计量单位 @@ -84,7 +83,7 @@ public class UdiwmsProductInfoResponse { private String productSpecId; private String hospHisCode; - + private String price; } diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 2b7c779..bc5073a 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -1,32 +1,36 @@ -# \u672C\u5730\u73AF\u5883 +# 本地环境 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?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +#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?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 #spring.datasource.password=89083fb2fc145533 logging.level.com.glxp.mipsdl.admin.dao=debug #logging.level.com.glxp.mipsdl.admin.barcode=debug -# \u8DE8\u57DF\u8BBE\u7F6E +# 跨域设置 cors.allowed-origins=* cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN cors.allowed-methods=GET,POST,OPTIONS server.servlet.context-path= -#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6 +#请求参数长度 server.tomcat.max-http-form-post-size=100MB server.max-http-header-size=100MB -#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB) +#最大上传文件大小(10MB) spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=200MB server.connectionTimeout=180000 -#U8\u53C2\u6570 -#\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 +#U8参数 +#udi管理系统IP地址（上传文件解析后回传） +UDIWMS_IP=http://192.168.0.109:9991 +#UDIWMS_IP=http://139.9.178.73:8080/UDI_WMS_MC/ +API_KEY=1102 +API_SECRET=4dc07484afd34e8083ba96e8fe564224 +#文件导入 +#0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院) FILE_VERSION_FLAG=ZHIYE_V1 -#\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) +#接口实时获取 +#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(诏安县医院) ONLINE_VESRION_FLAG=PHXYY -#\u7B2C\u4E09\u65B9\u7CFB\u7EDF\u6807\u8BC6 -THIRD_ID=thirdId - +THIRD_ID=thirdId diff --git a/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index f0db5b5..406b359 100644 --- a/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-sync/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -3,7 +3,7 @@