From e3fc4cd3dc396fc6415634c6d587b2c575d205d7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 27 Feb 2024 21:23:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/thrsys/ThrInvOrderDetailMapper.java | 9 + .../api/dao/thrsys/ThrInvOrderMapper.java | 9 + .../thrsys/ThrInvOrderDetailEntity.java | 205 ++++++++++++++++++ .../api/entity/thrsys/ThrInvOrderEntity.java | 132 +++++++++++ .../thrsys/ThrInvOrderDetailService.java | 10 + .../service/thrsys/ThrInvOrderService.java | 10 + .../mapper/thrsys/ThrInvOrderDetailMapper.xml | 42 ++++ .../mapper/thrsys/ThrInvOrderMapper.xml | 29 +++ src/main/resources/schemas/schema_v2.3.sql | 3 + 9 files changed, 449 insertions(+) create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java create mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java new file mode 100644 index 000000000..6c4ec641e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrInvOrderDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ThrInvOrderDetailMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java new file mode 100644 index 000000000..ce918a898 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrInvOrderEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ThrInvOrderMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java new file mode 100644 index 000000000..08fef49fc --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java @@ -0,0 +1,205 @@ +package com.glxp.api.entity.thrsys; + +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 java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +@ApiModel(value="com-glxp-api-entity-thrsys-ThrInvOrderDetail") +@Data +@TableName(value = "thr_inv_order_detail") +public class ThrInvOrderDetailEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + /** + * 单据号 + */ + @TableField(value = "orderIdFk") + @ApiModelProperty(value="单据号") + private String orderIdFk; + + /** + * 产品通用名称 + */ + @TableField(value = "cpmctymc") + @ApiModelProperty(value="产品通用名称") + private String cpmctymc; + + /** + * 物资字典主键 + */ + @TableField(value = "relId") + @ApiModelProperty(value="物资字典主键") + private Integer relId; + + /** + * 第三方项目编码/耗材字典 + */ + @TableField(value = "thrCode") + @ApiModelProperty(value="第三方项目编码/耗材字典") + private String thrCode; + + /** + * DI + */ + @TableField(value = "nameCode") + @ApiModelProperty(value="DI") + private String nameCode; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + @ApiModelProperty(value="规格型号") + private String ggxh; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + @ApiModelProperty(value="批次号") + private Integer batchNo; + + /** + * 计量单位 + */ + @TableField(value = "measname") + @ApiModelProperty(value="计量单位") + private String measname; + + /** + * 价格 + */ + @TableField(value = "price") + @ApiModelProperty(value="价格") + private BigDecimal price; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + @ApiModelProperty(value="生产日期") + private Date productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + @ApiModelProperty(value="失效日期") + private Date expireDate; + + /** + * 医疗器械注册备案人 + */ + @TableField(value = "ylqxzcrbarmc") + @ApiModelProperty(value="医疗器械注册备案人") + private String ylqxzcrbarmc; + + /** + * 注册/备案号 + */ + @TableField(value = "zczbhhzbapzbh") + @ApiModelProperty(value="注册/备案号") + private String zczbhhzbapzbh; + + /** + * 入库数量 + */ + @TableField(value = "inCount") + @ApiModelProperty(value="入库数量") + private String inCount; + + /** + * 出库数量 + */ + @TableField(value = "outCount") + @ApiModelProperty(value="出库数量") + private String outCount; + + /** + * 供应商 + */ + @TableField(value = "supName") + @ApiModelProperty(value="供应商") + private String supName; + + /** + * 部门 + */ + @TableField(value = "deptName") + @ApiModelProperty(value="部门") + private String deptName; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + @ApiModelProperty(value="部门编码") + private String deptCode; + + /** + * 仓库 + */ + @TableField(value = "invName") + @ApiModelProperty(value="仓库") + private String invName; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + @ApiModelProperty(value="仓库编码") + private String invCode; + + /** + * 货位 + */ + @TableField(value = "spaceCode") + @ApiModelProperty(value="货位") + private String spaceCode; + + /** + * 货位编码 + */ + @TableField(value = "spaceName") + @ApiModelProperty(value="货位编码") + private String spaceName; + + /** + * 实际数量 + */ + @TableField(value = "reCount") + @ApiModelProperty(value="实际数量") + private String reCount; + + /** + * 出入库类型 + */ + @TableField(value = "mainAction") + @ApiModelProperty(value="出入库类型") + private String mainAction; + + /** + * 生产企业 + */ + @TableField(value = "manufacturer") + @ApiModelProperty(value="生产企业") + private String manufacturer; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java new file mode 100644 index 000000000..6d5af1848 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java @@ -0,0 +1,132 @@ +package com.glxp.api.entity.thrsys; + +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 java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +/** + * 库存出入库明细 + */ +@ApiModel(value = "com-glxp-api-entity-thrsys-ThrInvOrder") +@Data +@TableName(value = "thr_inv_order") +public class ThrInvOrderEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 单据时间 + */ + @TableField(value = "billDate") + @ApiModelProperty(value = "单据时间") + private Date billDate; + + /** + * 库存开始时间 + */ + @TableField(value = "startDate") + @ApiModelProperty(value = "库存开始时间") + private Date startDate; + + /** + * 库存结束时间 + */ + @TableField(value = "endDate") + @ApiModelProperty(value = "库存结束时间") + private Date endDate; + + /** + * 出入库类型 + */ + @TableField(value = "mainAction") + @ApiModelProperty(value = "出入库类型") + private String mainAction; + + /** + * 第三方单据类型 + */ + @TableField(value = "billType") + @ApiModelProperty(value = "第三方单据类型") + private String billType; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + @ApiModelProperty(value = "部门编码") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + @ApiModelProperty(value = "仓库编码") + private String invCode; + + /** + * 货位编码 + */ + @TableField(value = "spaceCode") + @ApiModelProperty(value = "货位编码") + private String spaceCode; + + /** + * 单据状态 + */ + @TableField(value = "`status`") + @ApiModelProperty(value = "单据状态") + private Byte status; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + @ApiModelProperty(value = "创建人") + private String createUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + @ApiModelProperty(value = "更新人") + private String updateUser; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java new file mode 100644 index 000000000..1c4dc0cc3 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java @@ -0,0 +1,10 @@ +package com.glxp.api.service.thrsys; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.thrsys.ThrInvOrderDetailMapper; +import com.glxp.api.entity.thrsys.ThrInvOrderDetailEntity; +@Service +public class ThrInvOrderDetailService extends ServiceImpl { + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java new file mode 100644 index 000000000..342a501cf --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java @@ -0,0 +1,10 @@ +package com.glxp.api.service.thrsys; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.thrsys.ThrInvOrderEntity; +import com.glxp.api.dao.thrsys.ThrInvOrderMapper; +@Service +public class ThrInvOrderService extends ServiceImpl { + +} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml new file mode 100644 index 000000000..9c682d9af --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, orderIdFk, cpmctymc, relId, thrCode, nameCode, ggxh, batchNo, measname, price, + productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, inCount, outCount, supName, + deptName, deptCode, invName, invCode, spaceCode, spaceName, reCount, mainAction, + manufacturer, remark + + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml new file mode 100644 index 000000000..6871298e7 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, billNo, billDate, startDate, endDate, mainAction, billType, deptCode, invCode, + spaceCode, `status`, createTime, `createUser`, updateTime, updateUser, remark + + diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 551b8636a..448383313 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -1009,3 +1009,6 @@ CALL Pro_Temp_ColumnWork('auth_warehouse', 'lyInvType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('pur_receive_detail', 'price', 'decimal(10, 2)', 1); CALL Pro_Temp_ColumnWork('basic_corp', 'adSickNum', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'splitOrder', 'tinyint', 1); +