订单相关实体

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java

@@ -11,52 +11,53 @@ import java.util.Date;
 /**
  * 化验含量
  *
+ * @author lqk
  * @TableName MES_ASSAY_CONTENT
  */
 @TableName(value = "MES_ASSAY_CONTENT")
 @Data
 public class AssayContent extends BaseEntity {
-    @TableField(exist = false)
+	@TableField(exist = false)
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
-    /**
+	/**
-     * 作业中心
+	 * 作业中心
-     */
+	 */
-    @TableField(value = "WC_ID")
+	@TableField(value = "WC_ID")
-    private Long wcId;
+	private Long wcId;
-
+
-    /**
+	/**
-     * 化验人
+	 * 化验人
-     */
+	 */
-    @TableField(value = "ASSAY_MAN")
+	@TableField(value = "ASSAY_MAN")
-    private Long ASSAY_MAN;
+	private Long assayMan;
-
+
-    /**
+	/**
-     * 化验时间
+	 * 化验时间
-     */
+	 */
-    @TableField(value = "ASSAY_TIME")
+	@TableField(value = "ASSAY_TIME")
-    private Date ASSAY_TIME;
+	private Date assayTime;
-
+
-    /**
+	/**
-     * 申报状态
+	 * 申报状态
-     */
+	 */
-    @TableField(value = "APPLY_STATUS")
+	@TableField(value = "APPLY_STATUS")
-    private Long APPLY_STATUS;
+	private Long applyStatus;
-
+
-    /**
+	/**
-     * 金钾申报量
+	 * 金钾申报量
-     */
+	 */
-    @TableField(value = "GOLD_POTASSIUM")
+	@TableField(value = "GOLD_POTASSIUM")
-    private BigDecimal GOLD_POTASSIUM;
+	private BigDecimal goldPotassium;
-
+
-    /**
+	/**
-     * 银钾申报量
+	 * 银钾申报量
-     */
+	 */
-    @TableField(value = "SILVER_POTASSIUM")
+	@TableField(value = "SILVER_POTASSIUM")
-    private BigDecimal SILVER_POTASSIUM;
+	private BigDecimal silverPotassium;
-
+
-    /**
+	/**
-     * 银板申报量
+	 * 银板申报量
-     */
+	 */
-    @TableField(value = "SILVER_PLATE")
+	@TableField(value = "SILVER_PLATE")
-    private BigDecimal SILVER_PLATE;
+	private BigDecimal silverPlate;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContentDetail.java

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 /**
  * 化验含量明细
  *
+ * @author lqk
  * @TableName MES_ASSAY_CONTENT_DETAIL
  */
 @TableName(value = "MES_ASSAY_CONTENT_DETAIL")
@@ -21,42 +22,42 @@ public class AssayContentDetail extends BaseEntity {
      * 化验记录
      */
     @TableField(value = "AC_ID")
-    private Long AC_ID;
+    private Long acId;
 
     /**
      * 槽号
      */
     @TableField(value = "SLOT")
-    private String SLOT;
+    private String slot;
 
     /**
      * 化验值
      */
     @TableField(value = "TEST_VAL")
-    private BigDecimal TEST_VAL;
+    private BigDecimal testVal;
 
     /**
      * 申报添加金钾
      */
     @TableField(value = "SAVE_GOLD_VAL")
-    private BigDecimal SAVE_GOLD_VAL;
+    private BigDecimal saveGoldVal;
 
     /**
      * 申报添加银钾
      */
     @TableField(value = "SAVE_SILVER_VAL")
-    private BigDecimal SAVE_SILVER_VAL;
+    private BigDecimal saveSilverVal;
 
     /**
      * 申报添加银板
      */
     @TableField(value = "SAVE_BOARD_VAL")
-    private BigDecimal SAVE_BOARD_VAL;
+    private BigDecimal saveBoardVal;
 
     /**
      * 实际值
      */
     @TableField(value = "ACTUAL_VAL")
-    private BigDecimal ACTUAL_VAL;
+    private BigDecimal actualVal;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlan.java

@@ -10,6 +10,7 @@ import java.util.Date;
 /**
  * 烧结模具计划
  *
+ * @author lqk
  * @TableName MES_MOLD_PLAN
  */
 @TableName(value = "MES_MOLD_PLAN")
@@ -18,111 +19,111 @@ public class MoldPlan extends BaseEntity {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-    /**
+	/**
-     * 模具编码
+	 * 模具编码
-     */
+	 */
-    @TableField(value = "MO_CODE")
+	@TableField(value = "MO_CODE")
-    private String MO_CODE;
+	private String moCode;
-
+
-    /**
+	/**
-     * 模具名称
+	 * 模具名称
-     */
+	 */
-    @TableField(value = "MO_NAME")
+	@TableField(value = "MO_NAME")
-    private String MO_NAME;
+	private String moName;
-
+
-    /**
+	/**
-     * 数量
+	 * 数量
-     */
+	 */
-    @TableField(value = "QUANTITY")
+	@TableField(value = "QUANTITY")
-    private Long QUANTITY;
+	private Long quantity;
-
+
-    /**
+	/**
-     * erpId
+	 * erpId
-     */
+	 */
-    @TableField(value = "ERP_ID")
+	@TableField(value = "ERP_ID")
-    private Long ERP_ID;
+	private Long erpId;
-
+
-    /**
+	/**
-     * 生产计划id
+	 * 生产计划id
-     */
+	 */
-    @TableField(value = "YP_ID")
+	@TableField(value = "YP_ID")
-    private Long YP_ID;
+	private Long ypId;
-
+
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    @TableField(value = "ERP_WO_CODE")
+	@TableField(value = "ERP_WO_CODE")
-    private String ERP_WO_CODE;
+	private String erpWoCode;
-
+
-    /**
+	/**
-     * 状态;1、新建，2、已下发，3、已完成
+	 * 状态;1、新建，2、已下发，3、已完成
-     */
+	 */
-    @TableField(value = "MAF_STATUS")
+	@TableField(value = "MAF_STATUS")
-    private Long MAF_STATUS;
+	private Long mafStatus;
-
+
-    /**
+	/**
-     * 计划类型名称
+	 * 计划类型名称
-     */
+	 */
-    @TableField(value = "PLAN_TYPE")
+	@TableField(value = "PLAN_TYPE")
-    private String PLAN_TYPE;
+	private String planType;
-
+
-    /**
+	/**
-     * 需求日期
+	 * 需求日期
-     */
+	 */
-    @TableField(value = "NEED_DATE")
+	@TableField(value = "NEED_DATE")
-    private Date NEED_DATE;
+	private Date needDate;
-
+
-    /**
+	/**
-     * 保管员
+	 * 保管员
-     */
+	 */
-    @TableField(value = "KEEPER")
+	@TableField(value = "KEEPER")
-    private Long KEEPER;
+	private Long keeper;
-
+
-    /**
+	/**
-     * 下达人
+	 * 下达人
-     */
+	 */
-    @TableField(value = "RELEASER")
+	@TableField(value = "RELEASER")
-    private Long RELEASER;
+	private Long releaser;
-
+
-    /**
+	/**
-     * 生产标识
+	 * 生产标识
-     */
+	 */
-    @TableField(value = "QUA_LEVEL")
+	@TableField(value = "QUA_LEVEL")
-    private String QUA_LEVEL;
+	private String quaLevel;
-
+
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    @TableField(value = "PLAN_TYPE_NAME")
+	@TableField(value = "PLAN_TYPE_NAME")
-    private String PLAN_TYPE_NAME;
+	private String planTypeName;
-
+
-    /**
+	/**
-     * 零件编码
+	 * 零件编码
-     */
+	 */
-    @TableField(value = "PART_CODE")
+	@TableField(value = "PART_CODE")
-    private String PART_CODE;
+	private String partCode;
-
+
-    /**
+	/**
-     * 零件名称
+	 * 零件名称
-     */
+	 */
-    @TableField(value = "PART_NAME")
+	@TableField(value = "PART_NAME")
-    private String PART_NAME;
+	private String partName;
-
+
-    /**
+	/**
-     * 备注
+	 * 备注
-     */
+	 */
-    @TableField(value = "MEMO")
+	@TableField(value = "MEMO")
-    private String MEMO;
+	private String memo;
-
+
-    /**
+	/**
-     * 类型;1、热表，烧结，2、仓库
+	 * 类型;1、热表，烧结，2、仓库
-     */
+	 */
-    @TableField(value = "MAF_TYPE")
+	@TableField(value = "MAF_TYPE")
-    private Long MAF_TYPE;
+	private Long mafType;
-
+
-    /**
+	/**
-     * 紧急状态
+	 * 紧急状态
-     */
+	 */
-    @TableField(value = "URGENT_TYPE")
+	@TableField(value = "URGENT_TYPE")
-    private String URGENT_TYPE;
+	private String urgentType;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java

@@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 /**
  * 烧结模具计划-订单关联表
  *
+ * @author lqk
  * @TableName MES_MOLD_PLAN_ORDER
  */
 @TableName(value = "MES_MOLD_PLAN_ORDER")
@@ -16,9 +17,9 @@ public class MoldPlanOrder extends BaseEntity {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-    /**
+	/**
-     * 烧结模具计划ID
+	 * 烧结模具计划ID
-     */
+	 */
-    @TableField(value = "MP_ID")
+	@TableField(value = "MP_ID")
-    private Long MP_ID;
+	private Long mp_id;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanTool.java

@@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 /**
  * 烧结模具计划-工装关联表
  *
+ * @author lqk
  * @TableName MES_MOLD_PLAN_TOOL
  */
 @TableName(value = "MES_MOLD_PLAN_TOOL")
@@ -20,12 +21,12 @@ public class MoldPlanTool extends BaseEntity {
 	 * 烧结模具计划ID
 	 */
 	@TableField(value = "MP_ID")
-	private Long MP_ID;
+	private Long mpId;
 
 	/**
 	 * 生产订单id
 	 */
 	@TableField(value = "TOOL_ID")
-	private Long TOOL_ID;
+	private Long toolId;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 /**
  * 镀层物料申报添加量
  *
+ * @author lqk
  * @TableName MES_PLATE_GOODS_APPLY
  */
 @TableName(value = "MES_PLATE_GOODS_APPLY")
@@ -22,60 +23,60 @@ public class PlateGoodsApply extends BaseEntity {
 	 * 镀层物料号
 	 */
 	@TableField(value = "GOODS_CODE")
-	private String GOODS_CODE;
+	private String goodsCode;
 
 	/**
 	 * 申报镀层
 	 */
 	@TableField(value = "GOODS_DEMAND")
-	private BigDecimal GOODS_DEMAND;
+	private BigDecimal goodsDemand;
 
 	/**
 	 * 审批状态
 	 */
 	@TableField(value = "APPROVAL_STATUS")
-	private Long APPROVAL_STATUS;
+	private Long approvalStatus;
 
 	/**
 	 * 采购Id
 	 */
 	@TableField(value = "BO_ID")
-	private Long BO_ID;
+	private Long boId;
 
 	/**
 	 * 领料单Id
 	 */
 	@TableField(value = "BR_ID")
-	private Long BR_ID;
+	private Long brId;
 
 	/**
 	 *
 	 */
 	@TableField(value = "AC_ID")
-	private Long AC_ID;
+	private Long acId;
 
 	/**
 	 *
 	 */
 	@TableField(value = "PGR_ID")
-	private Long PGR_ID;
+	private Long pgrId;
 
 	/**
 	 *
 	 */
 	@TableField(value = "WC_ID")
-	private Long WC_ID;
+	private Long wcId;
 
 	/**
 	 * 涉及单号
 	 */
 	@TableField(value = "INVOLVE_CODE")
-	private String INVOLVE_CODE;
+	private String involveCode;
 
 	/**
 	 * 涉及单号及数量
 	 */
 	@TableField(value = "CODE_NUM")
-	private String CODE_NUM;
+	private String codeNum;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApplyDetail.java

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 /**
  * 镀层物料添加量申报明细
  *
+ * @author lqk
  * @TableName MES_PLATE_GOODS_APPLY_DETAIL
  */
 @TableName(value = "MES_PLATE_GOODS_APPLY_DETAIL")
@@ -22,30 +23,30 @@ public class PlateGoodsApplyDetail extends BaseEntity {
 	 *
 	 */
 	@TableField(value = "GOODS_CODE")
-	private String GOODS_CODE;
+	private String goodsCode;
 
 	/**
 	 *
 	 */
 	@TableField(value = "GOODS_DEMAND")
-	private BigDecimal GOODS_DEMAND;
+	private BigDecimal goodsDemand;
 
 	/**
 	 *
 	 */
 	@TableField(value = "APPROVAL_STATUS")
-	private Long APPROVAL_STATUS;
+	private Long approvalStatus;
 
 	/**
 	 * 添加量申报ID
 	 */
 	@TableField(value = "PGAD_ID")
-	private Long PGAD_ID;
+	private Long pgadId;
 
 	/**
 	 * 涉及单号
 	 */
 	@TableField(value = "INVOLVE_CODE")
-	private String INVOLVE_CODE;
+	private String involveCode;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java

@@ -11,6 +11,7 @@ import java.util.Date;
 /**
  * 镀层物料额外需求上报
  *
+ * @author lqk
  * @TableName MES_PLATE_GOODS_RECORD
  */
 @TableName(value = "MES_PLATE_GOODS_RECORD")
@@ -23,102 +24,102 @@ public class PlateGoodsRecord extends BaseEntity {
 	 * 作业中心
 	 */
 	@TableField(value = "WC_ID")
-	private Long WC_ID;
+	private Long wcId;
 
 	/**
 	 * 镀层物料
 	 */
 	@TableField(value = "PLATE_GOODS_CODE")
-	private String PLATE_GOODS_CODE;
+	private String plateGoodsCode;
 
 	/**
 	 * 物料需求定额
 	 */
 	@TableField(value = "GOODS_DEMAND")
-	private BigDecimal GOODS_DEMAND;
+	private BigDecimal goodsDemand;
 
 	/**
 	 * 上报银钾
 	 */
 	@TableField(value = "SILVER_POTASSIUM")
-	private BigDecimal SILVER_POTASSIUM;
+	private BigDecimal silverPotassium;
 
 	/**
 	 * 银钾系数
 	 */
 	@TableField(value = "COEFFICIENT")
-	private BigDecimal COEFFICIENT;
+	private BigDecimal coefficient;
 
 	/**
 	 * 审批人
 	 */
 	@TableField(value = "APPROVAL_MAN")
-	private Long APPROVAL_MAN;
+	private Long approvalMan;
 
 	/**
 	 * 审批时间
 	 */
 	@TableField(value = "APPROVAL_TIME")
-	private Date APPROVAL_TIME;
+	private Date approvalTime;
 
 	/**
 	 * 审批状态
 	 */
 	@TableField(value = "APPROVAL_STATUS")
-	private Long APPROVAL_STATUS;
+	private Long approvalStatus;
 
 	/**
 	 * 审批结果
 	 */
 	@TableField(value = "APPROVAL_MEMO")
-	private String APPROVAL_MEMO;
+	private String approvalMemo;
 
 	/**
 	 * 已申报定额
 	 */
 	@TableField(value = "DECLARED_QUOTA")
-	private BigDecimal DECLARED_QUOTA;
+	private BigDecimal declaredQuota;
 
 	/**
 	 * 已申报银钾
 	 */
 	@TableField(value = "DECLARED_SILVER")
-	private BigDecimal DECLARED_SILVER;
+	private BigDecimal declaredSilver;
 
 	/**
 	 * 申报状态
 	 */
 	@TableField(value = "DECLARED_STATUS")
-	private Long DECLARED_STATUS;
+	private Long declaredStatus;
 
 	/**
 	 * 物料采购id
 	 */
 	@TableField(value = "GOODS_BO_ID")
-	private Long GOODS_BO_ID;
+	private Long goodsBoId;
 
 	/**
 	 * 银钾采购id
 	 */
 	@TableField(value = "COEFFICIENT_BO_ID")
-	private Long COEFFICIENT_BO_ID;
+	private Long coefficientBoId;
 
 	/**
 	 *
 	 */
 	@TableField(value = "PGR_CODE")
-	private String PGR_CODE;
+	private String pgrCode;
 
 	/**
 	 * 剩余量
 	 */
 	@TableField(value = "SURPLUS")
-	private BigDecimal SURPLUS;
+	private BigDecimal surplus;
 
 	/**
 	 * 上报银钾剩余量
 	 */
 	@TableField(value = "SILVER_POTASSIUM_RESIDUE")
-	private BigDecimal SILVER_POTASSIUM_RESIDUE;
+	private BigDecimal silverPotassiumResidue;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java

@@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 /**
  * 镀层物料需求申报明细
  *
+ * @author lqk
  * @TableName MES_PLATE_GOODS_RECORD_DETAIL
  */
 @TableName(value = "MES_PLATE_GOODS_RECORD_DETAIL")
@@ -20,12 +21,12 @@ public class PlateGoodsRecordDetail extends BaseEntity {
 	 * 申报ID
 	 */
 	@TableField(value = "PGRD_ID")
-	private Long PGRD_ID;
+	private Long pgrd_id;
 
 	/**
 	 * 生产订单ID
 	 */
 	@TableField(value = "YO_ID")
-	private String YO_ID;
+	private String yo_id;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldError.java

@@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 /**
  * 异常订单
  *
+ * @author lqk
  * @TableName MES_YIELD_ERROR
  */
 @TableName(value = "MES_YIELD_ERROR")
@@ -20,24 +21,24 @@ public class YieldError extends BaseEntity {
 	 * 生产计划ID
 	 */
 	@TableField(value = "YP_ID")
-	private Long YP_ID;
+	private Long ypId;
 
 	/**
 	 * 生产订单ID
 	 */
 	@TableField(value = "YO_ID")
-	private Long YO_ID;
+	private Long yoId;
 
 	/**
 	 * 异常类型，1：数据缺失，2：工艺缺失，3：资源缺失，2：交期冲突
 	 */
 	@TableField(value = "EX_TYPE")
-	private Long EX_TYPE;
+	private Long exType;
 
 	/**
 	 * 异常原因
 	 */
 	@TableField(value = "EX_MEMO")
-	private String EX_MEMO;
+	private String exMemo;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java

@@ -24,77 +24,77 @@ public class YieldOrderCraft extends BaseEntity {
 	 * 生产订单
 	 */
 	@TableField(value = "YO_ID")
-	private String YO_ID;
+	private String yoId;
 
 	/**
 	 * C号
 	 */
 	@TableField(value = "CRAFT_NO")
-	private String CRAFT_NO;
+	private String craftNo;
 
 	/**
 	 * 序号
 	 */
 	@TableField(value = "PROCESS_NO")
-	private String PROCESS_NO;
+	private String processNo;
 
 	/**
 	 * 工序
 	 */
 	@TableField(value = "PPS_ID")
-	private Long PPS_ID;
+	private Long ppsId;
 
 	/**
 	 * 工艺描述
 	 */
 	@TableField(value = "MAKE_MEMO")
-	private String MAKE_MEMO;
+	private String makeMemo;
 
 	/**
 	 *
 	 */
 	@TableField(value = "HOUR_QUOTA")
-	private BigDecimal HOUR_QUOTA;
+	private BigDecimal hourQuota;
 
 	/**
 	 *
 	 */
 	@TableField(value = "PID")
-	private Long PID;
+	private Long pid;
 
 	/**
 	 *
 	 */
 	@TableField(value = "START_TIME")
-	private Date START_TIME;
+	private Date startTime;
 
 	/**
 	 *
 	 */
 	@TableField(value = "END_TIME")
-	private Date END_TIME;
+	private Date endTime;
 
 	/**
 	 * 加工班组
 	 */
 	@TableField(value = "MAKE_TEAM")
-	private Long MAKE_TEAM;
+	private Long makeTeam;
 
 	/**
 	 * 外协商
 	 */
 	@TableField(value = "OC_ID")
-	private Long OC_ID;
+	private Long ocId;
 
 	/**
 	 * 工艺能力;外键（工艺能力）
 	 */
 	@TableField(value = "CA_ID")
-	private Long CA_ID;
+	private Long caId;
 
 	/**
 	 * 返工工序id
 	 */
 	@TableField(value = "RP_ID")
-	private Long RP_ID;
+	private Long rpId;
 }