代码备份

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -252,7 +252,10 @@ public class CtqyyClient extends CommonHttpClient {
                     products.setName(dict.getPHYSIC_NAME());
                     products.setMeasname(dict.getPHYSIC_UNIT());
                     products.setSpec(dict.getPHYSIC_SPEC());
-                    products.setRegisterNo(dict.getPHYSIC_NO());
+                    products.setYbbm(dict.getCOUNTRY_CODE());
+//                    todo  少了制剂规格，制剂单位  dict.getPHYSIC_SPEC()
+//                    dict.getPHYSIC_UNIT()
+//                    products.setRegisterNo(dict.getPHYSIC_NO());
                     products.setProductType(2);
                     return products;
                 }).collect(Collectors.toList());
@@ -1416,7 +1419,7 @@ public class CtqyyClient extends CommonHttpClient {
 //        } else {
 //            return ResultVOUtils.error(500, "下载失败!");
 //        }
-        return this.ioCollectOrder(udiwmsBasicSkPrescribeRequest,page);
+        return this.ioCollectOrder(udiwmsBasicSkPrescribeRequest, page);
 
     }
 
@@ -1456,11 +1459,12 @@ public class CtqyyClient extends CommonHttpClient {
 
 
     /**
+     * 中间表
      *
      * @param udiwmsBasicSkPrescribeRequest
      * @return
      */
-    private BaseResponse basicSkPrescribe(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest,IPage<VYpzsPresInfo> page){
+    private BaseResponse basicSkPrescribe(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VYpzsPresInfo> page) {
         List<VYpzsPresInfo> presInfoEntities = page.getRecords();
         if (CollUtil.isNotEmpty(presInfoEntities)) {
             //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
@@ -1506,7 +1510,8 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
     /**
-     * 视图转为单据
+     * 单据
+     *
      * @param udiwmsBasicSkPrescribeRequest
      * @return
      */

src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java

@@ -90,12 +90,12 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
     /**
      * 处方赋码状态  1:未赋码；2：赋码中；3：已赋码
      */
-    private Byte tagStatus;
+    private Integer tagStatus;
 
     /**
      * 处方下载转换状态  1:未转换；2：部分转换；3：已转换
      */
-    private Byte trDiStatus;
+    private Integer trDiStatus;
 
     /**
      * 处方赋码错误信息

src/main/resources/app-test.yml

@@ -0,0 +1,51 @@
+spring:
+  datasource:
+    dynamic:
+      primary: master
+      strict: false
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: Glxp@6066
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        njsql:
+          #          url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          #          username: SD_UDIJK
+          #          password: SD_UDIJK
+          #          driver-class-name: oracle.jdbc.driver.OracleDrive
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: Glxp@6066
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #        thirdSql:
+        #          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        #          username: root
+        #          password: Glxp@6066
+        #          driver-class-name: com.mysql.cj.jdbc.Driver
+        ptxhSql:
+          #          url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          #          username: SD_UDIJK
+          #          password: SD_UDIJK
+          #          driver-class-name: oracle.jdbc.driver.OracleDrive
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: Glxp@6066
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        ctqyySql:
+          #          url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          #          username: SD_UDIJK
+          #          password: SD_UDIJK
+          #          driver-class-name: oracle.jdbc.driver.OracleDrive
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: Glxp@6066
+          driver-class-name: com.mysql.cj.jdbc.Driver
+      hikari:
+        connection-timeout: 60000
+        maximum-pool-size: 60
+        minimum-idle: 10
+    hikari:
+      connection-timeout: 60000
+      maximum-pool-size: 60
+      minimum-idle: 10