From 1f791a88e74b06c0b2fb7da207b2e50ec4754cb1 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 23 Dec 2024 20:56:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?12/23=20=E5=90=8C=E6=AD=A5=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=BA=A7=E5=93=81=E5=91=A2=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/service/sync/HeartService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 7038fb763..cfc7503c0 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1882,6 +1882,7 @@ public class HeartService { // basicProductsDao.replaceBatchs(productsList, 1000); } if (CollectionUtil.isNotEmpty(relevanceList)) { + relevanceDao.replaceBatch(relevanceList); } if (CollectionUtil.isNotEmpty(corpList)) { corpDao.replaceBatch(corpList); From 3889e77a2c547d80b95b3c652282db30a705dd13 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 23 Dec 2024 20:59:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7?= =?UTF-8?q?=E4=B8=8E=E5=8C=BB=E4=BF=9D=E6=A0=A1=E9=AA=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 7 +++++-- .../glxp/api/service/collect/down/ThrOrderDownload.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index dc89c0b52..fa17d7e0f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -989,9 +989,12 @@ public class IoCodeTempController extends BaseController { if (codeEnttitys.size() > 0) { exitLocalEntity = isExitLocal(code, codeEnttitys); if (exitLocalEntity != null) { - if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) { - return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！"); + if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT))) { + if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) { + return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！"); + } } + udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null); BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 3c080e846..7ae2ac833 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -121,9 +121,11 @@ public class ThrOrderDownload implements IDownload { prefixMatchWrapper.apply("LEFT(ybbm, 20) = LEFT({0}, 20)", entity.getCheckCode()); exactMatches = basicProductsDao.selectList(prefixMatchWrapper); } + collectOrderBiz.setRelId(entity.getRelId()); if (exactMatches.isEmpty()) { errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";"); } + } else { BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1")); if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) { From 6c9ca5f0d79e4af03a7022a5b18d598925e19936 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 24 Dec 2024 11:09:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/collect/down/ThrOrderDownload.java | 2 -- .../java/com/glxp/api/service/inout/IoSplitCodeService.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 7ae2ac833..944fbd7e8 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -109,7 +109,6 @@ public class ThrOrderDownload implements IDownload { if (BusTypeConstant.QXCF001.getBusType().equals(collectOrderRequest.getBusType())) { collectOrderBiz.setRelId(entity.getRelId()); - if (StrUtil.isNotEmpty(entity.getCheckCode())) { // 1. 先查询完全匹配的情况 LambdaQueryWrapper exactMatchWrapper = new LambdaQueryWrapper<>(); @@ -121,7 +120,6 @@ public class ThrOrderDownload implements IDownload { prefixMatchWrapper.apply("LEFT(ybbm, 20) = LEFT({0}, 20)", entity.getCheckCode()); exactMatches = basicProductsDao.selectList(prefixMatchWrapper); } - collectOrderBiz.setRelId(entity.getRelId()); if (exactMatches.isEmpty()) { errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";"); } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index db6f3d3da..729da4c4a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -331,19 +331,19 @@ public class IoSplitCodeService extends ServiceImpl 0) { - List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(),queueCode ); + List ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), queueCode); if (ioSplitFifoCodeEntities.size() < quotient) { if (isAuto) throw new JsonException(500, "提交失败，工位库存数量不足！"); // else return; } - if (ioSplitFifoCodeEntities.size() > 0){ + if (ioSplitFifoCodeEntities.size() > 0) { for (int i = 0; i < quotient; i++) { IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i); collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl())); From 4b48e22345d082819fe6be9c9f5511b031184dd9 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 24 Dec 2024 15:09:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=8D=AF=E6=9C=BA=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/DrugMachineController.java | 48 ++++++++ .../com/glxp/api/http/ErpBasicClient.java | 24 ++++ .../req/drugMachine/PutGoodsA001Request.java | 98 ++++++++++++++++ .../req/drugMachine/PutGoodsB001Request.java | 98 ++++++++++++++++ .../req/drugMachine/SendGoodsB002Request.java | 105 ++++++++++++++++++ .../service/thrsys/DrugMachineService.java | 60 ++++++++++ 6 files changed, 433 insertions(+) create mode 100644 src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java create mode 100644 src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java create mode 100644 src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java create mode 100644 src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/DrugMachineService.java diff --git a/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java b/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java new file mode 100644 index 000000000..8a801d38e --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java @@ -0,0 +1,48 @@ +package com.glxp.api.controller.thrsys; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.req.drugMachine.PutGoodsA001Request; +import com.glxp.api.req.drugMachine.PutGoodsB001Request; +import com.glxp.api.req.drugMachine.SendGoodsB002Request; +import com.glxp.api.service.thrsys.DrugMachineService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Slf4j +@RestController +public class DrugMachineController { + + + @Resource + DrugMachineService drugMachineService; + + /** + * B001 + * 发药机上货接口2 + * 药械追溯管理系统提供接收接口，接收发药机上货信息 + * @param putGoodsB001Request + * @return + */ + @PostMapping("/drugMachine/putGoods/B001") + public BaseResponse putGoodsB001(@RequestBody PutGoodsB001Request putGoodsB001Request) { + return drugMachineService.putGoodsB001(putGoodsB001Request); + } + + + /** + * B002 + * 发药机发药接口 + * 药械追溯管理系统提供接收接口，接收发药机发药信息 + * @param sendGoodsB002Request + * @return + */ + @PostMapping("/drugMachine/sendGoods/B002") + public BaseResponse sendGoodsB002(@RequestBody SendGoodsB002Request sendGoodsB002Request) { + return drugMachineService.sendGoodsB002(sendGoodsB002Request); + } +} diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index b172ff341..890ed5949 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -14,6 +14,7 @@ import com.glxp.api.http.req.UdiwmsBusTypeRequest; import com.glxp.api.http.req.UdiwmsUnitRequest; import com.glxp.api.req.basic.*; import com.glxp.api.req.collect.PostCollectOrderRequest; +import com.glxp.api.req.drugMachine.PutGoodsA001Request; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; @@ -526,4 +527,27 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); } } + + + + + + public BaseResponse> putGoodsA001(PutGoodsA001Request putGoodsA001Request,String thirdSys) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys); + String url = basicThirdSysEntity.getThridUrl() + "/drugMachine/putGoods/A001"; + try { + String response = okHttpCli.doGet(url); + if (StrUtil.isEmpty(response)) { + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + BaseResponse> listBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + + return listBaseResponse; + } catch (Exception e) { + log.error("获取发药机上货接口1", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); + } + } } diff --git a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java new file mode 100644 index 000000000..aed8dbd94 --- /dev/null +++ b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java @@ -0,0 +1,98 @@ +package com.glxp.api.req.drugMachine; + +import lombok.Data; + +@Data +public class PutGoodsA001Request { + + /** + * 是必要参数 + * 记录号 + */ + private String orderId; + + /** + * 是必要参数 + * 轨道编号 + */ + private String queueCode; + + /** + * 是必要参数 + * 药品追溯码 + */ + private String code; + + /** + * 是必要参数 + * 产品编码 + */ + private String productCode; + + /** + * 是必要参数 + * 产品通用名称 + */ + private String productName; + + /** + * 是必要参数 + * 包装规格 + */ + private String bzgg; + + /** + * 是必要参数 + * 计量单位 + */ + private String unit; + + /** + * 是必要参数 + * 批准文号 + */ + private String approvalNum; + + /** + * 是必要参数 + * 制剂单位 + */ + private String prepnUnit; + + /** + * 是必要参数 + * 制剂规格 + */ + private String prepnSpec; + + /** + * 是必要参数 + * 数量 + */ + private Integer count; + + /** + * 备用字段1 + */ + private String remark1; + + /** + * 备用字段2 + */ + private String remark2; + + /** + * 备用字段3 + */ + private String remark3; + + /** + * 备用字段4 + */ + private String remark4; + + /** + * 备用字段5 + */ + private String remark5; +} diff --git a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java new file mode 100644 index 000000000..eca6d41f3 --- /dev/null +++ b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java @@ -0,0 +1,98 @@ +package com.glxp.api.req.drugMachine; + +import lombok.Data; + +@Data +public class PutGoodsB001Request { + + /** + * 是必要参数 + * 记录号 + */ + private String orderId; + + /** + * 是必要参数 + * 轨道编号 + */ + private String queueCode; + + /** + * 是必要参数 + * 药品追溯码 + */ + private String code; + + /** + * 是必要参数 + * 产品编码 + */ + private String productCode; + + /** + * 是必要参数 + * 产品通用名称 + */ + private String productName; + + /** + * 是必要参数 + * 包装规格 + */ + private String bzgg; + + /** + * 是必要参数 + * 计量单位 + */ + private String unit; + + /** + * 是必要参数 + * 批准文号 + */ + private String approvalNum; + + /** + * 是必要参数 + * 制剂单位 + */ + private String prepnUnit; + + /** + * 是必要参数 + * 制剂规格 + */ + private String prepnSpec; + + /** + * 是必要参数 + * 数量 + */ + private Integer count; + + /** + * 备用字段1 + */ + private String remark1; + + /** + * 备用字段2 + */ + private String remark2; + + /** + * 备用字段3 + */ + private String remark3; + + /** + * 备用字段4 + */ + private String remark4; + + /** + * 备用字段5 + */ + private String remark5; +} diff --git a/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java b/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java new file mode 100644 index 000000000..b5fee41c2 --- /dev/null +++ b/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java @@ -0,0 +1,105 @@ +package com.glxp.api.req.drugMachine; + +import lombok.Data; + +@Data +public class SendGoodsB002Request { + + + /** + * 是必要参数 + * 记录号 + */ + private String orderId; + + /** + * 是必要参数 + * 处方单号 + */ + private String prescribeNum; + + /** + * 是必要参数 + * 收货方 + */ + private String fromCorp; + + /** + * 是必要参数 + * 轨道编号 + */ + private String queueCode; + + /** + * 是必要参数 + * 产品编码 + */ + private String productCode; + + /** + * 是必要参数 + * 产品通用名称 + */ + private String productName; + + /** + * 是必要参数 + * 包装规格 + */ + private String bzgg; + + /** + * 是必要参数 + * 计量单位 + */ + private String unit; + + /** + * 是必要参数 + * 批准文号 + */ + private String approvalNum; + + /** + * 是必要参数 + * 制剂单位 + */ + private String prepnUnit; + + /** + * 是必要参数 + * 制剂规格 + */ + private String prepnSpec; + + /** + * 是必要参数 + * 数量 + */ + private Integer count; + + /** + * 备用字段1 + */ + private String remark1; + + /** + * 备用字段2 + */ + private String remark2; + + /** + * 备用字段3 + */ + private String remark3; + + /** + * 备用字段4 + */ + private String remark4; + + /** + * 备用字段5 + */ + private String remark5; +} diff --git a/src/main/java/com/glxp/api/service/thrsys/DrugMachineService.java b/src/main/java/com/glxp/api/service/thrsys/DrugMachineService.java new file mode 100644 index 000000000..5a16500e1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/DrugMachineService.java @@ -0,0 +1,60 @@ +package com.glxp.api.service.thrsys; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.drugMachine.PutGoodsA001Request; +import com.glxp.api.req.drugMachine.PutGoodsB001Request; +import com.glxp.api.req.drugMachine.SendGoodsB002Request; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +@Slf4j +public class DrugMachineService { + + + @Resource + ErpBasicClient erpBasicClient; + + /** + * A001 + * 发药机上货接口1 + * 发药机提供接收接口，接收药械追溯管理系统的上货信息 + * @param putGoodsA001Request + * @return + */ + public BaseResponse putGoodsA001(PutGoodsA001Request putGoodsA001Request){ + return erpBasicClient.putGoodsA001(putGoodsA001Request,"thirdSys"); + } + + /** + * B001 + * 发药机上货接口2 + * 药械追溯管理系统提供接收接口，接收发药机上货信息 + * @param putGoodsB001Request + * @return + */ + public BaseResponse putGoodsB001(PutGoodsB001Request putGoodsB001Request) { + + // TODO: 2024/12/24 + return ResultVOUtils.success(); + } + + /** + * B002 + * 发药机发药接口 + * 药械追溯管理系统提供接收接口，接收发药机发药信息 + * @param sendGoodsB002Request + * @return + */ + public BaseResponse sendGoodsB002(SendGoodsB002Request sendGoodsB002Request) { + // TODO: 2024/12/24 + return ResultVOUtils.success(); + } + + + +} From e50dd6fc739ac51bdbd4919e289e93d7f61287f9 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 24 Dec 2024 15:30:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=8D=AF=E6=9C=BA=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../req/drugMachine/PutGoodsA001Request.java | 49 +++++++---------- .../req/drugMachine/PutGoodsB001Request.java | 54 ++++++++----------- .../req/drugMachine/SendGoodsB002Request.java | 53 +++++++++--------- 3 files changed, 66 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java index aed8dbd94..ee219acb2 100644 --- a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java +++ b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsA001Request.java @@ -2,6 +2,8 @@ package com.glxp.api.req.drugMachine; import lombok.Data; +import java.sql.Date; + @Data public class PutGoodsA001Request { @@ -13,86 +15,75 @@ public class PutGoodsA001Request { /** * 是必要参数 - * 轨道编号 + * 产品编码 */ - private String queueCode; + private String productCode; /** * 是必要参数 - * 药品追溯码 + * 产品通用名称 */ - private String code; + private String productName; /** * 是必要参数 - * 产品编码 + * 上货时间 */ - private String productCode; + private Date putTime; /** * 是必要参数 - * 产品通用名称 + * 数量 */ - private String productName; + private Integer count; /** - * 是必要参数 - * 包装规格 + * 包装规格（可选） */ private String bzgg; /** - * 是必要参数 - * 计量单位 + * 计量单位（可选） */ private String unit; /** - * 是必要参数 - * 批准文号 + * 批准文号（可选） */ private String approvalNum; /** - * 是必要参数 - * 制剂单位 + * 制剂单位（可选） */ private String prepnUnit; /** - * 是必要参数 - * 制剂规格 + * 制剂规格（可选） */ private String prepnSpec; /** - * 是必要参数 - * 数量 - */ - private Integer count; - - /** - * 备用字段1 + * 备用字段1（可选） */ private String remark1; /** - * 备用字段2 + * 备用字段2（可选） */ private String remark2; /** - * 备用字段3 + * 备用字段3（可选） */ private String remark3; /** - * 备用字段4 + * 备用字段4（可选） */ private String remark4; /** - * 备用字段5 + * 备用字段5（可选） */ private String remark5; } diff --git a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java index eca6d41f3..2f2e9dbd1 100644 --- a/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java +++ b/src/main/java/com/glxp/api/req/drugMachine/PutGoodsB001Request.java @@ -2,97 +2,87 @@ package com.glxp.api.req.drugMachine; import lombok.Data; +import java.util.Date; + @Data public class PutGoodsB001Request { - /** - * 是必要参数 * 记录号 */ private String orderId; /** - * 是必要参数 * 轨道编号 */ private String queueCode; /** - * 是必要参数 - * 药品追溯码 - */ - private String code; - - /** - * 是必要参数 * 产品编码 */ private String productCode; /** - * 是必要参数 * 产品通用名称 */ private String productName; /** - * 是必要参数 - * 包装规格 + * 上货时间 + */ + private Date putTime; + + /** + * 数量 + */ + private Integer count; + + /** + * 包装规格（可选） */ private String bzgg; /** - * 是必要参数 - * 计量单位 + * 计量单位（可选） */ private String unit; /** - * 是必要参数 - * 批准文号 + * 批准文号（可选） */ private String approvalNum; /** - * 是必要参数 - * 制剂单位 + * 制剂单位（可选） */ private String prepnUnit; /** - * 是必要参数 - * 制剂规格 + * 制剂规格（可选） */ private String prepnSpec; /** - * 是必要参数 - * 数量 - */ - private Integer count; - - /** - * 备用字段1 + * 备用字段1（可选） */ private String remark1; /** - * 备用字段2 + * 备用字段2（可选） */ private String remark2; /** - * 备用字段3 + * 备用字段3（可选） */ private String remark3; /** - * 备用字段4 + * 备用字段4（可选） */ private String remark4; /** - * 备用字段5 + * 备用字段5（可选） */ private String remark5; } diff --git a/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java b/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java index b5fee41c2..8dbdc7074 100644 --- a/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java +++ b/src/main/java/com/glxp/api/req/drugMachine/SendGoodsB002Request.java @@ -2,104 +2,99 @@ package com.glxp.api.req.drugMachine; import lombok.Data; +import java.util.Date; + @Data public class SendGoodsB002Request { /** - * 是必要参数 * 记录号 */ private String orderId; /** - * 是必要参数 - * 处方单号 + * 处方单号（可选） */ private String prescribeNum; /** - * 是必要参数 - * 收货方 + * 收货方（可选） */ private String fromCorp; /** - * 是必要参数 * 轨道编号 */ private String queueCode; /** - * 是必要参数 * 产品编码 */ private String productCode; /** - * 是必要参数 * 产品通用名称 */ private String productName; /** - * 是必要参数 - * 包装规格 + * 发药时间 + */ + private Date disTime; + + /** + * 数量 + */ + private Integer count; + + /** + * 包装规格（可选） */ private String bzgg; /** - * 是必要参数 - * 计量单位 + * 计量单位（可选） */ private String unit; /** - * 是必要参数 - * 批准文号 + * 批准文号（可选） */ private String approvalNum; /** - * 是必要参数 - * 制剂单位 + * 制剂单位（可选） */ private String prepnUnit; /** - * 是必要参数 - * 制剂规格 + * 制剂规格（可选） */ private String prepnSpec; /** - * 是必要参数 - * 数量 - */ - private Integer count; - - /** - * 备用字段1 + * 备用字段1（可选） */ private String remark1; /** - * 备用字段2 + * 备用字段2（可选） */ private String remark2; /** - * 备用字段3 + * 备用字段3（可选） */ private String remark3; /** - * 备用字段4 + * 备用字段4（可选） */ private String remark4; /** - * 备用字段5 + * 备用字段5（可选） */ private String remark5; }