Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

yun-zuoyi
王杰 5 years ago committed by nancy.li
commit 1562431070

@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_SECTION_TASK_TYPE {
CREATE(10, "CREATE", "JIT任务"),
RECEIPT(20, "IN_PROGRESS", "单据任务"),
RECEIPT_FINISH(30, "COMPLETED", "单点任务");
JIT_TASK(10, "JIT_TASK", "JIT任务"),
DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
private int value;
private String code;
@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_TASK_TYPE {
CREATE(10, "JIT_TASK", "JIT任务"),
RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
JIT_TASK(10, "JIT_TASK", "JIT任务"),
DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
private int value;
private String code;
@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MAIN_TASK_TYPE {
CREATE(10, "JIT_TASK", "JIT任务"),
RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
JIT_TASK(10, "JIT_TASK", "JIT任务"),
DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
private int value;
private String code;

@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "ITEM_PART_NO")
@ApiParam("拣选物料号")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("拣选物料名称")
private String itemPartName;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
@ApiParam("物料种类")
private Integer partCategory;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
}

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.ptl.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@ApiModel("生产队列主表")
public class MesQueueOrder implements Serializable {
private static final long serialVersionUID = -3124113504001270712L;
@ApiParam("主队列编号")
private String orderNo;
@ApiParam("Vin")
private String vinCode;
@ApiParam("客户标识号")
private String custFlagNo;
@ApiParam("产品配置代码")
private String prodCfgCode;
@ApiParam("产品配置名称")
private String prodCfgNameRdd;
@ApiParam("排序")
private Double seq;
@ApiParam("生产工单号")
private String workOrderNo;
@ApiParam("状态")
private Integer status;
@ApiParam("客户产线代码")
private String custProdLineCode;
@ApiParam("区域代码")
private String areaCode;
@ApiParam("锁定标识")
private Integer isLock;
@ApiParam("客户代码")
private String custCode;
@ApiParam("工单类型")
private String workType;
@ApiParam("队列类型")
private Integer queueType;
@ApiParam("生产组代码")
private String pgCode;
@ApiParam(value = "id")
public Long id;
@ApiParam(value ="组织代码")
public String organizeCode;
@ApiParam(value = "有效性")
public Integer isValid;
@ApiParam(value = "是否已删除")
public Integer isDeleted;
@ApiParam(value = "创建用户")
public String createUser;
@ApiParam(value = "创建日期")
public String createDatetime;
@ApiParam(value = "修改人")
public String modifyUser;
@ApiParam(value = "修改日期")
public String modifyDatetime;
}

@ -0,0 +1,90 @@
package cn.estsh.i3plus.pojo.ptl.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@ApiModel("生产队列明细")
public class MesQueueOrderDetail implements Serializable {
private static final long serialVersionUID = 1945173626511595078L;
@ApiParam("主队列编号")
private String orderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("队列明细序号")
private Double seq;
@ApiParam("数量")
private Double qty;
@ApiParam("状态")
private Integer status;
@ApiParam("生产类型")
private String workType;
@ApiParam("产品类型代码")
private String produceCategoryCode;
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
@ApiParam("产品类型名称")
private String pptCode;
@ApiParam("分组队列编号")
private String queueGroupNo;
@ApiParam("组内编号")
private Integer groupNo;
@ApiParam("料架是否已打印")
private Integer isGroupPrinted;
@ApiParam("已生产数量")
private Double finsihQty;
@ApiParam(value = "id")
public Long id;
@ApiParam(value ="组织代码")
public String organizeCode;
@ApiParam(value = "有效性")
public Integer isValid;
@ApiParam(value = "是否已删除")
public Integer isDeleted;
@ApiParam(value = "创建用户")
public String createUser;
@ApiParam(value = "创建日期")
public String createDatetime;
@ApiParam(value = "修改人")
public String modifyUser;
@ApiParam(value = "修改日期")
public String modifyDatetime;
}

@ -0,0 +1,83 @@
package cn.estsh.i3plus.pojo.ptl.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@ApiModel("工位物料清单")
public class MesStationBom implements Serializable {
private static final long serialVersionUID = -2658812944873600461L;
@ApiParam("零件号")
private String partNo;
@ApiParam("产品物料名称")
private String partName;
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("子零件")
private String itemPartNo;
@ApiParam("原材料物料名称")
private String itemPartName;
@ApiParam(value = "子零件数量")
private Double qty;
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@ApiParam(value = "是否检查")
private Integer isCheck;
@ApiParam(value = "是否投料配置")
private Integer isFeed;
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@ApiParam(value = "匹配规则")
private Integer matchRule;
@ApiParam(value = "id")
public Long id;
@ApiParam(value ="组织代码")
public String organizeCode;
@ApiParam(value = "有效性")
public Integer isValid;
@ApiParam(value = "是否已删除")
public Integer isDeleted;
@ApiParam(value = "创建用户")
public String createUser;
@ApiParam(value = "创建日期")
public String createDatetime;
@ApiParam(value = "修改人")
public String modifyUser;
@ApiParam(value = "修改日期")
public String modifyDatetime;
}
Loading…
Cancel
Save