From 147c9f3fa9e9f865a4f79e27a80937aa8633d29c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 28 Jul 2024 19:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoSplitController.java | 51 ++++++- .../dao/inout/IoSplitCodeDetailMapper.java | 9 ++ .../glxp/api/dao/inout/IoSplitCodeMapper.java | 5 + .../entity/inout/IoSplitCodeDetailEntity.java | 43 +++--- .../api/req/inout/IoSplitCodeRequest.java | 139 ++++++++++++++++++ .../req/inout/IoSplitDetailCodeRequest.java | 69 +++++++++ .../res/basic/BasicSkPrescribeResponse.java | 7 + .../res/inout/IoSplitCodeDetailResponse.java | 74 ++++++++++ .../inout/IoSplitCodeDetailService.java | 19 +++ .../api/service/inout/IoSplitCodeService.java | 20 ++- .../mapper/auth/SysCustomConfigDao.xml | 2 +- .../mapper/inout/IoSplitCodeDetailMapper.xml | 45 +++--- .../mapper/inout/IoSplitCodeMapper.xml | 69 +++++---- src/main/resources/schemas/schema_v2.4.sql | 58 ++++++++ 14 files changed, 529 insertions(+), 81 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java create mode 100644 src/main/java/com/glxp/api/req/inout/IoSplitDetailCodeRequest.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 8ebbecb82..0e6c61fbe 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -1,12 +1,26 @@ package com.glxp.api.controller.inout; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; +import com.glxp.api.req.inout.IoSplitCodeRequest; +import com.glxp.api.req.inout.IoSplitDetailCodeRequest; +import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import com.glxp.api.service.inout.IoSplitCodeDetailService; import com.glxp.api.service.inout.IoSplitCodeService; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; @Slf4j @RestController @@ -18,8 +32,43 @@ public class IoSplitController extends BaseController { @Resource IoSplitCodeDetailService splitCodeDetailService; + /** + * 器械拆零按码查询 + * + * @return + */ + @GetMapping("/udiwms/ioSplit/material/code/filter") + public BaseResponse filterByCode(IoSplitCodeRequest splitCodeRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List splitCodeEntities = splitCodeService.filterList(splitCodeRequest); + PageInfo pageInfo = new PageInfo<>(splitCodeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(splitCodeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } - + /** + * 器械拆零按处方查询 + * + * @return + */ + @GetMapping("/udiwms/ioSplit/material/prescribe/filter") + public BaseResponse filterByPrescribe(IoSplitDetailCodeRequest splitDetailCodeRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List splitCodeEntities = splitCodeDetailService.filterList(splitDetailCodeRequest); + PageInfo pageInfo = new PageInfo<>(splitCodeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(splitCodeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java index 15496213d..a912fb09a 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java @@ -2,8 +2,17 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inout.IoSplitCodeDetailEntity; +import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.glxp.api.req.inout.IoSplitCodeRequest; +import com.glxp.api.req.inout.IoSplitDetailCodeRequest; +import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface IoSplitCodeDetailMapper extends BaseMapper { + + List filterList(IoSplitDetailCodeRequest splitDetailCodeRequest); + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java index 4dcc3d714..4ecee6bac 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java @@ -2,8 +2,13 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.glxp.api.req.inout.IoSplitCodeRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface IoSplitCodeMapper extends BaseMapper { + + List filterList(IoSplitCodeRequest splitCodeRequest); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java index 5fb578b34..858836eb9 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java @@ -6,96 +6,97 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; import java.util.Date; + import lombok.Data; /** - * 拆零出库明细表 - */ -@ApiModel(value="com-glxp-api-entity-inout-IoSplitCodeDetail") + * 拆零出库明细表 + */ +@ApiModel(value = "com-glxp-api-entity-inout-IoSplitCodeDetail") @Data @TableName(value = "io_split_code_detail") public class IoSplitCodeDetailEntity implements Serializable { @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Integer id; /** * 拆零表ID外键 */ @TableField(value = "codeIdFk") - @ApiModelProperty(value="拆零表ID外键") + @ApiModelProperty(value = "拆零表ID外键") private Integer codeIdFk; - /** - * UDI码 - */ - @TableField(value = "udiCodoe") - @ApiModelProperty(value="UDI码") - private String udiCodoe; /** * 患者编码 */ @TableField(value = "sickerCode") - @ApiModelProperty(value="患者编码") + @ApiModelProperty(value = "患者编码") private String sickerCode; /** * 患者住院号 */ @TableField(value = "adNum") - @ApiModelProperty(value="患者住院号") + @ApiModelProperty(value = "患者住院号") private String adNum; /** * 出库数量 */ @TableField(value = "`count`") - @ApiModelProperty(value="出库数量") + @ApiModelProperty(value = "出库数量") private Integer count; /** * 处方单号 */ @TableField(value = "prescribeNum") - @ApiModelProperty(value="处方单号") + @ApiModelProperty(value = "处方单号") private String prescribeNum; + @TableField(value = "itemCode") + @ApiModelProperty(value = "收费项目编码") + private String itemCode; + + /** * 来源类型：1：手动出库；2：处方自动生成 */ @TableField(value = "createType") - @ApiModelProperty(value="来源类型：1：手动出库；2：处方自动生成") - private Byte createType; + @ApiModelProperty(value = "来源类型：1：手动出库；2：处方自动生成") + private Integer createType; /** * 创建时间 */ @TableField(value = "createTime") - @ApiModelProperty(value="创建时间") + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 创建人 */ @TableField(value = "`createUser`") - @ApiModelProperty(value="创建人") + @ApiModelProperty(value = "创建人") private String createUser; /** * 更新时间 */ @TableField(value = "updateTime") - @ApiModelProperty(value="更新时间") + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 备注 */ @TableField(value = "remark") - @ApiModelProperty(value="备注") + @ApiModelProperty(value = "备注") private String remark; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java new file mode 100644 index 000000000..0769ec392 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java @@ -0,0 +1,139 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitCodeRequest extends ListPageRequest { + + private Integer id; + + /** + * UDI码 + */ + private String code; + + /** + * 缺少GS1标识UDI码 + */ + private String errUdiCode; + + /** + * 所属出库单号 + */ + private String orderId; + + /** + * 单据类型 + */ + private String action; + + /** + * 物资字典主键 + */ + private Long relId; + + /** + * 最小销售产品标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 供应商ID + */ + private Long supId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 货位编码 + */ + private String warehouseCode; + + /** + * 1:耗材；2：药品 + */ + private Integer productType; + + /** + * 1:手动扫码拆包；2.自动拆包 + */ + private Integer splitType; + + /** + * 扫码数量 + */ + private Integer scanCount; + + /** + * 总数量 + */ + private Integer totalCount; + + /** + * 剩余数量 + */ + private Integer remainCount; + + /** + * 内部批号 + */ + private String inBactchNo; + + /** + * 创建日期 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createUser; + + /** + * 更新日期 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 工位 + */ + private String workPlaceCode; + + +} diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitDetailCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitDetailCodeRequest.java new file mode 100644 index 000000000..d1bf11d7e --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/IoSplitDetailCodeRequest.java @@ -0,0 +1,69 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDetailCodeRequest extends ListPageRequest { + + + private Integer id; + + /** + * 拆零表ID外键 + */ + private Integer codeIdFk; + + + /** + * 患者编码 + */ + private String sickerCode; + + /** + * 患者住院号 + */ + private String adNum; + + /** + * 出库数量 + */ + private Integer count; + + /** + * 处方单号 + */ + private String prescribeNum; + + private String itemCode; + + + /** + * 来源类型：1：手动出库；2：处方自动生成 + */ + private Integer createType; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + private String sickName; +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java index 7ec594ce5..d443379d8 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java @@ -22,6 +22,11 @@ public class BasicSkPrescribeResponse { */ private String sickCode; + /** + * 住院号 + */ + private String adNum; + /** * 开方时间 */ @@ -73,6 +78,8 @@ public class BasicSkPrescribeResponse { */ private LocalDateTime updateTime; + private String sickName; + /** * 处方明细 diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java new file mode 100644 index 000000000..93b0ae942 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoSplitCodeDetailResponse.java @@ -0,0 +1,74 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitCodeDetailResponse { + + + private Integer id; + + /** + * 拆零表ID外键 + */ + private Integer codeIdFk; + + + /** + * 患者编码 + */ + private String sickerCode; + + /** + * 患者住院号 + */ + private String adNum; + + /** + * 出库数量 + */ + private Integer count; + + /** + * 处方单号 + */ + private String prescribeNum; + + private String itemCode; + + + /** + * 来源类型：1：手动出库；2：处方自动生成 + */ + private Integer createType; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + + private String code; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String orderId; +} diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java index 7279bdfcb..5f6565b1b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java @@ -1,10 +1,29 @@ package com.glxp.api.service.inout; +import com.github.pagehelper.PageHelper; +import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.glxp.api.req.inout.IoSplitCodeRequest; +import com.glxp.api.req.inout.IoSplitDetailCodeRequest; +import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inout.IoSplitCodeDetailMapper; import com.glxp.api.entity.inout.IoSplitCodeDetailEntity; + +import java.util.Collections; +import java.util.List; + @Service public class IoSplitCodeDetailService extends ServiceImpl { + public List filterList(IoSplitDetailCodeRequest splitDetailCodeRequest) { + if (splitDetailCodeRequest == null) { + return Collections.emptyList(); + } + if (splitDetailCodeRequest.getPage() != null) { + int offset = (splitDetailCodeRequest.getPage() - 1) * splitDetailCodeRequest.getLimit(); + PageHelper.offsetPage(offset, splitDetailCodeRequest.getLimit()); + } + return super.baseMapper.filterList(splitDetailCodeRequest); + } } 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 6b807825a..641137a87 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -1,10 +1,26 @@ package com.glxp.api.service.inout; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoSplitCodeMapper; +import com.glxp.api.entity.inout.IoSplitCodeEntity; +import com.glxp.api.req.inout.IoSplitCodeRequest; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + @Service public class IoSplitCodeService extends ServiceImpl { + public List filterList(IoSplitCodeRequest splitCodeRequest) { + if (splitCodeRequest == null) { + return Collections.emptyList(); + } + if (splitCodeRequest.getPage() != null) { + int offset = (splitCodeRequest.getPage() - 1) * splitCodeRequest.getLimit(); + PageHelper.offsetPage(offset, splitCodeRequest.getLimit()); + } + return super.baseMapper.filterList(splitCodeRequest); + } } diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml index ec84e5168..1a6c63b83 100644 --- a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDao.xml @@ -8,7 +8,7 @@ FROM sys_custom_config - AND businessType = #{businessType} + AND businessType like concat('%', #{businessType}, '%') AND remark like concat('%', #{remark}, '%') diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml index 27635940f..2d89df29b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml @@ -1,25 +1,28 @@ - - - - - - - - - - - - - - - - - - - id, codeIdFk, udiCodoe, sickerCode, adNum, `count`, prescribeNum, createType, createTime, - `createUser`, updateTime, remark - + diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml index e298718c1..13107ad03 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml @@ -1,39 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, code, errUdiCode, orderId, `action`, relId, nameCode, batchNo, produceDate, expireDate, - serialNo, supId, deptCode, invCode, warehouseCode, productType, splitType, scanCount, - totalCount, remainCount, inBactchNo, createTime, `createUser`, updateTime, remark - + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index d68f5008e..6a8e530fa 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3991,6 +3991,64 @@ VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', N NULL, NULL, NULL, NULL, NULL, NULL, 4, 1, '', NULL, '', '2024-07-26 15:48:48', '', NULL); +CREATE TABLE IF NOT EXISTS `io_split_code` +( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码', + `errUdiCode` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '缺少GS1标识UDI码', + `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属出库单号', + `action` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据类型', + `relId` bigint NULL DEFAULT NULL COMMENT '物资字典主键', + `nameCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售产品标识', + `batchNo` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `supId` bigint NULL DEFAULT NULL COMMENT '供应商ID', + `deptCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `invCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + `warehouseCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', + `workPlaceCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工位', + `productType` tinyint NULL DEFAULT NULL COMMENT '1:耗材；2：药品', + `splitType` tinyint NULL DEFAULT NULL COMMENT '1:手动扫码拆包；2.自动拆包', + `scanCount` int NULL DEFAULT NULL COMMENT '扫码数量', + `totalCount` int NULL DEFAULT NULL COMMENT '总数量', + `remainCount` int NULL DEFAULT NULL COMMENT '剩余数量', + `inBactchNo` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '内部批号', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', + `createUser` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '科室出库码拆零表' + ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +CREATE TABLE IF NOT EXISTS `io_split_code_detail` +( + `id` int NOT NULL AUTO_INCREMENT, + `codeIdFk` int NULL DEFAULT NULL COMMENT '拆零表ID外键', + `udiCodoe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码', + `sickerCode` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '患者编码', + `adNum` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '患者住院号', + `count` int NULL DEFAULT NULL COMMENT '出库数量', + `prescribeNum` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '处方单号', + `createType` tinyint NULL DEFAULT NULL COMMENT '来源类型：1：手动出库；2：处方自动生成', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `createUser` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '拆零出库明细表' + ROW_FORMAT = DYNAMIC; + + + + CALL Pro_Temp_ColumnWork('pur_receive', 'productType',