diff --git a/src/main/java/com/glxp/udidl/admin/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/udidl/admin/controller/collect/IoCollectOrderBackupController.java new file mode 100644 index 0000000..e878cf1 --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/controller/collect/IoCollectOrderBackupController.java @@ -0,0 +1,85 @@ +package com.glxp.udidl.admin.controller.collect; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.glxp.udidl.admin.entity.collect.IoCollectCode; +import com.glxp.udidl.admin.entity.collect.IoCollectCodeBackup; +import com.glxp.udidl.admin.entity.collect.IoCollectOrderBackup; +import com.glxp.udidl.admin.req.collect.PostCollectOrderRequest; +import com.glxp.udidl.admin.res.BaseResponse; +import com.glxp.udidl.admin.service.collect.IoCollectCodeService; +import com.glxp.udidl.admin.util.BeanUtils; +import com.glxp.udidl.admin.util.ResultVOUtils; +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; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@RestController +public class IoCollectOrderBackupController { + + @Resource + IoCollectCodeService ioCollectCodeService; + + /** + * 已完成单据上传 + * + * @param postCollectOrderRequest + * @return + */ + @PostMapping("/collect/order/upload") + public BaseResponse orderUpload(@RequestBody PostCollectOrderRequest postCollectOrderRequest) { + //做数据持久化存储 + + String webTitle = postCollectOrderRequest.getWebTitle(); + List collectOrderList = postCollectOrderRequest.getCollectOrderList(); + + if (CollUtil.isNotEmpty(collectOrderList)){ + for (int i = 0; i < collectOrderList.size(); i++) { + IoCollectOrderBackup ioCollectOrderBackup = collectOrderList.get(i); + List codeList = ioCollectOrderBackup.getCodeList(); + + if (CollUtil.isNotEmpty(codeList)){ + + }else { + //先删除 再新增 + String billNo = ioCollectOrderBackup.getBillNo(); + List list = ioCollectCodeService.list(new LambdaQueryWrapper().eq(IoCollectCode::getBillNo, billNo).eq(IoCollectCode::getWebTitle, webTitle)); + + //如果已存在 删除 + if (CollUtil.isNotEmpty(list)){ + ioCollectCodeService.remove(new LambdaQueryWrapper().eq(IoCollectCode::getBillNo, billNo).eq(IoCollectCode::getWebTitle, webTitle)); + } + + //开始新增 + List addList = new ArrayList<>(); + for (int i1 = 0; i1 < codeList.size(); i1++) { + IoCollectCodeBackup ioCollectCodeBackup = codeList.get(i1); + IoCollectCode ioCollectCode = new IoCollectCode(); + BeanUtils.copyProperties(ioCollectCodeBackup,ioCollectCode); + ioCollectCode.setId(null); + ioCollectCode.setWebTitle(webTitle); + addList.add(ioCollectCode); + } + + if (CollUtil.isNotEmpty(addList)){ + ioCollectCodeService.saveBatch(addList); + } + + } + } + }else { + return ResultVOUtils.error(500,"订单数据为空"); + } + + + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/udidl/admin/dao/collect/IoCollectCodeMapper.java b/src/main/java/com/glxp/udidl/admin/dao/collect/IoCollectCodeMapper.java new file mode 100644 index 0000000..2ebe97b --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/dao/collect/IoCollectCodeMapper.java @@ -0,0 +1,17 @@ +package com.glxp.udidl.admin.dao.collect; + +import com.glxp.udidl.admin.dao.BaseMapperPlus; +import com.glxp.udidl.admin.entity.collect.IoCollectCode; +import com.glxp.udidl.admin.entity.collect.IoCollectCodeBackup; +import com.glxp.udidl.admin.entity.collect.RelCodeBatch; +import com.glxp.udidl.admin.req.collect.RelCodeBatchRequest; +import com.glxp.udidl.admin.res.collect.RelCodeBatchResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoCollectCodeMapper extends BaseMapperPlus { + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/udidl/admin/entity/collect/CollectOrderBizResponse.java new file mode 100644 index 0000000..a5e9f9e --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/entity/collect/CollectOrderBizResponse.java @@ -0,0 +1,162 @@ +package com.glxp.udidl.admin.entity.collect; + +import lombok.Data; + +import java.util.Date; + +/** + * 业务详情 + */ +@Data +public class CollectOrderBizResponse { + + + private Long id; + /** + * 单据号外键 + */ + private String orderIdFk; + + + /** + * 院内编码（第三方编码） + */ + private String thrCode; + + /** + * 医保编码 + */ + private String ybbm; + + /** + * 收费编码 + */ + private String payFeeCode; + + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 单据数量 + */ + private Integer count; + + /** + * 实际数量 + */ + private Integer actCount; + + /** + * 扫码数量 + */ + private Integer scanCount; + + /** + * 扫码实际数量 + */ + private Integer scanActCount; + + /** + * 计量单位 + */ + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + private Integer tagStatus; + + /** + * 赋码错误信息 + */ + private String tagMsg; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 绑定的UDI码 + */ + private String udiCode; + private Long relId; + private Integer unTagCount; + + + private String scanUdiCode; + private String splitUdiCode; + private String unSplitUdiCode; + private String finishUdiCode; + private String bzgg; + + + private Integer autoResCount; + private String replaceCode; + + /** + * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足 + */ + private Integer autoTagStatus; + /** + * 临时工位存量 + */ + private Integer tempWorkPlaceCount; + /** + * 临时拆零存量 + */ + private Integer tempSplitCount; + + private String remark1; + private String remark2; + private String remark3; + private String remark4; + private String remark5; + private String remark6; + private String remark7; + private String remark8; + private String remark9; + private String remark10; + + + private boolean splitUnCheck; + + +} diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCode.java b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCode.java new file mode 100644 index 0000000..8f23e0d --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCode.java @@ -0,0 +1,148 @@ +package com.glxp.udidl.admin.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectCode") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_code") +public class IoCollectCode implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 追溯码（UDI.药品） + */ + @TableField(value = "code") + @ApiModelProperty(value = "追溯码（UDI.药品）") + private String code; + + + @TableField(value = "webTitle") + private String webTitle; + + /** + * 单据来源 + */ + @TableField(value = "fromType") + @ApiModelProperty(value = "单据来源") + private String fromType; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "单据类型") + private String busType; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 往来单位 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value = "往来单位") + private String fromCorp; + + /** + * 操作时间 + */ + @TableField(value = "operTime") + @ApiModelProperty(value = "操作时间") + private Date operTime; + + /** + * 操作人 + */ + @TableField(value = "operUser") + @ApiModelProperty(value = "操作人") + private String operUser; + + /** + * 采集点 + */ + @TableField(value = "collectCode") + @ApiModelProperty(value = "采集点") + private String collectCode; + + /** + * 采集点负责人 + */ + @TableField(value = "collectUser") + @ApiModelProperty(value = "采集点负责人") + private String collectUser; + + /** + * 工位 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value = "工位") + private Long workPlaceCode; + + /** + * 工位负责人 + */ + @TableField(value = "workPlaceUser") + @ApiModelProperty(value = "工位负责人") + private String workPlaceUser; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + + /** + * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码 + */ + @TableField(value = "fifoSplit") + @ApiModelProperty(value = "") + private Integer fifoSplit; + + /** + * 出入库类型（1：入库；2：出库） + */ + @TableField(value = "inoutType") + @ApiModelProperty(value = "出入库类型") + private Integer inoutType; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value = "出入库类型") + private Integer scanCount; + + + /** + * 耗材字典外键id + */ + @TableField(value = "relId") + @ApiModelProperty(value = "耗材字典外键id") + private Long relId; + + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCodeBackup.java b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCodeBackup.java new file mode 100644 index 0000000..784ab9b --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectCodeBackup.java @@ -0,0 +1,144 @@ +package com.glxp.udidl.admin.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectCode") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_code_backup") +public class IoCollectCodeBackup implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 追溯码（UDI.药品） + */ + @TableField(value = "code") + @ApiModelProperty(value = "追溯码（UDI.药品）") + private String code; + + /** + * 单据来源 + */ + @TableField(value = "fromType") + @ApiModelProperty(value = "单据来源") + private String fromType; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "单据类型") + private String busType; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 往来单位 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value = "往来单位") + private String fromCorp; + + /** + * 操作时间 + */ + @TableField(value = "operTime") + @ApiModelProperty(value = "操作时间") + private Date operTime; + + /** + * 操作人 + */ + @TableField(value = "operUser") + @ApiModelProperty(value = "操作人") + private String operUser; + + /** + * 采集点 + */ + @TableField(value = "collectCode") + @ApiModelProperty(value = "采集点") + private String collectCode; + + /** + * 采集点负责人 + */ + @TableField(value = "collectUser") + @ApiModelProperty(value = "采集点负责人") + private String collectUser; + + /** + * 工位 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value = "工位") + private Long workPlaceCode; + + /** + * 工位负责人 + */ + @TableField(value = "workPlaceUser") + @ApiModelProperty(value = "工位负责人") + private String workPlaceUser; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + + /** + * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码 + */ + @TableField(value = "fifoSplit") + @ApiModelProperty(value = "") + private Integer fifoSplit; + + /** + * 出入库类型（1：入库；2：出库） + */ + @TableField(value = "inoutType") + @ApiModelProperty(value = "出入库类型") + private Integer inoutType; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value = "出入库类型") + private Integer scanCount; + + + /** + * 耗材字典外键id + */ + @TableField(value = "relId") + @ApiModelProperty(value = "耗材字典外键id") + private Long relId; + + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBackup.java new file mode 100644 index 0000000..8ae3702 --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBackup.java @@ -0,0 +1,261 @@ +package com.glxp.udidl.admin.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 采集点单据主表 + */ +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrder") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_order_backup") +public class IoCollectOrderBackup implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "单据类型") + private String busType; + + /** + * 来源业务 + */ + @TableField(value = "fromType") + @ApiModelProperty(value = "来源业务") + private String fromType; + + /** + * 来源业务说明 + */ + @TableField(value = "fromTypeDesc") + @ApiModelProperty(value = "来源业务说明") + private String fromTypeDesc; + + /** + * 往来信息 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value = "往来信息") + private String fromCorp; + + /** + * 往来信息名称 + */ + @TableField(value = "fromCorpName") + @ApiModelProperty(value = "往来信息名称") + private String fromCorpName; + + /** + * 单据时间 + */ + @TableField(value = "billTime") + @ApiModelProperty(value = "单据时间") + private Date billTime; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 采集时间 + */ + @TableField(value = "collectTime") + @ApiModelProperty(value = "采集时间") + private Date collectTime; + +// /** +// * 采集点编码 +// */ +// @TableField(value = "collectCode") +// @ApiModelProperty(value = "采集点编码") +// private String collectCode; + + /** + * 工位编码 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value = "工位编码") + private Long workPlaceCode; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + @ApiModelProperty(value = "创建人") + private String createUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + @ApiModelProperty(value = "更新人") + private Long updateUser; + /** + * 赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态，5：库存不足 + */ + @TableField(value = "tagStatus") + private Integer tagStatus; + + /** + * 拆零状态：0：未拆零，1，正在拆零；2,已完成；3.拆零失败 + */ + @TableField(value = "splitStatus") + private Integer splitStatus; + + /** + * 拆零异常信息 + */ + @TableField(value = "splitMsg") + private String splitMsg; + + + /** + * 处方赋码信息 + */ + @TableField(value = "tagMsg") + private String tagMsg; + + /** + * 单据流通方式： 1:配送流通; 2:出库使用 + */ + @TableField(value = "orderCirType") + private Integer orderCirType; + + + /** + * 单据备注1 + */ + @TableField(value = "backupOrderRemark1") + @ApiModelProperty(value = "单据备注1") + private String backupOrderRemark1; + + /** + * 单据备注2 + */ + @TableField(value = "backupOrderRemark2") + @ApiModelProperty(value = "单据备注2") + private String backupOrderRemark2; + + /** + * 单据备注3 + */ + @TableField(value = "backupOrderRemark3") + @ApiModelProperty(value = "单据备注3") + private String backupOrderRemark3; + + /** + * 单据备注4 + */ + @TableField(value = "backupOrderRemark4") + @ApiModelProperty(value = "单据备注4") + private String backupOrderRemark4; + + /** + * 单据备注5 + */ + @TableField(value = "backupOrderRemark5") + @ApiModelProperty(value = "单据备注5") + private String backupOrderRemark5; + + /** + * 单据备注6 + */ + @TableField(value = "backupOrderRemark6") + @ApiModelProperty(value = "单据备注6") + private String backupOrderRemark6; + + /** + * 排序时间 + */ + @TableField(value = "orderTime") + @ApiModelProperty(value = "排序时间") + private Date orderTime; + + + /** + * 库存预警： 1:上锁正常; 2:上锁不足；3:已释放锁 + */ + @TableField(value = "invAlert") + private Integer invAlert; + @TableField(exist = false) + private List collectOrderBizResponseList; + + @TableField(exist = false) + private List bizList; + + @TableField(exist = false) + private List codeList; + + /** + * 异常信息 + */ + @TableField(value = "errorMsg") + private String errorMsg; + + /** + * 上传状态(1.未上传,2.已上传,3.上传失败) + */ + @TableField(value = "uploadStatus") + private Integer uploadStatus; + + /** + * 上传错误信息 + */ + @TableField(value = "uploadError") + private String uploadError; + + + @TableField(value = "shipper") + @ApiModelProperty(value = "发货方编码") + private String shipper; + @TableField(value = "shipperName") + @ApiModelProperty(value = "发货方名称") + private String shipperName; + @TableField(value = "thrBusType") + @ApiModelProperty(value = "第三方单据类型编码") + private String thrBusType; + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBiz.java new file mode 100644 index 0000000..facc6ea --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/entity/collect/IoCollectOrderBiz.java @@ -0,0 +1,277 @@ +package com.glxp.udidl.admin.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 采集点单据详情 + */ +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderBiz") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_order_biz") +public class IoCollectOrderBiz implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Long id; + /** + * 单据号外键 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + + /** + * 耗材字典ID + */ + @TableField(value = "relId") + @ApiModelProperty(value = "耗材字典ID") + private Long relId; + + + /** + * 院内编码（第三方编码） + */ + @TableField(value = "thrCode") + @ApiModelProperty(value = "院内编码（第三方编码）") + private String thrCode; + + /** + * 医保编码 + */ + @TableField(value = "ybbm") + @ApiModelProperty(value = "医保编码") + private String ybbm; + + + /** + * 医保编码 + */ + @TableField(value = "sptm") + @ApiModelProperty(value = "商品条码") + private String sptm; + + /** + * 收费编码 + */ + @TableField(value = "payFeeCode") + @ApiModelProperty(value = "收费编码") + private String payFeeCode; + + /** + * 产品通用名称 + */ + @TableField(value = "cpmctymc") + @ApiModelProperty(value = "产品通用名称") + private String cpmctymc; + + /** + * 产品标识 + */ + @TableField(value = "nameCode") + @ApiModelProperty(value = "产品标识") + private String nameCode; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + @ApiModelProperty(value = "规格型号") + private String ggxh; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + @ApiModelProperty(value = "批次号") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productDate") + @ApiModelProperty(value = "生产日期") + private String productDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + @ApiModelProperty(value = "失效日期") + private String expireDate; + + /** + * 单据数量 + */ + @TableField(value = "`count`") + @ApiModelProperty(value = "单据数量") + private Integer count; + + /** + * 实际数量 + */ + @TableField(value = "actCount") + @ApiModelProperty(value = "实际数量") + private Integer actCount; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value = "扫码数量") + private Integer scanCount; + + /** + * 扫码实际数量 + */ + @TableField(value = "scanActCount") + @ApiModelProperty(value = "扫码实际数量") + private Integer scanActCount; + + /** + * 计量单位 + */ + @TableField(value = "measureUnit") + @ApiModelProperty(value = "计量单位") + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + @TableField(value = "tagStatus") + @ApiModelProperty(value = "单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码") + private Integer tagStatus; + + /** + * 赋码错误信息 + */ + @TableField(value = "tagMsg") + @ApiModelProperty(value = "赋码错误信息") + private String tagMsg; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 未拆零数量 + */ + @TableField(value = "unTagCount") + @ApiModelProperty(value = "未拆零数量") + private Integer unTagCount; + + + /** + * 自动扫描分配的工位存量 锁数量 + */ + @TableField(value = "autoResCount") + @ApiModelProperty(value = "自动扫描分配的工位存量") + private Integer autoResCount; + + /** + * 上传替换码 + */ + @TableField(value = "replaceCode") + @ApiModelProperty(value = "上传替换码") + private String replaceCode; + + /** + * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足 + */ + @TableField(value = "autoTagStatus") + @ApiModelProperty(value = "autoTagStatus") + private Integer autoTagStatus; + + /** + * 临时工位存量 + */ + @TableField(value = "tempWorkPlaceCount") + @ApiModelProperty(value = "tempWorkPlaceCount") + private Integer tempWorkPlaceCount; + + /** + * 拆零未确认 + */ + @TableField(value = "splitUnCheck") + @ApiModelProperty(value = "splitUnCheck") + private boolean splitUnCheck; + + + /** + * 临时拆零存量 + */ + @TableField(value = "tempSplitCount") + @ApiModelProperty(value = "tempSplitCount") + private Integer tempSplitCount; + + @TableField(value = "searchRemark1") + @ApiModelProperty(value = "searchRemark1") + private String searchRemark1; + @TableField(value = "searchRemark2") + @ApiModelProperty(value = "searchRemark2") + private String searchRemark2; + @TableField(value = "searchRemark3") + @ApiModelProperty(value = "searchRemark3") + private String searchRemark3; + @TableField(value = "searchRemark4") + @ApiModelProperty(value = "searchRemark4") + private String searchRemark4; + @TableField(value = "searchRemark5") + @ApiModelProperty(value = "searchRemark5") + private String searchRemark5; + + + @TableField(value = "remark1") + private String remark1; + @TableField(value = "remark2") + private String remark2; + @TableField(value = "remark3") + private String remark3; + @TableField(value = "remark4") + private String remark4; + @TableField(value = "remark5") + private String remark5; + @TableField(value = "remark6") + private String remark6; + @TableField(value = "remark7") + private String remark7; + @TableField(value = "remark8") + private String remark8; + @TableField(value = "remark9") + private String remark9; + @TableField(value = "remark10") + private String remark10; + + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/udidl/admin/req/collect/PostCollectOrderRequest.java b/src/main/java/com/glxp/udidl/admin/req/collect/PostCollectOrderRequest.java new file mode 100644 index 0000000..6204265 --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/req/collect/PostCollectOrderRequest.java @@ -0,0 +1,17 @@ +package com.glxp.udidl.admin.req.collect; + +import com.glxp.udidl.admin.entity.collect.IoCollectOrderBackup; +import lombok.Data; + +import java.util.List; + +@Data +public class PostCollectOrderRequest { + + + private String thirdSys; + private String webTitle; + List collectOrderList; + + +} diff --git a/src/main/java/com/glxp/udidl/admin/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/udidl/admin/service/collect/IoCollectCodeService.java new file mode 100644 index 0000000..105154e --- /dev/null +++ b/src/main/java/com/glxp/udidl/admin/service/collect/IoCollectCodeService.java @@ -0,0 +1,18 @@ +package com.glxp.udidl.admin.service.collect; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.udidl.admin.dao.collect.IoCollectCodeMapper; +import com.glxp.udidl.admin.dao.collect.RelCodeDetailMapper; +import com.glxp.udidl.admin.entity.collect.IoCollectCode; +import com.glxp.udidl.admin.entity.collect.RelCodeDetail; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +@Service +@Slf4j +public class IoCollectCodeService extends ServiceImpl { + + + +} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml new file mode 100644 index 0000000..9885751 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index d628265..969ea32 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -183,3 +183,26 @@ CALL Pro_Temp_ColumnWork('productinfo', 'bszt', 'varchar(60) NULL DEFAULT NULL C CALL Pro_Temp_ColumnWork('productinfo', 'cpbsfbrq', 'varchar(20) NULL DEFAULT NULL COMMENT ''标识发布时间；格式:2019-09-1''', 1); CALL Pro_Temp_ColumnWork('productinfo', 'btcpbs', 'varchar(120) NULL DEFAULT NULL COMMENT ''本体标识医疗器械本体标识中的产品标识''', 1); CALL Pro_Temp_ColumnWork('productinfo', 'sfyzcbayz', 'varchar(10) NULL DEFAULT NULL COMMENT ''是否与注册/备案标识一致：1是0否''', 1); + + +CREATE TABLE IF NOT EXISTS `io_collect_code` ( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '追溯码（UDI.药品）', + `fromType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '单据来源', + `busType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '单据类型', + `billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '单据号', + `fromCorp` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '往来单位', + `operTime` datetime DEFAULT NULL COMMENT '操作时间', + `operUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '操作人', + `collectCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '采集点', + `collectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '采集点负责人', + `workPlaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '工位', + `workPlaceUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '工位负责人', + `fifoSplit` tinyint DEFAULT NULL COMMENT '赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `inoutType` tinyint DEFAULT NULL, + `scanCount` int DEFAULT NULL COMMENT '扫码数量', + `relId` bigint DEFAULT NULL COMMENT '耗材字典ID外键', + `webTitle` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '来源', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file