From d346846239a8a39246c464dc634f5fd72add99ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:22:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/java/com/ruoyi/business/entity/ProductionScheduling.java |  102 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/ProductionScheduling.java b/main-business/src/main/java/com/ruoyi/business/entity/ProductionScheduling.java
new file mode 100644
index 0000000..af0b454
--- /dev/null
+++ b/main-business/src/main/java/com/ruoyi/business/entity/ProductionScheduling.java
@@ -0,0 +1,102 @@
+package com.ruoyi.business.entity;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.MyBaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * @author :yys
+ * @date : 2025/8/25 16:28
+ */
+@Data
+@TableName("production_scheduling")
+public class ProductionScheduling extends MyBaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 涓婚敭ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     *  鐢熶骇鏄庣粏id
+     */
+    @TableField(value = "production_id")
+    private Long productionId;
+    /**
+     * 鐓ょID
+     */
+    @TableField(value = "coal_id")
+    private Long coalId;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    @TableField(exist = false)
+    private BigDecimal productionQuantity;
+    /**
+     * 鎺掍骇鏁伴噺
+     */
+    @TableField(value = "scheduling_num")
+    private BigDecimal schedulingNum;
+
+    /**
+     * 鍏ュ簱鏁伴噺
+     */
+    @TableField(value = "success_num")
+    private BigDecimal successNum;
+    /**
+     * 鐓ゆ枡绫诲瀷锛�1-鎴愬搧 2-鍘熸枡锛�
+     */
+    @TableField(value = "type")
+    private Integer type;
+    /**
+     *鐘舵�侊紙1-寰呯敓浜� 2-鐢熶骇涓� 3-宸叉姤宸ワ級
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 鍗曚綅
+     */
+    @TableField(value = "unit")
+    private String unit;
+    /**
+     * 宸ュ簭锛堝瓧鍏革級
+     */
+    @TableField(value = "process")
+    private String process;
+    /**
+     * 宸ユ椂瀹氶
+     */
+    @TableField(value = "work_hours")
+    private BigDecimal workHours;
+    /**
+     * 鎺掍骇鏃ユ湡
+     */
+    @TableField(value = "scheduling_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date schedulingDate;
+    /**
+     * 鎺掍骇浜篿d
+     */
+    @TableField(value = "scheduling_user_id")
+    private Long schedulingUserId;
+    /**
+     * 鎺掍骇浜哄悕绉�
+     */
+    @TableField(value = "scheduling_user_name")
+    private String schedulingUserName;
+
+}

--
Gitblit v1.9.3