suojin
/
jonhon-mes-svr
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单相关实体、常量提交

Browse Source
master
liuqingkun 3 weeks ago
parent 700dbf9c32
commit 75f52355dd
5 changed files with 286 additions and 236 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java
  2. 134
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java
  3. 1
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java
  4. 358
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldPlan.java
  5. 27
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/AssayContent.java
Unescape View File

@ -22,7 +22,7 @@ public class AssayContent extends BaseEntity {
* 作业中心 * 作业中心
*/ */
@TableField(value = "WC_ID") @TableField(value = "WC_ID")
private Long WC_ID; private Long wcId;
/** /**
* 化验人 * 化验人

134
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java
Unescape View File

@ -11,6 +11,7 @@ import java.util.Date;
/** /**
* 生产订单 * 生产订单
* *
* @author lqk
* @TableName MES_YIELD_ORDER * @TableName MES_YIELD_ORDER
*/ */
@TableName(value = "MES_YIELD_ORDER") @TableName(value = "MES_YIELD_ORDER")
@ -23,294 +24,309 @@ public class YieldOrder extends BaseEntity {
* 生产单号 * 生产单号
*/ */
@TableField(value = "YO_CODE") @TableField(value = "YO_CODE")
private String YO_CODE; private String yoCode;
/** /**
* 计划单号 * 计划单号
*/ */
@TableField(value = "YP_CODE") @TableField(value = "YP_CODE")
private String YP_CODE; private String ypCode;
/** /**
* 零件号 * 零件号
*/ */
@TableField(value = "PART_CODE") @TableField(value = "PART_CODE")
private String PART_CODE; private String partCode;
/** /**
* 产品型号 * 产品型号
*/ */
@TableField(value = "PRODUCT_TYPE") @TableField(value = "PRODUCT_TYPE")
private String PRODUCT_TYPE; private String productType;
/** /**
* 名称 * 名称
*/ */
@TableField(value = "PART_NAME") @TableField(value = "PART_NAME")
private String PART_NAME; private String partName;
/** /**
* 镀种 * 镀种
*/ */
@TableField(value = "PLATE") @TableField(value = "PLATE")
private String PLATE; private String plate;
/** /**
* 生产标识 * 生产标识
*/ */
@TableField(value = "PRODUCT_IDENT") @TableField(value = "PRODUCT_IDENT")
private String PRODUCT_IDENT; private String productIdent;
/** /**
* 使用部门 * 使用部门
*/ */
@TableField(value = "USE_DEPT") @TableField(value = "USE_DEPT")
private String USE_DEPT; private String useDept;
/** /**
* 面积（㎡） * 面积（㎡）
*/ */
@TableField(value = "YP_AREA") @TableField(value = "YP_AREA")
private BigDecimal YP_AREA; private BigDecimal ypArea;
/** /**
* 需求交期 * 需求交期
*/ */
@TableField(value = "DEMAND_DATE") @TableField(value = "DEMAND_DATE")
private Date DEMAND_DATE; private Date demandDate;
/** /**
* 计划员 * 计划员
*/ */
@TableField(value = "PLAN_USER") @TableField(value = "PLAN_USER")
private String PLAN_USER; private String planUser;
/** /**
* 计划下达时间 * 计划下达时间
*/ */
@TableField(value = "RELEASE_DATE") @TableField(value = "RELEASE_DATE")
private Date RELEASE_DATE; private Date releaseDate;
/** /**
* 备注 * 备注
*/ */
@TableField(value = "MEMO") @TableField(value = "MEMO")
private String MEMO; private String memo;
/** /**
* 路线卡号 * 路线卡号
*/ */
@TableField(value = "CARD_NO") @TableField(value = "CARD_NO")
private String CARD_NO; private String cardNo;
/** /**
* 批次号 * 批次号
*/ */
@TableField(value = "BATCH_NO") @TableField(value = "BATCH_NO")
private String BATCH_NO; private String batchNo;
/** /**
* 场内生产 * 场内生产
*/ */
@TableField(value = "SITE_WORK") @TableField(value = "SITE_WORK")
private String SITE_WORK; private String siteWork;
/** /**
* 生产数量 * 生产数量
*/ */
@TableField(value = "YP_QTY") @TableField(value = "YP_QTY")
private Long YP_QTY; private Long ypQty;
/** /**
* 同步日期 * 同步日期
*/ */
@TableField(value = "SYNC_TIME") @TableField(value = "SYNC_TIME")
private Date SYNC_TIME; private Date syncTime;
/** /**
* 状态 * 状态
*/ */
@Deprecated
@TableField(value = "CUR_STATUS") @TableField(value = "CUR_STATUS")
private Long CUR_STATUS; private Long curStatus;
/** /**
* B号 * B号
*/ */
@TableField(value = "ROAM_NO") @TableField(value = "ROAM_NO")
private String ROAM_NO; private String roamNo;
/** /**
* 一级路线 * 一级路线
*/ */
@TableField(value = "PRIMARY_CRAFT") @TableField(value = "PRIMARY_CRAFT")
private String PRIMARY_CRAFT; private String primaryCraft;
/** /**
* 下级B号 * 下级B号
*/ */
@TableField(value = "NEXT_ROAM") @TableField(value = "NEXT_ROAM")
private String NEXT_ROAM; private String nextRoam;
/** /**
* *
*/ */
@TableField(value = "PDM_URL") @TableField(value = "PDM_URL")
private String PDM_URL; private String pdmUrl;
/** /**
* * 优先级
*/ */
@Deprecated
@TableField(value = "PRIORITY") @TableField(value = "PRIORITY")
private Long PRIORITY; private Long priority;
/**
* 优先级-排产
*/
@TableField(value = "PRIORITY_APS")
private Long priorityAps;
/**
* 优先级-erp中订单优先级
*/
@TableField(value = "PRIORITY_ERP")
private Long priorityErp;
/** /**
* 保管员 * 保管员
*/ */
@TableField(value = "CUSTODIAN") @TableField(value = "CUSTODIAN")
private String CUSTODIAN; private String custodian;
/** /**
* 返工单号 * 返工单号
*/ */
@TableField(value = "REWORK_CODE") @TableField(value = "REWORK_CODE")
private String REWORK_CODE; private String reworkCode;
/** /**
* 返工顺序 * 返工顺序
*/ */
@TableField(value = "REWORK_NO") @TableField(value = "REWORK_NO")
private Long REWORK_NO; private Long reworkNo;
/** /**
* * 返工意见
*/ */
@TableField(value = "ENTRUST_DEPT") @TableField(value = "REWORK_MEMO")
private String ENTRUST_DEPT; private String reworkMemo;
/** /**
* 返工意见 * 委托车间
*/ */
@TableField(value = "REWORK_MEMO") @TableField(value = "ENTRUST_DEPT")
private String REWORK_MEMO; private String entrustDept;
/** /**
* 失败原因 * 失败原因
*/ */
@TableField(value = "FAILURE_MEMO") @TableField(value = "FAILURE_MEMO")
private String FAILURE_MEMO; private String failureMemo;
/** /**
* 业务类型 * 业务类型
*/ */
@TableField(value = "BUSINESS_TYPE") @TableField(value = "BUSINESS_TYPE")
private Long BUSINESS_TYPE; private Long businessType;
/** /**
* 分派失败人员 * 分派失败人员
*/ */
@TableField(value = "FAILURE_MAN") @TableField(value = "FAILURE_MAN")
private Long FAILURE_MAN; private Long failureMan;
/** /**
* 接收时间 * 接收时间
*/ */
@TableField(value = "FAILURE_TIME") @TableField(value = "FAILURE_TIME")
private Date FAILURE_TIME; private Date failureTime;
/** /**
* *
*/ */
@Deprecated
@TableField(value = "RECSEQ_NO") @TableField(value = "RECSEQ_NO")
private String RECSEQ_NO; private String recseqNo;
/** /**
* *
*/ */
@TableField(value = "CART_ID") @TableField(value = "CART_ID")
private Long CART_ID; private Long cartId;
/** /**
* 手动增加 * 手动增加
*/ */
@TableField(value = "MANUAL_INCREASE") @TableField(value = "MANUAL_INCREASE")
private String MANUAL_INCREASE; private String manualIncrease;
/** /**
* * 订单类型
*/ */
@TableField(value = "YIELD_TYPE") @TableField(value = "YIELD_TYPE")
private Long YIELD_TYPE; private Long yieldType;
/** /**
* 父级订单Id * 父级订单Id
*/ */
@TableField(value = "FATHER_YO_ID") @TableField(value = "FATHER_YO_ID")
private Long FATHER_YO_ID; private Long fatherYoId;
/** /**
* * 外协转工标识
*/ */
@TableField(value = "NEWLEV_FLAG") @TableField(value = "NEWLEV_FLAG")
private String NEWLEV_FLAG; private String newlevFlag;
/** /**
* 是否可生产;0:否 1：是 * 是否可生产;0:否 1：是
*/ */
@TableField(value = "PRODUCE_BOOL") @TableField(value = "PRODUCE_BOOL")
private String PRODUCE_BOOL; private String produceBool;
/** /**
* 使用部门代码 * 使用部门代码
*/ */
@TableField(value = "USE_DEPT_CODE") @TableField(value = "USE_DEPT_CODE")
private String USE_DEPT_CODE; private String useDeptCode;
/** /**
* 产品系列（mes_yield_plan.PRODUCT_line） * 产品系列（mesYieldPlan.PRODUCT_Line）
*/ */
@TableField(value = "YP_PRODUCT_LINE") @TableField(value = "YP_PRODUCT_LINE")
private String YP_PRODUCT_LINE; private String ypProductLine;
/** /**
* 工作订单备注（mes_yield_plan.memo） * 工作订单备注（mesYieldPlan.memo）
*/ */
@TableField(value = "YP_MEMO") @TableField(value = "YP_MEMO")
private String YP_MEMO; private String ypMemo;
/** /**
* 烧结石墨模准备状态 * 烧结石墨模准备状态
*/ */
@TableField(value = "SJ_MOLD_PREPARATION") @TableField(value = "SJ_MOLD_PREPARATION")
private Long SJ_MOLD_PREPARATION; private Long sjMoldPreparation;
/** /**
* 烧结齐套流转状态 * 烧结齐套流转状态
*/ */
@TableField(value = "SJ_KIT_PREPARATION") @TableField(value = "SJ_KIT_PREPARATION")
private Long SJ_KIT_PREPARATION; private Long sjKitPreparation;
/** /**
* 配套人 * 配套人
*/ */
@TableField(value = "PK_USERNAME") @TableField(value = "PK_USERNAME")
private String PK_USERNAME; private String pkUsername;
/** /**
* 配套时间 * 配套时间
*/ */
@TableField(value = "PK_DATE") @TableField(value = "PK_DATE")
private Date PK_DATE; private Date pkDate;
/** /**
* 流转人 * 流转人
*/ */
@TableField(value = "KIT_PREPARATION_MAN") @TableField(value = "KIT_PREPARATION_MAN")
private String KIT_PREPARATION_MAN; private String kitPreparationMan;
/** /**
* 流转时间 * 流转时间
*/ */
@TableField(value = "KIT_PREPARATION_TIME") @TableField(value = "KIT_PREPARATION_TIME")
private Date KIT_PREPARATION_TIME; private Date kitPreparationTime;
} }

1
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrderCraft.java
Unescape View File

@ -11,6 +11,7 @@ import java.util.Date;
/** /**
* 生产订单工艺 * 生产订单工艺
* *
* @author lqk
* @TableName MES_YIELD_ORDER_CRAFT * @TableName MES_YIELD_ORDER_CRAFT
*/ */
@TableName(value = "MES_YIELD_ORDER_CRAFT") @TableName(value = "MES_YIELD_ORDER_CRAFT")

358
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldPlan.java
Unescape View File

@ -11,186 +11,192 @@ import java.util.Date;
/** /**
* 生产计划 * 生产计划
* *
* @author lqk
* @TableName MES_YIELD_PLAN * @TableName MES_YIELD_PLAN
*/ */
@TableName(value = "MES_YIELD_PLAN") @TableName(value = "MES_YIELD_PLAN")
@Data @Data
public class YieldPlan extends BaseEntity { public class YieldPlan extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单单号 * 订单单号
*/ */
@TableField(value = "YP_CODE") @TableField(value = "YP_CODE")
private String YP_CODE; private String ypCode;
/** /**
* 零件号 * 零件号
*/ */
@TableField(value = "PART_CODE") @TableField(value = "PART_CODE")
private String PART_CODE; private String partCode;
/** /**
* 产品型号 * 名称
*/ */
@TableField(value = "PRODUCT_TYPE") @TableField(value = "PART_NAME")
private String PRODUCT_TYPE; private String partName;
/** /**
* 名称 * 产品型号
*/ */
@TableField(value = "PART_NAME") @TableField(value = "PRODUCT_TYPE")
private String PART_NAME; private String productType;
/** /**
* 镀种 * 生产标识
*/ */
@TableField(value = "PLATE") @TableField(value = "PRODUCT_IDENT")
private String PLATE; private String productIdent;
/** /**
* 生产标识 * 产品系列
*/ */
@TableField(value = "PRODUCT_IDENT") @TableField(value = "PRODUCT_LINE")
private String PRODUCT_IDENT; private String productLine;
/** /**
* 使用部门 * 镀种
*/ */
@TableField(value = "USE_DEPT") @TableField(value = "PLATE")
private String USE_DEPT; private String plate;
/** /**
* 数量 * 使用部门
*/ */
@TableField(value = "YP_QTY") @TableField(value = "USE_DEPT")
private Long YP_QTY; private String useDept;
/** /**
* 面积（㎡） * 数量
*/ */
@TableField(value = "YP_AREA") @TableField(value = "YP_QTY")
private BigDecimal YP_AREA; private Long ypQty;
/** /**
* 需求交期 * 面积（㎡）
*/ */
@TableField(value = "DEMAND_DATE") @TableField(value = "YP_AREA")
private Date DEMAND_DATE; private BigDecimal ypArea;
/** /**
* 计划员 * 需求交期
*/ */
@TableField(value = "PLAN_USER") @TableField(value = "DEMAND_DATE")
private String PLAN_USER; private Date demandDate;
/** /**
* 计划下达时间 * 计划员
*/ */
@TableField(value = "RELEASE_DATE") @TableField(value = "PLAN_USER")
private Date RELEASE_DATE; private String planUser;
/** /**
* 当前B号 * 计划下达时间
*/ */
@TableField(value = "ROAM_NO") @TableField(value = "RELEASE_DATE")
private String ROAM_NO; private Date releaseDate;
/** /**
* 已交件数量 * 当前B号
*/ */
@TableField(value = "DELIVERY_QTY") @TableField(value = "ROAM_NO")
private Long DELIVERY_QTY; private String roamNo;
/** /**
* 已分批数量 * 已交件数量
*/ */
@TableField(value = "ALREADY_BRANCH_QTY") @TableField(value = "DELIVERY_QTY")
private Long ALREADY_BRANCH_QTY; private Long deliveryQty;
/** /**
* 状态;1.正常，2.已退回，3.已派工，4，加工中，20已完工，21已作废 * 已分批数量
*/ */
@TableField(value = "CUR_STATUS") @TableField(value = "ALREADY_BRANCH_QTY")
private Long CUR_STATUS; private Long alreadyBranchQty;
/** /**
* 一级工艺线路 * 状态;1.正常，2.已退回，3.已派工，4，加工中，20已完工，21已作废
*/ */
@TableField(value = "PRIMARY_CRAFT") @Deprecated
private String PRIMARY_CRAFT; @TableField(value = "CUR_STATUS")
private Long curStatus;
/**
* 同步日期 /**
*/ * 一级工艺线路
@TableField(value = "SYNC_TIME") */
private Date SYNC_TIME; @TableField(value = "PRIMARY_CRAFT")
private String primaryCraft;
/**
* 主制部门 /**
*/ * 同步日期, 使用创建时间
@TableField(value = "DOMINANT_DEPT") */
private String DOMINANT_DEPT; @Deprecated
@TableField(value = "SYNC_TIME")
/** private Date syncTime;
* 备注
*/ /**
@TableField(value = "MEMO") * 主制部门
private String MEMO; */
@TableField(value = "DOMINANT_DEPT")
/** private String dominantDept;
*
*/ /**
@TableField(value = "ROUTE_NO") * 备注
private String ROUTE_NO; */
@TableField(value = "MEMO")
/** private String memo;
*
*/ /**
@TableField(value = "CUSTODIAN") *
private String CUSTODIAN; */
@TableField(value = "ROUTE_NO")
/** private String routeNo;
* 镀种小类
*/ /**
@TableField(value = "BPS_ID") *
private Long BPS_ID; */
@TableField(value = "CUSTODIAN")
/** private String custodian;
* 优先级;1.正常，2.项目要求日期急件，3.合同急件，4.绩效零件，5.调度标注急件
*/ /**
@TableField(value = "PRIORITY") * 镀种小类
private Long PRIORITY; */
@Deprecated
/** @TableField(value = "BPS_ID")
* private Long bpsId;
*/
@TableField(value = "PLAN_TYPE") /**
private Long PLAN_TYPE; * 优先级;1.正常，2.项目要求日期急件，3.合同急件，4.绩效零件，5.调度标注急件
*/
/** @TableField(value = "PRIORITY")
* 是否确认;是否确认(烧结计划专用，默认为空，1是代表确认，烧结计划不显示) private Long priority;
*/
@TableField(value = "SURE_TYPE") /**
private Long SURE_TYPE; *
*/
/** @TableField(value = "PLAN_TYPE")
* 关闭人 private Long planType;
*/
@TableField(value = "CLOSE_MAN") /**
private Long CLOSE_MAN; * 是否确认;是否确认(烧结计划专用，默认为空，1是代表确认，烧结计划不显示)
*/
/** @TableField(value = "SURE_TYPE")
* 关闭时间 private Long sureType;
*/
@TableField(value = "CLOSE_TIME") /**
private Date CLOSE_TIME; * 关闭人
*/
/** @TableField(value = "CLOSE_MAN")
* 产品系列 private Long closeMan;
*/
@TableField(value = "PRODUCT_LINE") /**
private String PRODUCT_LINE; * 关闭时间
*/
@TableField(value = "CLOSE_TIME")
private Date closeTime;
} }

27
blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java
Unescape View File

@ -54,4 +54,31 @@ public interface YieldOrderConst {
*/ */
Integer RECEIVE_STATUS_YES = 1; Integer RECEIVE_STATUS_YES = 1;
//endregion //endregion
//region 生产订单是否同步状态
/**
* 热表订单
*/
Short YIELD_TYPE_1 = 1;
/**
* 烧结订单
*/
Short YIELD_TYPE_2 = 2;
/**
* 玻璃饼
*/
Short YIELD_TYPE_3 = 3;
/**
* 壳体
*/
Short YIELD_TYPE_4 = 4;
/**
* 插针
*/
Short YIELD_TYPE_5 = 5;
/**
* 石墨模
*/
Short YIELD_TYPE_6 = 6;
//endregion
} }

Write Preview
Loading…
Cancel
Save