From 55c2c3233d050ec2b74aa0fb659f1b19f67576b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Mon, 14 Aug 2023 18:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E9=99=A2=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8D=95=E4=BD=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 10 +++++++++- .../inout/IoOrderReviewController.java | 2 +- .../com/glxp/api/res/inout/IoOrderResponse.java | 2 ++ src/main/resources/application-dev.yml | 17 ++++++++++------- src/main/resources/application.yml | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index e2d4ac2d4..9e4c9276e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/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); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 61f13343a..d72d03e8b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/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()); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 075b24a1f..f4261b5a0 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/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; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3cc0eeadb..06cfcdef6 100644 --- a/src/main/resources/application-dev.yml +++ b/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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 390b02b7c..55bc9cd7c 100644 --- a/src/main/resources/application.yml +++ b/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