中医院往来信息单位显示

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -315,7 +315,14 @@ public class IoOrderController extends BaseController {
                 basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
                 basicCorpService.insert(basicCorpEntity);
             }
-            orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            if (addOrderRequest.getAction().equals("SC68653620956887")){
+                orderEntity.setFromCorp(basicCorpEntity.getName());
+
+
+            }else {
+                orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            }
+
         } else {
             orderEntity.setFromCorp(addOrderRequest.getFromCorp());
         }
@@ -326,6 +333,7 @@ public class IoOrderController extends BaseController {
         orderEntity.setDeptCode(addOrderRequest.getDeptCode());
         orderEntity.setBillNo(addOrderRequest.getBillNo());
         orderEntity.setInvCode(addOrderRequest.getInvCode());
+
         orderService.updateByBillNo(orderEntity);
 
 

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -623,7 +623,7 @@ public class IoOrderReviewController extends BaseController {
      * PDA获取待核对单据-单据条码明细
      */
     @AuthRuleAnnotation("")
-    @GetMapping("/udiwms/pda/order/check/getOrderDetail")
+    @GetMapping("/udiwms/pda/order/check/getOrderDetail1")
     public BaseResponse getPdaCheckOrderCodes(PdaCheckRequest pdaCheckRequest) {
         FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest();
         filterOrderDetailResultRequest.setOrderIdFk(pdaCheckRequest.getBillNo());

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -257,6 +257,8 @@ public class IoOrderResponse {
             return fromCorpName;
         if (StrUtil.isNotEmpty(fromInvName))
             return fromInvName;
+        if (StrUtil.isNotEmpty(fromCorp))
+            return fromCorp;
         return fromName;
     }
 

src/main/resources/application-dev.yml

@@ -1,12 +1,14 @@
 server:
   port: 9991
-
+  #udi_wms_0710  udi_wms_zs  192.168.0.153  192.168.0.66:3364/udi_wms_0710
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
+#    password: 259415
+#    password: root
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20
@@ -46,12 +48,13 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: D:/udi/udiwms/udiwmsfile/
+file_path: E:/udi/inUdiwms/udiwmsfile/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
-SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b
-back_file_path: D:/share/udisps/back/
+
+back_file_path: E:/share/udisps/back/
 API_KEY: 1101
-API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
+API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
 WEB_TITLE: 平潭协和医院
+SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       enabled: true
       max-file-size: 200MB
       max-request-size: 200MB
-      location: D:/tmp
+      location: E:/tmp
 
 mybatis-plus:
   mapper-locations: classpath:mybatis/mapper/*/*.xml