From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
index e5fcb71..40ac455 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
@@ -1,19 +1,16 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * ERP 閲囪喘鐢宠鏄庣粏 DO
- *
- * @author 鑺嬮亾婧愮爜
  */
 @TableName("erp_purchase_request_items")
 @KeySequence("erp_purchase_request_items_seq")
@@ -30,57 +27,65 @@
      */
     @TableId
     private Long id;
+
     /**
      * 閲囪喘鐢宠缂栧彿
-     *
-     * 鍏宠仈 {@link ErpPurchaseRequestDO#getId()}
      */
     private Long requestId;
+
     /**
      * 浜у搧缂栧彿
-     *
-     * 鍏宠仈 {@link ErpProductDO#getId()}
      */
     private Long productId;
+
     /**
      * 浜у搧鍗曚綅缂栧彿
-     *
-     * 鍐椾綑 {@link ErpProductDO#getUnitId()}
      */
     private Long productUnitId;
 
     /**
-     * 浜у搧鍗曚环锛堝弬鑰冧环锛夛紝鍗曚綅锛氬厓
+     * 浜у搧鍙傝�冨崟浠�
      */
     private BigDecimal productPrice;
+
     /**
      * 鏁伴噺
      */
     private BigDecimal count;
+
     /**
-     * 鎬讳环锛屽崟浣嶏細鍏�
-     *
-     * totalPrice = productPrice * count
+     * 鎬讳环
      */
     private BigDecimal totalPrice;
+
     /**
      * 绋庣巼锛岀櫨鍒嗘瘮
      */
     private BigDecimal taxPercent;
+
     /**
-     * 绋庨锛屽崟浣嶏細鍏�
-     *
-     * taxPrice = totalPrice * taxPercent
+     * 绋庨
      */
     private BigDecimal taxPrice;
 
     /**
      * 闇�姹傛棩鏈�
      */
-    private LocalDate demandTime;
+    private LocalDateTime demandTime;
+
     /**
      * 澶囨敞
      */
     private String remark;
 
-}
+    /**
+     * 鏄惁闇�瑕佹潵鏂欐楠�
+     */
+    private Boolean qcCheckFlag;
+
+    /**
+     * 鍏ュ簱鏁伴噺
+     */
+    private BigDecimal inCount;
+
+}
\ No newline at end of file

--
Gitblit v1.9.3