From 3604430c8a9b10bccc07222036ee4d0e6ca40409 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 20 Mar 2024 11:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=AB=98=E8=80=97=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 26 ++++++++++++++++--- .../mipsdl/client/ptxhyy/PtxhyyClient.java | 14 +++++----- src/main/resources/application-dev.yml | 2 +- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 53d0aea..626ccf3 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -64,6 +64,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.io.IOException; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -776,6 +777,7 @@ public class CtqyyClient extends CommonHttpClient { return baseResponse; } + /** * 获取库存扫码出入库明细（高值耗材出库明细） * @@ -792,9 +794,15 @@ public class CtqyyClient extends CommonHttpClient { ctqyyRequest.setMsgHeader(getMsgHeader("getSickHighitem")); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); +// String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); // String response = // "{\"code\": 20000,\"message\": \"success\",\"data\": {\"list\": [{\"recordNo\": 391,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106971221560052\",\"Barcode\": \"111704022117000188340055\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 390,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106946149100093\",\"Barcode\": \"111704022117000188340007\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 408,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63182\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695502193\",\"Barcode\": \"111703012117000076800035\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 401,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695522023\",\"Barcode\": \"111612212116120902040009\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 423,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695525055\",\"Barcode\": \"111701062116122700670005\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 400,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111612212116120902040047\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 422,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111701062116122700670013\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"}],\"total\": 7}}"; + String response = null; + try { + response = FileUtils.getFileContent("E://ghresponse.json"); + } catch (IOException e) { + e.printStackTrace(); + } BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { }); @@ -807,15 +815,27 @@ public class CtqyyClient extends CommonHttpClient { thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode()); thrInvResultResponse.setCpmctymc(ptxhInvResponse.getMaterialName()); thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getMaterialPrc())); + + thrInvResultResponse.setInvName(ptxhInvResponse.getDeptName()); - thrInvResultResponse.setInvCode(ptxhInvResponse.getInDept()); + +// AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new LambdaQueryWrapper().eq(AuthWarehouseEntity::getThirdId, ptxhInvResponse.getInDept())); +// if (warehouseEntity != null) +// thrInvResultResponse.setInvCode(warehouseEntity.getCode()); +// else +// thrInvResultResponse.setInvCode(ptxhInvResponse.getInDept()); + + thrInvResultResponse.setInvCode("1000003"); + thrInvResultResponse.setDeptCode("1002"); thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo()); thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName()); + thrInvResultResponse.setBillType("SC71090077430919"); thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT); thrInvResultResponse.setType("1"); thrInvResultResponse.setOutCount("1"); thrInvResultResponse.setReCount("1"); - thrInvResultResponse.setUdiCode(ptxhInvResponse.getDictBarcode() + ptxhInvResponse.getBarcode()); + IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1")); + thrInvResultResponse.setUdiCode(codeEntity.getCode()); thrInvResultResponses.add(thrInvResultResponse); } } diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 1bb8a20..2d43485 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -101,6 +101,13 @@ public class PtxhyyClient extends CommonHttpClient { @Resource ThrHslbService thrHslbService; + @Resource + BasicSkProjectMapper basicSkProjectMapper; + @Resource + UdiRlSupDao udiRlSupDao; + @Resource + BasicDestinyRelMapper basicDestinyRelMapper; + @Override public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { if (StrUtil.isBlank(udiwmsOrderRequest.getBillNo())) { @@ -445,13 +452,6 @@ public class PtxhyyClient extends CommonHttpClient { } - @Resource - BasicSkProjectMapper basicSkProjectMapper; - @Resource - UdiRlSupDao udiRlSupDao; - @Resource - BasicDestinyRelMapper basicDestinyRelMapper; - /** * 获取库存/出入库明细信息 */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c1a14cc..8e0c827 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: strict: false datasource: master: - 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 + url: jdbc:p6spy: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: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver