From c93c0bc195b99553be2d9901bac425fc33b919a1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 1 Mar 2024 18:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E5=8C=BA=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/BaseHttpClient.java | 11 +- .../glxp/mipsdl/client/CommonHttpClient.java | 6 + .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 125 +++++++++++++++++ .../ctqyy/entity/InvCodeResultEntity.java | 14 ++ .../ctqyy/entity/InvProjectResultEntity.java | 27 ++++ .../client/ctqyy/entity/InvResultEntity.java | 60 ++++++++ .../mipsdl/client/ptxhyy/PtxhyyClient.java | 4 +- .../com/glxp/mipsdl/constant/Constants.java | 6 + .../mipsdl/controller/UdiWmsController.java | 14 ++ .../mipsdl/req/ctqyy/CtqyyInvRequest.java | 13 ++ .../res/udiwms/ThrInvResultResponse.java | 130 +++++++++++++++++- 11 files changed, 405 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvCodeResultEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvProjectResultEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/req/ctqyy/CtqyyInvRequest.java diff --git a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java index a094bbc..da01100 100644 --- a/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java @@ -74,13 +74,22 @@ public interface BaseHttpClient { /** - * 获取库存产品列表 + * 获取库存出入库明细 * * @param udiwmsInvProductsRequest * @return */ BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest); + + /** + * 获取库存出入库扫码明细 + * + * @param udiwmsInvProductsRequest + * @return + */ + BaseResponse getInvCodeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest); + /** * 获取仓库列表 * diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 53deebc..689a067 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -276,4 +276,10 @@ public abstract class CommonHttpClient implements BaseHttpClient { public BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { return null; } + + + @Override + public BaseResponse getInvCodeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { + return null; + } } 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 c83d2ce..e9a1d02 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -8,10 +8,12 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.mipsdl.client.CommonHttpClient; +import com.glxp.mipsdl.client.ctqyy.entity.InvResultEntity; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; @@ -47,10 +49,13 @@ import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.ctqyy.*; import com.glxp.mipsdl.req.post.*; +import com.glxp.mipsdl.req.ptxhyy.PtxhyyInvRequest; import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; +import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; +import com.glxp.mipsdl.res.ptxhyy.PtxhInvResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; @@ -66,6 +71,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -709,6 +715,125 @@ public class CtqyyClient extends CommonHttpClient { } + /** + * 获取库存出入库明细 + * + * @param udiwmsInvProductsRequest + * @return + */ + @Override + public BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { + CtqyyInvRequest ptxhyyInvRequest = new CtqyyInvRequest(); + ptxhyyInvRequest.setStartdate(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd")); + ptxhyyInvRequest.setEnddate(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd")); + + CtqyyRequest ctqyyRequest = new CtqyyRequest(); + ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialUnit")); + ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest)); + +// String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); + String response = "{\"code\":20000,\"message\":\"success\",\"data\":{\"list\":[{\"applyNo\":\"74192\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"65\",\"CreditName\":\"急诊科\",\"AccoutDate\":\"2024-02-2210:36:28\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"77375\",\"materialName\":\"一次性注射器2ml\",\"materialSpec\":\"0.6\",\"materialUnit\":\"支\",\"batchNo\":65212,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":200,\"importPrc\":0.21,\"importMoney\":42,\"factoryCode\":\"0006064349\",\"factoryName\":\"河南曙光汇知康生物科技股份有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管（吸氧管）\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":64113,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":19,\"importPrc\":1.15,\"importMoney\":21.85,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管（吸氧管）\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":65526,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":81,\"importPrc\":1.15,\"importMoney\":93.15,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74209\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"92\",\"CreditName\":\"儿科\",\"AccoutDate\":\"2024-02-2315:31:58\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"30936\",\"materialName\":\"一次性静脉输液针5（1/2）\",\"materialSpec\":\"/条\",\"materialUnit\":\"条\",\"batchNo\":64898,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":250,\"importPrc\":0.17,\"importMoney\":42.5,\"factoryCode\":\"0006063565\",\"factoryName\":\"浙江康康\"}],\"total\":4}}"; + + BaseResponse> baseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + if (baseResponse.getCode() == 20000) { + List ptxhInvResponses = baseResponse.getData().getList(); + List thrInvResultResponses = new ArrayList<>(); + if (CollUtil.isNotEmpty(ptxhInvResponses)) { + for (InvResultEntity ptxhInvResponse : ptxhInvResponses) { + ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse(); + thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode()); + thrInvResultResponse.setCpmctymc(ptxhInvResponse.getMaterialName()); + thrInvResultResponse.setGgxh(ptxhInvResponse.getMaterialSpec()); + thrInvResultResponse.setBatchNo(ptxhInvResponse.getBatchNo()); + thrInvResultResponse.setMeasname(ptxhInvResponse.getMaterialUnit()); + thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getImportPrc())); + thrInvResultResponse.setAmount(BigDecimal.valueOf(ptxhInvResponse.getImportMoney())); +// thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName()); +// thrInvResultResponse.setDeptCode(ptxhInvResponse.getDebit()); +// thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName()); +// thrInvResultResponse.setInvCode(ptxhInvResponse.getCredit()); + + thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName()); + thrInvResultResponse.setDeptCode("1002"); + thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName()); + thrInvResultResponse.setInvCode("1000003"); + + thrInvResultResponse.setManufacturer(ptxhInvResponse.getFactoryName()); + thrInvResultResponse.setManufactoryCode(ptxhInvResponse.getFactoryCode()); + thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT); + thrInvResultResponse.setBillType(ptxhInvResponse.getIoType()); + thrInvResultResponse.setType("1"); + thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + ""); + thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + ""); + thrInvResultResponses.add(thrInvResultResponse); + } + } + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(thrInvResultResponses.size() + 0l); + pageSimpleResponse.setList(thrInvResultResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + return baseResponse; + } + + @Override + public BaseResponse getInvCodeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { + CtqyyInvRequest ptxhyyInvRequest = new CtqyyInvRequest(); + ptxhyyInvRequest.setStartdate(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd")); + ptxhyyInvRequest.setEnddate(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd")); + + CtqyyRequest ctqyyRequest = new CtqyyRequest(); + ctqyyRequest.setMsgHeader(getMsgHeader("getSickHighitem")); + ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest)); + +// String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); + String response = "{\"code\":20000,\"message\":\"success\",\"data\":{\"list\":[{\"applyNo\":\"74192\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"65\",\"CreditName\":\"急诊科\",\"AccoutDate\":\"2024-02-2210:36:28\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"77375\",\"materialName\":\"一次性注射器2ml\",\"materialSpec\":\"0.6\",\"materialUnit\":\"支\",\"batchNo\":65212,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":200,\"importPrc\":0.21,\"importMoney\":42,\"factoryCode\":\"0006064349\",\"factoryName\":\"河南曙光汇知康生物科技股份有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管（吸氧管）\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":64113,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":19,\"importPrc\":1.15,\"importMoney\":21.85,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管（吸氧管）\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":65526,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":81,\"importPrc\":1.15,\"importMoney\":93.15,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74209\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"92\",\"CreditName\":\"儿科\",\"AccoutDate\":\"2024-02-2315:31:58\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"30936\",\"materialName\":\"一次性静脉输液针5（1/2）\",\"materialSpec\":\"/条\",\"materialUnit\":\"条\",\"batchNo\":64898,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":250,\"importPrc\":0.17,\"importMoney\":42.5,\"factoryCode\":\"0006063565\",\"factoryName\":\"浙江康康\"}],\"total\":4}}"; + + BaseResponse> baseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + if (baseResponse.getCode() == 20000) { + List ptxhInvResponses = baseResponse.getData().getList(); + List thrInvResultResponses = new ArrayList<>(); + if (CollUtil.isNotEmpty(ptxhInvResponses)) { + for (InvResultEntity ptxhInvResponse : ptxhInvResponses) { + ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse(); + thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode()); + thrInvResultResponse.setCpmctymc(ptxhInvResponse.getMaterialName()); + thrInvResultResponse.setGgxh(ptxhInvResponse.getMaterialSpec()); + thrInvResultResponse.setBatchNo(ptxhInvResponse.getBatchNo()); + thrInvResultResponse.setMeasname(ptxhInvResponse.getMaterialUnit()); + thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getImportPrc())); + thrInvResultResponse.setAmount(BigDecimal.valueOf(ptxhInvResponse.getImportMoney())); +// thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName()); +// thrInvResultResponse.setDeptCode(ptxhInvResponse.getDebit()); +// thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName()); +// thrInvResultResponse.setInvCode(ptxhInvResponse.getCredit()); + + thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName()); + thrInvResultResponse.setDeptCode("1002"); + thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName()); + thrInvResultResponse.setInvCode("1000003"); + + thrInvResultResponse.setManufacturer(ptxhInvResponse.getFactoryName()); + thrInvResultResponse.setManufactoryCode(ptxhInvResponse.getFactoryCode()); + thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT); + thrInvResultResponse.setBillType(ptxhInvResponse.getIoType()); + thrInvResultResponse.setType("1"); + thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + ""); + thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + ""); + thrInvResultResponses.add(thrInvResultResponse); + } + } + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(thrInvResultResponses.size() + 0l); + pageSimpleResponse.setList(thrInvResultResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + return baseResponse; + } @Override public BaseResponse getInvProducts(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvCodeResultEntity.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvCodeResultEntity.java new file mode 100644 index 0000000..26ffe06 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvCodeResultEntity.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.client.ctqyy.entity; + +import lombok.Data; + +/** + * 高值耗材出入库明细 + */ +@Data +public class InvCodeResultEntity { + + +} + + diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvProjectResultEntity.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvProjectResultEntity.java new file mode 100644 index 0000000..6461ce3 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvProjectResultEntity.java @@ -0,0 +1,27 @@ +package com.glxp.mipsdl.client.ctqyy.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 收费项目出入库明细 + */ +@NoArgsConstructor +@Data +public class InvProjectResultEntity { + + private String seqNo; + private String visitNo; + private String sickName; + private String applyDept; + private String deptName; + private String itemCode; + private String itemName; + private Double price; + private Integer quantity; + private Double cost; + private String materialCode; + private String materialName; + private String operTime; +} diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java new file mode 100644 index 0000000..9e1f0df --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvResultEntity.java @@ -0,0 +1,60 @@ +package com.glxp.mipsdl.client.ctqyy.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 库存出入库明细 + */ +@NoArgsConstructor +@Data +public class InvResultEntity { + + @JsonProperty("applyNo") + private String applyNo; + @JsonProperty("ioFlag") + private String ioFlag; + @JsonProperty("ioType") + private String ioType; + @JsonProperty("ioTypeName") + private String ioTypeName; + @JsonProperty("Debit") + private String debit; + @JsonProperty("DebitName") + private String debitName; + @JsonProperty("Credit") + private String credit; + @JsonProperty("CreditName") + private String creditName; + @JsonProperty("AccoutDate") + private String accoutDate; + @JsonProperty("Accoutant") + private String accoutant; + @JsonProperty("receiveOper") + private String receiveOper; + @JsonProperty("materialCode") + private String materialCode; + @JsonProperty("materialName") + private String materialName; + @JsonProperty("materialSpec") + private String materialSpec; + @JsonProperty("materialUnit") + private String materialUnit; + @JsonProperty("batchNo") + private String batchNo; + @JsonProperty("invoiceNo") + private String invoiceNo; + @JsonProperty("invoiceDate") + private String invoiceDate; + @JsonProperty("quantity") + private Integer quantity; + @JsonProperty("importPrc") + private Double importPrc; + @JsonProperty("importMoney") + private Integer importMoney; + @JsonProperty("factoryCode") + private String factoryCode; + @JsonProperty("factoryName") + private String factoryName; +} 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 4934e5b..59533ba 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -457,12 +457,12 @@ public class PtxhyyClient extends CommonHttpClient { ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse(); thrInvResultResponse.setThrCode(ptxhInvResponse.getFyxh()); thrInvResultResponse.setCpmctymc(ptxhInvResponse.getFymc()); - thrInvResultResponse.setPrice(ptxhInvResponse.getFydj()); + thrInvResultResponse.setPrice(BigDecimal.valueOf(Double.parseDouble(ptxhInvResponse.getFydj()))); thrInvResultResponse.setMeasname(ptxhInvResponse.getDw()); thrInvResultResponse.setDeptName(ptxhInvResponse.getZxks()); thrInvResultResponse.setInvName(ptxhInvResponse.getZxks()); thrInvResultResponse.setType(ptxhInvResponse.getLb()); - thrInvResultResponse.setRelCount(ptxhInvResponse.getZsl()); + thrInvResultResponse.setReCount(ptxhInvResponse.getZsl()); thrInvResultResponses.add(thrInvResultResponse); } } diff --git a/src/main/java/com/glxp/mipsdl/constant/Constants.java b/src/main/java/com/glxp/mipsdl/constant/Constants.java index 84a6869..01e9c15 100644 --- a/src/main/java/com/glxp/mipsdl/constant/Constants.java +++ b/src/main/java/com/glxp/mipsdl/constant/Constants.java @@ -81,6 +81,12 @@ public interface Constants { */ String URI_GET_HSLB = "getHslbUrl"; + + /** + * 获取库存出入库明细 + */ + String URL_GET_INV_RESULT = "getInvResultUrl"; + //上传数据到UDI管理系统URL名称合集 /** diff --git a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java index dc21fc3..1d762aa 100644 --- a/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java +++ b/src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java @@ -1,6 +1,7 @@ package com.glxp.mipsdl.controller; import com.glxp.mipsdl.client.ClientProcessor; +import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity; import com.glxp.mipsdl.client.pzh.PzhzdClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest; @@ -129,6 +130,18 @@ public class UdiWmsController { return ClientProcessor.getHttpClient().getInvResult(udiwmsInvProductsRequest); } + /** + * 获取库存产出入库扫码明细 + * + * @param udiwmsInvProductsRequest + * @return + */ + @PostMapping("/udiwms/erp/inv/getInvCodeResult") + public BaseResponse getInvCodeResult(@RequestBody UdiwmsInvProductsRequest udiwmsInvProductsRequest) { + return ClientProcessor.getHttpClient().getInvCodeResult(udiwmsInvProductsRequest); + } + + /** * 提交产品到第三方系统接口 * @@ -136,6 +149,7 @@ public class UdiWmsController { * @return */ @PostMapping("/udiwms/erp/post/product") + public BaseResponse postProduct(@RequestBody UdiwmsAddProductsRequest udiwmsAddProductsRequest) { return ClientProcessor.getHttpClient().submitProducts(udiwmsAddProductsRequest); } diff --git a/src/main/java/com/glxp/mipsdl/req/ctqyy/CtqyyInvRequest.java b/src/main/java/com/glxp/mipsdl/req/ctqyy/CtqyyInvRequest.java new file mode 100644 index 0000000..3d68f9b --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/req/ctqyy/CtqyyInvRequest.java @@ -0,0 +1,13 @@ +package com.glxp.mipsdl.req.ctqyy; + +import lombok.Data; + +@Data +public class CtqyyInvRequest { + + private String startdate; + private String enddate; + private Integer page; + private Integer limit; + +} diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java index da4ff52..fef805d 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java @@ -2,33 +2,159 @@ package com.glxp.mipsdl.res.udiwms; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + @Data public class ThrInvResultResponse { + private Integer id; + + /** + * 产品通用名称 + */ private String cpmctymc; + + + /** + * 第三方项目编码/耗材字典 + */ private String thrCode; + + /** + * DI + */ private String nameCode; + + /** + * 规格型号 + */ private String ggxh; + + /** + * 批次号 + */ private String batchNo; + + /** + * 计量单位 + */ private String measname; - private String price; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 生产日期 + */ private String productionDate; + + /** + * 失效日期 + */ private String expireDate; + + /** + * 医疗器械注册备案人 + */ private String ylqxzcrbarmc; + + /** + * 注册/备案号 + */ private String zczbhhzbapzbh; + + /** + * 入库数量 + */ private String inCount; + + /** + * 出库数量 + */ private String outCount; - private String relCount; + + /** + * 供应商 + */ private String supName; + + /** + * 部门 + */ private String deptName; + + /** + * 部门编码 + */ private String deptCode; + + /** + * 仓库 + */ private String invName; + + /** + * 仓库编码 + */ private String invCode; + + /** + * 货位 + */ + private String spaceCode; + + /** + * 货位编码 + */ + private String spaceName; + + + /** + * 出入库类型 + */ + private String mainAction; + + /** + * 生产企业 + */ + private String manufacturer; + /** + * 生产企业编码 + */ + private String manufactoryCode; + + /** + * 备注 + */ private String remark; + + /** + * 第三方单据类型 + */ + private String billType; + + /** + * 实际数量 + */ + private String reCount; /** * 数据类型：住院、门诊等 */ private String type; + /** + * 总金额 + */ + private BigDecimal amount; + + /** + * UDI码 + */ + private String udiCode; + + }