Merge branch 'dev' into test
crish
6 years ago
commit
4d3adf5daf
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : ANDON_工位分组配置
|
||||
* @Reference :
|
||||
* @Author : crish.li
|
||||
* @CreateDate : 2019-11-21 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_CELL_GROUP_CFG")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON_工位分组配置")
|
||||
public class AndonCellGroupCfg extends BaseBean {
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_NAME")
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@Column(name = "CELL_GROUP")
|
||||
@ApiParam(value = "工作单元组")
|
||||
private String cellGroup;
|
||||
|
||||
|
||||
@Column(name = "GROUP_CODE")
|
||||
@ApiParam(value = "分组代码")
|
||||
private String groupCode;
|
||||
|
||||
@Column(name = "GROUP_NAME")
|
||||
@ApiParam(value = "分组名称")
|
||||
private String groupName;
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 打印信息封装模板
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-08-27-13:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("打印信息封装模板")
|
||||
public class SnPrintDataModel {
|
||||
|
||||
@ApiParam("打印数据")
|
||||
private List<SnPrintValueModel> snPrintValueModel;
|
||||
|
||||
@ApiParam("打印模板及参数")
|
||||
private MesLabelTemplate labelTemplate;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description: 条码补打印
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-08-27-13:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("打印信息模板")
|
||||
public class SnPrintModel extends SnPrintValueModel {
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private SnPrintDataModel snPrintModel;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private SnPrintDataModel prodPrintModel;
|
||||
|
||||
@ApiParam("包装条码")
|
||||
private SnPrintDataModel packagePrintModel;
|
||||
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 产品/包装打印模板model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-08-18 11:00
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class SnPrintTemplateModel implements Serializable {
|
||||
|
||||
@ApiParam("产品条码模板")
|
||||
private MesLabelTemplate prodSnPrintTemplate;
|
||||
|
||||
@ApiParam("包装条码模板集合")
|
||||
private List<MesLabelTemplate> packageSnPrintTemplateList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description: 条码补打印
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-08-27-13:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("打印信息模板")
|
||||
public class SnPrintValueModel extends MesProduceSn {
|
||||
@ApiParam("打印描述")
|
||||
private String printDesc;
|
||||
|
||||
@ApiParam("条码")
|
||||
private String barCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("批次号")
|
||||
private String batchNo;
|
||||
|
||||
@ApiParam("箱数量")
|
||||
private String boxQty;
|
||||
|
||||
@ApiParam("订单号")
|
||||
private String orderNo;
|
||||
|
||||
@ApiParam("生产日期")
|
||||
private String productionTime;
|
||||
|
||||
@ApiParam("包装编码")
|
||||
private String packageNo;
|
||||
|
||||
@ApiParam("包装规格")
|
||||
private String packageSpec;
|
||||
|
||||
@ApiParam("供应商")
|
||||
private String supplier;
|
||||
|
||||
@ApiParam("客户名称")
|
||||
private String customerName;
|
||||
|
||||
@ApiParam("客户零件号")
|
||||
private String customerPartNo;
|
||||
|
||||
@ApiParam("客户物料名称")
|
||||
private String customerPartName;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("单位")
|
||||
private String unit;
|
||||
|
||||
@ApiParam("特殊批号")
|
||||
private String fixLotNo;
|
||||
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("生产线代码")
|
||||
private String workCenterCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 物料数量DTO
|
||||
*/
|
||||
@Data
|
||||
public class WmsPartQtyDto {
|
||||
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partName;
|
||||
@ApiParam(value = "物料编码")
|
||||
private String partNO;
|
||||
@ApiParam(value = "应收数量")
|
||||
private String qty;
|
||||
@ApiParam(value = "实收数量")
|
||||
private String rcQty;
|
||||
@ApiParam(value = "待收数量")
|
||||
private String dueQty;
|
||||
}
|
||||
Loading…
Reference in New Issue