qt5107 2 жил өмнө
parent
commit
44378ac579

+ 14 - 41
hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/apply/ApplyPurchase.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
@@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author ${author}
- * @since 2022-11-28
+ * @since 2022-11-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -30,24 +31,14 @@ public class ApplyPurchase extends BaseEntity {
     private String code;
 
     /**
-     * 订单id
+     * 采购ID
      */
-    private Long orderId;
+    private Long purchaseId;
 
     /**
-     * 单号
+     * 采购单号
      */
-    private String orderCode;
-
-    /**
-     * 供应商id
-     */
-    private Long supplierId;
-
-    /**
-     * 供应商账期/天
-     */
-    private Integer accountPeriod;
+    private String purchaseCode;
 
     /**
      * 物品id
@@ -90,46 +81,28 @@ public class ApplyPurchase extends BaseEntity {
     private Long receiptWarehouseId;
 
     /**
-     * 申购状态 1待发起 2审批中 3未通过 4已通过/待采购 5采购审批中 6已采购 7部分到货 8全部到货/结束 9已作废
+     * 状态:10、待采购;20、审批中;30、已驳回;40、待发货;50、已发货;60、已完成
      */
     private Integer status;
 
     /**
-     * 完成状态 0未完成 1已完成
-     */
-    private Integer completeStatus;
-
-    /**
-     * 流程ID
-     */
-    private Long flowId;
-
-    /**
-     * 当前节点审批人ID
-     */
-    private Long flowApproverId;
-
-    /**
-     * 当前节点审批人名称
-     */
-    private String flowApproverName;
-
-    /**
      * 申购原因
      */
     private String cause;
 
     /**
-     * 采购备注
-     */
-    private String remark;
-
-    /**
      * 乐观锁
      */
     @TableField(fill = FieldFill.INSERT)
     @Version
     private Integer version;
 
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
 
 }