1.0.95 合同订单添加采购、发货、开票状态

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java

@@ -113,6 +113,26 @@ public class ErpProjectInfo extends TenantEntity {
      */
     private String flowStatus;
 
+    /**
+     * 采购状态（1未采购 2采购中 3部分采购 4已采购）
+     */
+    private String orderPurchaseStatus;
+
+    /**
+     * 发货状态（1未发货 2部分发货 3已发货）
+     */
+    private String orderDeliveryStatus;
+
+    /**
+     * 开票状态（1未开票 2部分开票 3已开票）
+     */
+    private String orderInvoiceStatus;
+
+    /**
+     * 回款百分比（0-100）
+     */
+    private BigDecimal orderPaymentRate;
+
     /**
      * 排序号
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java

@@ -119,6 +119,26 @@ public class ErpProjectInfoBo extends BaseEntity {
      */
     private String flowStatus;
 
+    /**
+     * 采购状态（1未采购 2采购中 3部分采购 4已采购）
+     */
+    private String orderPurchaseStatus;
+
+    /**
+     * 发货状态（1未发货 2部分发货 3已发货）
+     */
+    private String orderDeliveryStatus;
+
+    /**
+     * 开票状态（1未开票 2部分开票 3已开票）
+     */
+    private String orderInvoiceStatus;
+
+    /**
+     * 回款百分比（0-100）
+     */
+    private BigDecimal orderPaymentRate;
+
     /**
      * 排序号
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java

@@ -145,6 +145,33 @@ public class ErpProjectInfoVo implements Serializable {
     @ExcelProperty(value = "流程状态")
     private String flowStatus;
 
+    /**
+     * 采购状态（1未采购 2采购中 3部分采购 4已采购）
+     */
+    @ExcelProperty(value = "采购状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "order_purchase_status")
+    private String orderPurchaseStatus;
+
+    /**
+     * 发货状态（1未发货 2部分发货 3已发货）
+     */
+    @ExcelProperty(value = "发货状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "order_delivery_status")
+    private String orderDeliveryStatus;
+
+    /**
+     * 开票状态（1未开票 2部分开票 3已开票）
+     */
+    @ExcelProperty(value = "开票状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "order_invoice_status")
+    private String orderInvoiceStatus;
+
+    /**
+     * 回款百分比
+     */
+    @ExcelProperty(value = "回款百分比")
+    private BigDecimal orderPaymentRate;
+
     /**
      * 排序号
      */
@@ -182,6 +209,11 @@ public class ErpProjectInfoVo implements Serializable {
     @ExcelProperty(value = "附件ID")
     private String ossId;
 
+    /**
+     * 创建人（用户ID，与 erp_project_info.create_by / BaseEntity.createBy 一致）
+     */
+    private Long createBy;
+
     /**
      * 项目类型名称
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java

@@ -152,6 +152,10 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
             .eq(StringUtils.isNotBlank(bo.getProjectStatus()), ErpProjectInfo::getProjectStatus, bo.getProjectStatus())
             .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectInfo::getFlowStatus, bo.getFlowStatus())
             .eq(bo.getContractId() != null, ErpProjectInfo::getContractId, bo.getContractId())
+            .eq(bo.getCreateBy() != null, ErpProjectInfo::getCreateBy, bo.getCreateBy())
+            .eq(StringUtils.isNotBlank(bo.getOrderPurchaseStatus()), ErpProjectInfo::getOrderPurchaseStatus, bo.getOrderPurchaseStatus())
+            .eq(StringUtils.isNotBlank(bo.getOrderDeliveryStatus()), ErpProjectInfo::getOrderDeliveryStatus, bo.getOrderDeliveryStatus())
+            .eq(StringUtils.isNotBlank(bo.getOrderInvoiceStatus()), ErpProjectInfo::getOrderInvoiceStatus, bo.getOrderInvoiceStatus())
             .like(StringUtils.isNotBlank(bo.getContractCode()), "c.contract_code", bo.getContractCode())
             .like(StringUtils.isNotBlank(bo.getContractName()), "c.contract_name", bo.getContractName())
             .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER)

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml

@@ -33,6 +33,10 @@
                t.active_flag,
                t.oss_id,
                t.del_flag,
+               t.order_purchase_status,
+               t.order_delivery_status,
+               t.order_invoice_status,
+               t.order_payment_rate,
                t.create_dept,
                t.create_by,
                t.create_time,