From 56cc217a14fc906ce266a9ed8c7975779ae4cedf Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 9 Feb 2023 10:23:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9B=B8=E5=85=B3=E8=A1=A8=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/purchase/PurApplyDetailEntity.java | 42 ++++- .../api/entity/purchase/PurApplyEntity.java | 145 +++++++++++++---- .../entity/purchase/PurPlanDetailEntity.java | 41 ++++- .../api/entity/purchase/PurPlanEntity.java | 153 ++++++++++++++---- 4 files changed, 303 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java index c5150c3bb..26ab1dc91 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java @@ -1,34 +1,64 @@ package com.glxp.api.entity.purchase; +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 lombok.Data; @Data +@TableName(value = "pur_apply_detail") public class PurApplyDetailEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; - /** - * - */ - private Long id; /** * 订单外键 */ + @TableField(value = "orderIdFk") private String orderIdFk; + /** * 产品ID */ - private String productId; + @TableField(value = "productId") + private Integer productId; + /** * 产品名称 */ + @TableField(value = "productName") private String productName; + /** * 数量 */ + @TableField(value = "`count`") private Integer count; + /** * 供应商ID */ + @TableField(value = "supId") private String supId; + + /** + * 注册证备案证号 + */ + @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; -} + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_PRODUCTID = "productId"; + + public static final String COL_PRODUCTNAME = "productName"; + + public static final String COL_COUNT = "count"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index f647c0935..6e141960a 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -1,80 +1,161 @@ package com.glxp.api.entity.purchase; -import lombok.Data; - +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 java.util.Date; +import lombok.Data; - -/** - * pur对象 pur_apply - * - * @author anthony.ywj - * @date 2022-10-12 - */ @Data +@TableName(value = "pur_apply") public class PurApplyEntity { + @TableId(value = "id", type = IdType.INPUT) + private Long id; - /** - * - */ - private Integer id; /** * 单据号 */ + @TableField(value = "billNo") private String billNo; + /** * 单据日期 */ + @TableField(value = "billDate") private Date billDate; + /** - * 状态（1.草稿，2.未审核，3.已审核） + * 状态（1.草稿，2.未审核，3.已审核,4.已拒绝） */ - private int status; + @TableField(value = "`status`") + private Byte status; + /** * 申购类型 */ - private String billType; + @TableField(value = "billType") + private Byte billType; + /** * 申购说明 */ + @TableField(value = "remark") private String remark; + /** * 当前仓库 */ - private String locStorageCode; - /** - * 当前分库 - */ - private String invWarehouseCode; + @TableField(value = "invCode") + private String invCode; + /** * 所属部门 */ + @TableField(value = "deptCode") private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + /** * 审核人 */ - private String auditBy; + @TableField(value = "auditUser") + private String auditUser; + /** * 审核时间 */ + @TableField(value = "auditTime") private Date auditTime; - private String createBy; - /** - * 创建时间 + * 更新人 */ - private Date createTime; + @TableField(value = "updateUser") + private String updateUser; + /** + * 更新时间 + */ + @TableField(value = "updateTime") private Date updateTime; + /** + * 审核说明 + */ + @TableField(value = "auditRemark") private String auditRemark; - private String targetInv; - private String targetSubInv; - private String targetBillType; + /** + * 目标仓库 + */ + @TableField(value = "targetInvCode") + private String targetInvCode; + + /** + * 目标部门 + */ + @TableField(value = "targetDeptCode") + private String targetDeptCode; + + /** + * 生成采购计划单据号 + */ + @TableField(value = "planBillNo") + private String planBillNo; + + /** + * 是否已生成采购计划 + */ + @TableField(value = "generatePlan") + private Byte generatePlan; + + public static final String COL_ID = "id"; + + public static final String COL_BILLNO = "billNo"; + + public static final String COL_BILLDATE = "billDate"; + + public static final String COL_STATUS = "status"; + + public static final String COL_BILLTYPE = "billType"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_DEPTCODE = "deptCode"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_AUDITTIME = "auditTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_AUDITREMARK = "auditRemark"; + + public static final String COL_TARGETINVCODE = "targetInvCode"; + + public static final String COL_TARGETDEPTCODE = "targetDeptCode"; - private String planBillNo; //生成采购计划单据号 - private boolean generatePlan; //是否已生成采购计划单 + public static final String COL_PLANBILLNO = "planBillNo"; -} + public static final String COL_GENERATEPLAN = "generatePlan"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java index a7edaf6dc..7f0bf462c 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java @@ -1,35 +1,64 @@ package com.glxp.api.entity.purchase; +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 lombok.Data; @Data +@TableName(value = "pur_plan_detail") public class PurPlanDetailEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; - /** - * - */ - private Long id; /** * 订单外键 */ + @TableField(value = "orderIdFk") private String orderIdFk; + /** * 产品ID */ - private String productId; + @TableField(value = "productId") + private Integer productId; + /** * 产品名称 */ + @TableField(value = "productName") private String productName; + /** * 数量 */ + @TableField(value = "`count`") private Integer count; + /** * 供应商ID */ + @TableField(value = "supId") private String supId; + /** + * 注册证备案证号 + */ + @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; -} + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_PRODUCTID = "productId"; + + public static final String COL_PRODUCTNAME = "productName"; + + public static final String COL_COUNT = "count"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index 87285374f..705d57e50 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -1,84 +1,169 @@ package com.glxp.api.entity.purchase; - -import lombok.Data; - +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 java.util.Date; +import lombok.Data; -/** - * pur对象 pur_plan - * - * @author anthony.ywj - * @date 2022-10-12 - */ @Data +@TableName(value = "pur_plan") public class PurPlanEntity { + @TableId(value = "id", type = IdType.INPUT) + private Long id; - /** - * - */ - private Integer id; /** * 单据号 */ + @TableField(value = "billNo") private String billNo; + /** * 单据日期 */ + @TableField(value = "billDate") private Date billDate; + /** * 状态（1.草稿，2.未审核，3.已审核） */ - private Integer status; + @TableField(value = "`status`") + private Byte status; + /** * 申购类型 */ + @TableField(value = "billType") private String billType; + /** * 申购说明 */ + @TableField(value = "remark") private String remark; - /** - * 当前仓库 - */ - private String locStorageCode; + /** * 当前分库 */ - private String invWarehouseCode; + @TableField(value = "invCode") + private String invCode; + /** * 所属部门 */ + @TableField(value = "deptCode") private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + /** * 审核人 */ - private String auditBy; + @TableField(value = "auditUser") + private String auditUser; + /** * 审核时间 */ + @TableField(value = "auditTime") private Date auditTime; - private String createBy; - /** - * 创建时间 + * 审核说明 */ - private Date createTime; + @TableField(value = "auditRemark") + private String auditRemark; + /** + * 更新时间 + */ + @TableField(value = "updateTime") private Date updateTime; - private String auditRemark; + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 申购人 + */ + @TableField(value = "applyCreateBy") + private String applyCreateBy; + + /** + * 申购审核人 + */ + @TableField(value = "applyAuditBy") + private String applyAuditBy; + + /** + * 申购说明 + */ + @TableField(value = "applyRemark") + private String applyRemark; + + /** + * 申购单据号，多单以逗号隔开 + */ + @TableField(value = "applyBillNo") + private String applyBillNo; + + /** + * 生成采购入库业务单据 + */ + @TableField(value = "stockOrderNo") + private String stockOrderNo; + + public static final String COL_ID = "id"; + + public static final String COL_BILLNO = "billNo"; + + public static final String COL_BILLDATE = "billDate"; + + public static final String COL_STATUS = "status"; + + public static final String COL_BILLTYPE = "billType"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_DEPTCODE = "deptCode"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_AUDITTIME = "auditTime"; + + public static final String COL_AUDITREMARK = "auditRemark"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_APPLYCREATEBY = "applyCreateBy"; - private String stockOrderNo; //生成业务单据号 - private String applyCreateBy; //申购人 - private String applyAuditBy; //申购审核人 - private String applyRemark; //申购说明 - private String applyBillNo; //申购单据号，多单以逗号隔开 + public static final String COL_APPLYAUDITBY = "applyAuditBy"; + public static final String COL_APPLYREMARK = "applyRemark"; - private String targetBillAction; - private String targetSubInv; - private String targetInv; + public static final String COL_APPLYBILLNO = "applyBillNo"; -} + public static final String COL_STOCKORDERNO = "stockOrderNo"; +} \ No newline at end of file