Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
yun-zuoyi
gcj 6 years ago
commit 32dccc056c

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -38,7 +38,7 @@ public class BaseOrder extends BaseCode {
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
@Column(name="COUNT")
@Column(name="COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
@FieldAnnotation(notEmpty = true)
@Min(0)

@ -32,7 +32,7 @@ public class DataLink extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="链接类型")
@FieldAnnotation(defaultValue = "CSV")
@FieldAnnotation(defaultValue = "EXCEL")
private ApsEnumUtil.DATA_LINK_TYPE type;
@Column(name="PATH")

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-12-03
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "APS_EXPRESSION_RECORD")
@Api("表达式记录")
public class ExpressionRecord extends BaseAPS {
@Column(name="BEAN_NAME")
@ApiParam(value ="表名")
private String beanName;
@Column(name="FIELD_NAME")
@ApiParam(value ="字段名")
private String fieldName;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="EXPRESSION")
@ApiParam(value ="表达式")
private String expression;
@Column(name="REMARK")
@ApiParam(value ="备注")
private String remark;
}

@ -46,7 +46,7 @@ public class FurnaceCapacity extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Material")
private String materialCode;
@Column(name="CAPACITY")
@Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="容量限制")
@Min(0)
private Double capacity;

@ -32,7 +32,7 @@ import java.util.List;
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
@Column(name="CAPACITY")
@Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已占用的能力")
private Double capacity;

@ -34,12 +34,12 @@ public class Inventory extends BaseOrder {
@ApiParam(value ="指定上层订单")
private String specifyUpOrder;
@Column(name="ASSIGN_COUNT")
@Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已分配量")
@FieldAnnotation(modify = false)
private Double assignCount;
@Column(name="EXCESS_COUNT")
@Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;

@ -80,40 +80,40 @@ public class Material extends BaseCode {
@FieldAnnotation(defaultValue = "1")
private Boolean autoFixPegging;
@Column(name="MAX_PRODUCT_BATCH")
@Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大制造批量")
private Double maxProductBatch;
@Column(name="MIN_PRODUCT_BATCH")
@Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小制造批量")
@FieldAnnotation(defaultValue = "0.0")
private Double minProductBatch;
@Column(name="UNIT_PRODUCT_BATCH")
@Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="制造批量单位")
private Double UnitProductBatch;
@Column(name="MAX_PUR_BATCH")
@Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大采购批量")
private Double maxPurBatch;
@Column(name="MIN_PUR_BATCH")
@Column(name="MIN_PUR_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小采购批量")
private Double minPurBatch;
@Column(name="UNIT_PUR_BATCH")
@Column(name="UNIT_PUR_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="采购批量单位")
private Double unitPurBatch;
@Column(name="MIN_STOCK_COUNT")
@Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小库存数量")
private Double minStockCount;
@Column(name="SAFE_STOCK_COUNT")
@Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="安全库存数量")
private Double safeStockCount;
@Column(name="MAX_STOCK_COUNT")
@Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大库存数量")
private Double maxStockCount;

@ -39,15 +39,15 @@ public class OperInput extends BaseAPS {
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
@Column(name="INPUT_COUNT")
@Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输入量")
private Double inputCount;
@Column(name="YIELD")
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
private Double yield;
@Column(name="FIX_SCRAP_COUNT")
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
private Double fixScrapCount;

@ -38,15 +38,15 @@ public class OperOutput extends BaseAPS {
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
@Column(name="OUTPUT_COUNT")
@Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输出量")
private Double outputCount;
@Column(name="YIELD")
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
private Double yield;
@Column(name="FIX_SCRAP_COUNT")
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
private Double fixScrapCount;

@ -44,17 +44,17 @@ public class Operation extends BaseAPS {
@FieldAnnotation(relation = "StandOperation", notEmpty = true)
private Long standOperationId;
@Column(name="PREV_COUNT_RATE")
@Column(name="PREV_COUNT_RATE", columnDefinition = "decimal(18,8)")
@ApiParam(value ="前工序数量比")
@FieldAnnotation(notEmpty = true, defaultValue = "1.0")
private Double prevCountRate;
@Column(name="YIELD")
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
@FieldAnnotation(notEmpty = true, defaultValue = "1.0")
private Double yield;
@Column(name="FIX_SCRAP_COUNT")
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
private Double fixScrapCount;
@ -66,7 +66,7 @@ public class Operation extends BaseAPS {
@ApiParam(value ="分割的工作个数")
private Integer count;
@Column(name="BATCH")
@Column(name="BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="分割批量")
private Double batch;

@ -32,7 +32,7 @@ import java.util.List;
@Api("父工作")
@ExcludeImportExport
public class ParentWork extends BaseAPS {
@Column(name="count")
@Column(name="count", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
private Double count;

@ -71,7 +71,7 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="指定上层订单")
private String specifyUpOrder;
@Column(name="ASSIGN_COUNT")
@Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已分配数量")
private Double assignCount;
@ -84,12 +84,12 @@ public class ProductOrder extends BaseOrder {
@FieldAnnotation(modify = false)
private String calcLeadTime;
@Column(name="EXCESS_COUNT")
@Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;
@Column(name="LACK_COUNT")
@Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="缺少量")
@FieldAnnotation(modify = false)
private Double lackCount;

@ -34,7 +34,7 @@ public class PurchaseOrder extends BaseOrder {
@ApiParam(value ="指定上层订单")
private String specifyUpOrder;
@Column(name="ASSIGN_COUNT")
@Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已分配数量")
private Double assignCount;
@ -47,7 +47,7 @@ public class PurchaseOrder extends BaseOrder {
@FieldAnnotation(modify = false)
private String calcLeadTime;
@Column(name="EXCESS_COUNT")
@Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;

@ -30,7 +30,7 @@ import java.util.List;
@Api("日历")
public class ResCalendar extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源码")
@ApiParam(value ="资源码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)
private String resCodes;
@ -44,7 +44,7 @@ public class ResCalendar extends BaseAPS {
private String dates;
@Column(name="SHIFT_CODES")
@ApiParam(value ="班次码")
@ApiParam(value ="班次码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "DayShift", notEmpty = true)
private String shiftCodes;

@ -39,7 +39,7 @@ public class Resource extends BaseCode {
@FieldAnnotation(defaultValue = "SINGLE")
private ApsEnumUtil.RESOURCE_CLASS resClass;
@Column(name="EFFICIENCY")
@Column(name="EFFICIENCY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="生产效率")
@FieldAnnotation(defaultValue = "1.0", notEmpty = true)
private Double efficiency;
@ -52,7 +52,7 @@ public class Resource extends BaseCode {
@ApiParam(value ="后缓冲时间")
private String postBuffer;
@Column(name="MAX_PRODUCE_BATCH")
@Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大生产批量")
private Double maxProduceBatch;

@ -39,7 +39,7 @@ public class StandOperation extends BaseCode {
@ApiParam(value ="分割的工作个数")
private Integer count;
@Column(name="BATCH")
@Column(name="BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="分割批量")
private Double batch;

@ -46,7 +46,7 @@ public class Work extends BaseAPS {
@FieldAnnotation(property = false)
private ApsEnumUtil.WORK_TYPE workType;
@Column(name="count")
@Column(name="count", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
@FieldAnnotation(modify = false)
private Double count;
@ -70,7 +70,7 @@ public class Work extends BaseAPS {
@FieldAnnotation(modify = false)
private String planResource;
@Column(name="SPECIFY_COUNT")
@Column(name="SPECIFY_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="指定数量")
private Double specifyCount;
@ -120,7 +120,7 @@ public class Work extends BaseAPS {
@ApiParam(value ="已分割的工作是否固定")
private Boolean fixSplit;
@Column(name="NEED_PREV_COUNT")
@Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="需要的前工作数量")
@FieldAnnotation(display = false, modify = false)
private Double needPrevCount;

@ -39,12 +39,12 @@ public class WorkInput extends BaseAPS {
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="INPUT_COUNT")
@Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="输入数量")
@FieldAnnotation(modify = false)
private Double inputCount;
@Column(name="SHORT_COUNT")
@Column(name="SHORT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="短缺数量")
@FieldAnnotation(modify = false)
private Double shortCount;

@ -41,12 +41,12 @@ public class WorkOutput extends BaseAPS {
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="OUTPUT_COUNT")
@Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="输出数量")
@FieldAnnotation(modify = false)
private Double outputCount;
@Column(name="REMAIN_COUNT")
@Column(name="REMAIN_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余数量")
@FieldAnnotation(modify = false)
private Double remainCount;

@ -53,7 +53,7 @@ public class WorkRelation extends BaseAPS {
@FieldAnnotation(relation = "PostWork")
private Long postWorkId;
@Column(name="COUNT")
@Column(name="COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="关联数量")
@FieldAnnotation(modify = false)
private Double count;

@ -0,0 +1,10 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
@Data
public class FunctionModel {
private String code;
private String name;
private String params;
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ExpressionRecord;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ExpressionRecordRepository extends CrudRepository<ExpressionRecord, Long> {
}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ExportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="Details" name="ExportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="Details" name="ExportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -947,12 +947,12 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_TYPE {
PART("PART_ALARM", 111020005, "物料"),
QUALITY("QUALITY_ALARM", 111020006, "质量"),
EQUIP("EQUMENT_ALARM", 111020007, "设备"),
PROCESS("ROUTING_ALARM", 111020008, "工艺"),
CHECK("OTHER_ALARM", 111020009, "自处理"),
FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
PART("PART_ALARM", 110060205, "物料"),
QUALITY("QUALITY_ALARM", 110060206, "质量"),
EQUIP("EQUMENT_ALARM", 110060207, "设备"),
PROCESS("ROUTING_ALARM", 110060208, "工艺"),
CHECK("OTHER_ALARM", 110060209, "自处理"),
FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
private String value;
private Integer code;

@ -60,6 +60,7 @@ public class ApsEnumUtil {
PRODUCT("PRODUCT", "成品"),
HALF_PRODUCT("HALF_PRODUCT", "半成品"),
RAW_MATERIAL("RAW_MATERIAL", "原材料"),
INNER_PRODUCT("INNER_PRODUCT", "中间品"),
VIRTUAL("VIRTUAL", "虚拟件");
private String value;
@ -978,7 +979,7 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_LINK_TYPE {
CSV("CSV", "csv文件"),
EXCEL("EXCEL", "EXCEL"),
MYSQL("MYSQL", "MySql"),
ORACLE("ORACLE", "Oracle"),
SQLSERVER("SQLSERVER", "SqlServer");

@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
TRUE_OR_FALSE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* - MES_PACK_SPEC
* 10.
@ -161,7 +193,8 @@ public class MesEnumUtil {
DEFECT("DEFECT", "缺陷"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因");
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准");
private String value;
private String description;
@ -171,7 +204,9 @@ public class MesEnumUtil {
this.description = description;
}
public String getValue() { return value;}
public String getValue() {
return value;
}
public String getDescription() {
return description;
@ -428,6 +463,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@ -714,6 +759,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -1308,7 +1363,15 @@ public class MesEnumUtil {
MES_SHIFT(180, "班次"),
MES_SHIFT_GROUP(190, "班组"),
MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"),
MES_STATION_BOM(210, "工位BOM表");
MES_STATION_BOM(210, "工位BOM表"),
MES_DATA_OBJECT(220, "数据对象"),
MES_OBJECT_CFG(230, "对象结构"),
MES_WC_CHECK(240, "开线检查"),
MES_QC_CHECK_STANDARD(250, "质量检测标准"),
MES_FAULT_CAUSE(260,"设备故障原因"),
MES_FAULT_METHOD(270,"设备故障处理措施"),
MES_FAULT_PHENOMENON(280,"设备故障现象");
private int value;
private String description;
@ -1466,8 +1529,8 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_STATION_BOM_IS_REPEAT {
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
REPEATABLE(1, ""),
NOT_REPEAT(2, "");
private int value;
private String description;
@ -3479,6 +3542,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String description) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -3525,6 +3598,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**

@ -12,6 +12,43 @@ import org.apache.commons.lang3.StringUtils;
**/
public class MesPcnEnumUtil {
/**
* MesMethodmethodType
* 10.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum METHOD_TYPE {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法");
private int value;
private String description;
METHOD_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes Bom
@ -19,8 +56,8 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_STATION_BOM_IS_REPEAT {
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
REPEATABLE(1, ""),
NOT_REPEAT(2, "");
private int value;
private String description;
@ -179,7 +216,7 @@ public class MesPcnEnumUtil {
}
/**
* pcn
* MesProdBindRecord
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_IS_BIND_KEY {
@ -1143,7 +1180,7 @@ public class MesPcnEnumUtil {
MATERIAL(30, "materials", "物料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
ENVIRONMENT(60, "environment", "环境");
private int value;

@ -368,7 +368,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS {
CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"),CREATE_DOCMOVE(40, "生成移库单"),PULL_FAIL(50, "拉动出错");
CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"), CREATE_DOCMOVE(40, "生成移库单"), PULL_FAIL(50, "拉动出错");
private int value;
private String description;
@ -638,14 +638,15 @@ public class WmsEnumUtil {
KT_REWORK(380, "KT_REWORK", "KT返工"),
KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
KT_SORTING(400, "KT_SORTING", "KT分选"),
VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货");
KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
private int value;
private String code;
@ -826,8 +827,8 @@ public class WmsEnumUtil {
VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"),
VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
private String value;
@ -904,14 +905,16 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
, CLOSE(40, "已关闭");
CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
private int value;
private int code;
private String description;
TASK_INFO_STATUS(int value, String description) {
TASK_INFO_STATUS(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -919,6 +922,10 @@ public class WmsEnumUtil {
return value;
}
public int getCode() {
return code;
}
public String getDescription() {
return description;
}
@ -936,8 +943,20 @@ public class WmsEnumUtil {
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
public static TASK_INFO_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
@ -952,7 +971,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
SCRAP(70, "报废"),
//SCRAP(70, "报废"),
COMMING(80, "在途");
private int value;
@ -995,6 +1014,7 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@ -1052,12 +1072,14 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
private int value;
private String code;
@ -1363,7 +1385,6 @@ public class WmsEnumUtil {
}
/**
*
*/
@ -1436,6 +1457,7 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@ -1476,6 +1498,7 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
*
*/
@ -2339,13 +2362,14 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* NC
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BUSI_OPERATION_TYPE {
//收货改数
GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ;
GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数");
private int value;
private String code;
@ -2854,9 +2878,8 @@ public class WmsEnumUtil {
}
public enum WMS_PART_TYPE_STR {
RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
private String value;
private String description;
@ -3815,7 +3838,8 @@ public class WmsEnumUtil {
AUTO_OPT(20, "AUTO_OPT", "自动操作"),
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"),
CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单");
CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"),
UPDATE_TASK(60, "UPDATE_TASK", "复用任务");
private int value;
private String code;
private String description;
@ -4085,7 +4109,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SPEC_LEVEL {
FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
private int value;
private String description;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -25,7 +26,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
public class MesEsop extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
@ -55,35 +56,36 @@ public class MesESOP extends BaseBean {
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name = "SOP_NAME")
@ApiParam("SOP名称")
private String sopName;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;
@Column(name = "SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
@Transient
@ApiParam("文件名称")
private String fileName;
@Column(name = "GROUP_NAME")
@ApiParam("GROUP_NAME")
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Transient
@ApiParam("组名")
private String groupName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
@Transient
@ApiParam("文件原名")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
@Transient
@ApiParam("文件大小")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Transient
@ApiParam("文件类型名称")
private String fileType;
@Column(name = "SYNC_TAG")
@ApiParam("SYNC_TAG")
@Transient
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT")
@Api("系统业务事件")
public class MesEvent extends BaseBean {
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;
@Column(name = "EVENT_NAME")
@ApiParam("事件名称")
private String eventName;
@Column(name = "EVENT_TYPE")
@ApiParam("事件类型")
private Integer eventType;
@Column(name = "BUTTON_CODE")
@ApiParam("按钮代码")
private String buttonCode;
public int getEventTypeVal() {
return this.eventType == null ? 0 : this.eventType;
}
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT_ACTION")
@Api("系统业务事件动作")
public class MesEventAction extends BaseBean {
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 1:28
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FILE")
@Api("文件表")
public class MesFile extends BaseBean {
@Column(name = "FILE_NAME")
@ApiParam("文件名称")
private String fileName;
@Column(name = "FILE_URL")
@ApiParam("文件URL")
private String fileUrl;
@Column(name = "GROUP_NAME")
@ApiParam("组名")
private String groupName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("文件原名")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("文件大小")
private String fileSize;
@Column(name = "FILE_TYPE")
@ApiParam("文件类型名称")
private String fileType;
@Column(name = "SYNC_TAG")
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_METHOD")
@Api("系统业务方法")
public class MesMethod extends BaseBean {
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@Column(name = "METHOD_NAME")
@ApiParam("方法名称")
private String methodName;
@Column(name = "CALL_CLASS")
@ApiParam("具体实现类")
private String callClass;
/**
* 10-20-ResultBean
*/
@Column(name = "METHOD_TYPE")
@ApiParam("方法类型")
private Integer methodType;
public int getMethodTypeVal() {
return this.methodType == null ? 0 : this.methodType;
}
}

@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean {
@Column(name = "FIELD_LENGTH")
@ApiParam("列长度")
private String fieldLength;
private Integer fieldLength;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -49,20 +49,18 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncFrequency;
@Column(name = "SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name = "SYNC_PATTERN")//2.新增 1.修改
@ApiParam("同步方式")
@Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2.新增 1.修改")
private Integer syncPattern;
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
@Column(name = "SYNC_TYPE")
@ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes")
private Integer syncType;
@Column(name = "LAST_SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@ -74,6 +72,10 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
@Column(name = "IS_IGNORE_ORG")
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -30,29 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
private String produceCtgyCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Transient
@ApiParam("文件名称")
private String fileName;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@ApiParam("图片URL")
private String pictureUrl;
}

@ -73,10 +73,14 @@ public class MesQcCheckStandard extends BaseBean {
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
public MesQcCheckStandard() {
}
public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) {
public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
@ -86,5 +90,6 @@ public class MesQcCheckStandard extends BaseBean {
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
this.checkItemType = checkItemType;
}
}

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
public class ActionRequestBean<Obj> implements Serializable {
@ApiParam("事件代码")
@Deprecated
public String eventCode;
@ApiParam("按钮代码")
public String buttonCode;
@ApiParam("单个结果")
public Obj resultObject;
@ApiParam("List请求集")
public List<Obj> resultList;
@ApiParam("Map请求集")
public Map<String, Object> resultMap;
@ApiParam("目的状态")
private Integer destStatus;
}

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 3:09
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class EsopFileModel {
private MesEsop esop;
private MesFile file;
}

@ -35,6 +35,8 @@ public class RequestModel {
private List<String> orderNoList;//工单编号
private ActionRequestBean actionRequestBean;//工单状态
public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
this.queueOrderList = queueOrderList;
this.currentSeq = currentSeq;
@ -111,6 +113,10 @@ public class RequestModel {
return orderNoList;
}
public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; }
public ActionRequestBean getActionRequestBean() { return actionRequestBean; }
public Double getCurrentSeq() {
return currentSeq == null ? 0.0d : currentSeq;
}

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
import org.springframework.stereotype.Repository;
/**
@ -13,5 +13,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\12\4 10:34
* @Modify:
**/
public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
}

@ -371,4 +371,34 @@ public class MesHqlPack {
}
return packBean;
}
public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
/**
*
* @param typeCfg
* @return
*/
public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) {
DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode());
if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) {
DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
}
if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) {
DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean);
}
if (!StringUtils.isEmpty(typeCfg.getTypeCode())) {
DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean);
}
return packBean;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -25,7 +26,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
public class MesEsop extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
@ -55,36 +56,36 @@ public class MesESOP extends BaseBean {
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name = "SOP_NAME")
@ApiParam("SOP名称")
private String sopName;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;
@Column(name = "SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
@Transient
@ApiParam("文件名称")
private String fileName;
@Column(name = "GROUP_NAME")
@ApiParam("GROUP_NAME")
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Transient
@ApiParam("组名")
private String groupName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
@Transient
@ApiParam("文件原名")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
@Transient
@ApiParam("文件大小")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Transient
@ApiParam("文件类型名称")
private String fileType;
@Column(name = "SYNC_TAG")
@ApiParam("SYNC_TAG")
@Transient
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 1:28
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FILE")
@Api("文件表")
public class MesFile extends BaseBean {
@Column(name = "FILE_NAME")
@ApiParam("文件名称")
private String fileName;
@Column(name = "FILE_URL")
@ApiParam("文件URL")
private String fileUrl;
@Column(name = "GROUP_NAME")
@ApiParam("组名")
private String groupName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("文件原名")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("文件大小")
private String fileSize;
@Column(name = "FILE_TYPE")
@ApiParam("文件类型名称")
private String fileType;
@Column(name = "SYNC_TAG")
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean {
@Column(name = "FIELD_LENGTH")
@ApiParam("列长度")
private String fieldLength;
private Integer fieldLength;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,6 +28,9 @@ import javax.persistence.Table;
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean {
private static final long serialVersionUID = 7270930330576127126L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@ -49,20 +52,18 @@ public class MesPcnSyncCfg extends BaseBean {
private Integer syncFrequency;
@Column(name = "SYNC_TIME")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name = "SYNC_PATTERN")//2、新增 1、修改
@ApiParam("同步方式")
@Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2、新增 1、修改")
private Integer syncPattern;
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
@Column(name = "SYNC_TYPE")
@ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes")
private Integer syncType;
@Column(name = "LAST_SYNC_TIME")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@ -74,6 +75,14 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
@Column(name = "IS_IGNORE_ORG")
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
public int getIsIgnoreOrgVal() {
return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
}
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
private String produceCtgyCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Transient
@ApiParam("文件原名称")
private String fileOriginName;
}

@ -129,6 +129,14 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Transient
@ApiParam("下线开始时间")
private String outWorkCenterStartTime;
@Transient
@ApiParam("下线结束时间")
private String outWorkCenterEndTime;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -93,29 +93,4 @@ public class MesQcCheckData extends BaseBean {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("班次")
private String shiftCode;
@Transient
@ApiParam("班组")
private String shiftGroup;
@Transient
@ApiParam("班长")
private String squadLeader;
@Transient
@ApiParam("工作单元名称")
private String workCellName;
@Transient
@ApiParam("物料名称")
private String partNoName;
public MesQcCheckData(String createDatetime, String createUser) {
super.createDatetime = createDatetime;
super.createUser = createUser;
}
}

@ -60,4 +60,8 @@ public class MesQcCheckStandard extends BaseBean {
@ApiParam("频率")
private String checkFrequency;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
}

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 3:09
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class EsopFileModel {
private MesEsop esop;
private MesFile file;
}

@ -22,6 +22,9 @@ public class FastDfsDownloadModel {
@ApiParam("部分相对路径")
private String dirPath;
@ApiParam("fdfs文件路径")
private String fdfsPath;
@ApiParam("文件名称")
private String fileName;

@ -86,6 +86,9 @@ public class MesPlcModel implements Serializable {
@ApiParam("是否解析")
private String isAnalysis;
@ApiParam("驱动")
private String device;
public MesPlcModel() {
}
@ -93,7 +96,7 @@ public class MesPlcModel implements Serializable {
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis) {
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -118,5 +121,6 @@ public class MesPlcModel implements Serializable {
this.plcCfg = plcCfg;
this.analysisRule = analysisRule;
this.isAnalysis = isAnalysis;
this.device = device;
}
}

@ -0,0 +1,106 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\12\3 18:59
* @Modify:
**/
@Data
public class ProdBindRecordModel implements Serializable {
private Long id;
private String createUser;
private String createDatetime;
private String modifyUser;
private String modifyDatetime;
@ApiParam(value = "产品条码")
private String serialNumber;
@ApiParam("产品条码零件号")
private String partNo;
@ApiParam("产品条码零件名称")
private String partName;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam(value = "工作中心")
private String workCenterCode;
@ApiParam(value = "工作单元")
private String workCellCode;
@ApiParam(value = "工步代码")
private String stepCode;
@ApiParam("原材料零件号")
private String itemPartNo;
@ApiParam("原材料零件名称")
private String itemPartName;
@ApiParam("原材料条码")
private String kpSn;
@ApiParam(value = "原材料数量", example = "0")
private Double kpQty;
@ApiParam("供应商")
private String supplierCode;
@ApiParam
private String lotNo;
@ApiParam
private Integer isFeed;
@ApiParam("版本")
private String version;
@ApiParam(value = "结果")
private String result;
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@ApiParam(value = "动作类型")
private String actionType;
public ProdBindRecordModel() {
}
public ProdBindRecordModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String partNo, String partName, String workOrderNo, String workCenterCode, String workCellCode, String stepCode, String itemPartNo, String itemPartName, String kpSn, Double kpQty, String supplierCode, String lotNo, Integer isFeed, String version, String result, Integer isBindKey, String actionType) {
this.id = id;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partName = partName;
this.workOrderNo = workOrderNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.stepCode = stepCode;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.kpSn = kpSn;
this.kpQty = kpQty;
this.supplierCode = supplierCode;
this.lotNo = lotNo;
this.isFeed = isFeed;
this.version = version;
this.result = result;
this.isBindKey = isBindKey;
this.actionType = actionType;
}
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\12\4 16:44
* @Modify:
**/
@Data
public class ProduceCtgyPictureModel {
private Long id;
private String createUser;
private String createDatetime;
private String modifyUser;
private String modifyDatetime;
private String organizeCode;
private Integer isValid;
private Integer isDeleted;
@ApiParam("产品类型代码")
private String produceCtgyCode;
@ApiParam("面位")
private String sideLocation;
@ApiParam("文件id")
private Long fileId;
@ApiParam("文件原名称")
private String fileOriginName;
@ApiParam("文件URL")
private String fileUrl;
@ApiParam("组名")
private String groupName;
public ProduceCtgyPictureModel() {
}
public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
this.id = id;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.produceCtgyCode = produceCtgyCode;
this.sideLocation = sideLocation;
this.fileId = fileId;
this.fileOriginName = fileOriginName;
this.fileUrl = fileUrl;
this.groupName = groupName;
}
}

@ -9,6 +9,10 @@ import java.util.List;
public class SysOrganizeModel {
@Transient
@ApiParam(value = "id")
private Long id;
@Transient
@ApiParam(value = "父节点")
private Long parentId;
@ -43,4 +47,12 @@ public class SysOrganizeModel {
public void setName(String name) {
this.name = name;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}

@ -1,8 +1,7 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod;
import cn.estsh.i3plus.pojo.mes.bean.MesESOP;
import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
import org.springframework.stereotype.Repository;
/**
@ -13,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
}

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.mes.bean.*;
import org.springframework.util.StringUtils;
@ -416,14 +417,14 @@ public class MesHqlPack {
* @param mesWcCheck
* @return
*/
public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode);
public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode);
// DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean);
return packBean;
}
@ -470,31 +471,26 @@ public class MesHqlPack {
/**
* MES FastDfs
*
* @param mesESOP
* @param esop
* @return
*/
public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
return packBean;
}
public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
}
public static DdlPackBean getEsop(MesEsop esop, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean);
return packBean;
}
@ -1397,6 +1393,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItemType())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItemType(), "checkItemType", packBean);
}
return packBean;
}
@ -1423,28 +1422,6 @@ public class MesHqlPack {
}
/**
* MES
*
* @param mesProduceCtgyPicture
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
}
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
}
return packBean;
}
/**
*
*
* @param mesEquNotifyObjectCfg
@ -1872,6 +1849,16 @@ public class MesHqlPack {
if (mesProduceSn.getQcStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
}
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
// DdlPreparedPack.timeBuilder(
// mesProduceSn.getOutWorkCenterStartTime(),
// mesProduceSn.getOutWorkCenterEndTime(),
// "outWorkCenterTime", packBean, true);
}
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
@ -1999,6 +1986,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCenterCode(), "workCenterCode", packBean);
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable {
@ApiParam("工步列表")
private List<StepModel> stepList;
@Override
public String toString() {
return "StationRequestBean{" +
"scanInfo='" + scanInfo + '\'' +
", serialNumber='" + serialNumber + '\'' +
", partNo='" + partNo + '\'' +
", organizeCode='" + organizeCode + '\'' +
", organizeName='" + organizeName + '\'' +
", workCenterCode='" + workCenterCode + '\'' +
", workCellCode='" + workCellCode + '\'' +
", routeCode='" + routeCode + '\'' +
", processCode='" + processCode + '\'' +
", clientInfo='" + clientInfo + '\'' +
", userInfo='" + userInfo + '\'' +
", buttonCode='" + buttonCode + '\'' +
", stepCode='" + stepCode + '\'' +
", busiType='" + busiType + '\'' +
", workOrderNo='" + workOrderNo + '\'' +
", tray='" + tray + '\'' +
", finishCount=" + finishCount +
'}';
}
}

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
/**
* @author ealvis
* @date 2019/12/2 14:45
* model
*/
@Data
public class WmsFinalShipmentModel {
/*订单号*/
private String orderNo;
/*车牌号*/
private String carNo;
/*物料号*/
private String partNo;
/*计划数量*/
private Double qty;
/*已发运数量*/
private Double pickQty;
/*计划发货时间*/
private String planTime;
/*实际发运时间*/
private String finishTime;
/*状态*/
private Integer orderStatus;
public WmsFinalShipmentModel(){
}
public WmsFinalShipmentModel(String orderNo, String carNo, String partNo, Double qty, Double pickQty, String planTime, String finishTime, Integer orderStatus) {
this.orderNo = orderNo;
this.carNo = carNo;
this.partNo = partNo;
this.qty = qty;
this.pickQty = pickQty;
this.planTime = planTime;
this.finishTime = finishTime;
this.orderStatus = orderStatus;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -49,7 +49,7 @@ public class SysLogTaskTime extends BaseBean {
@ApiParam(value ="调度服务器端口")
private String schedulerServerPort;
@Column(name="TaskThreadId")
@Column(name="TASK_THREAD_ID")
@ApiParam(value ="任务线程id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskThreadId;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -65,6 +65,11 @@ public class WmsActionGroup extends BaseBean {
@ApiParam(value = "任务自动初始化", example = "0")
private Integer autoInit;
// 1=true, 2 = false
@Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false)
@ApiParam(value = "是否连带提交创建状态移动单", example = "2")
private Integer isCommitRefMove;
@Lob
@Column(name = "POSITION")
@ApiParam(value = "GOJS位置")

@ -97,6 +97,14 @@ public class WmsBom extends BaseBean {
@Transient
public String routingCode;
@Column(name = "LOCATE_NO")
@ApiParam(value = "线边库位代码")
private String locateNo;
@Column(name = "TERMINAL_NO")
@ApiParam(value = "工位代码")
private String terminalNo;
public Double getQty() {
return this.qty == null ? 0 : this.qty.doubleValue();
}

@ -34,15 +34,9 @@ public class WmsOperationBean<Obj> extends BaseBean {
@ApiParam("任务单号")
public String taskNo;
/**
* :
* 10=,
* 20=,
* 30=,
* 40=,
* 50=(),
* 60=
*/
@ApiParam("业务单号")
public String refSrc;
@ApiParam("触发源")
public int sourceOwner;

@ -191,10 +191,22 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "拉动方式", example = "0")
private Integer pullWay = 0;
@Column(name = "CYCLE_RQUEST_PERIOD")
@ApiParam(value = "循环补货周期", example = "0")
private Integer cycleRquestPeriod = 0;
@Column(name = "CYCLE_RQUEST_QTY")
@ApiParam(value = "循环补货数量", example = "0")
private Double cycleRquestQty = 0d;
public int getIqcValue(){
return this.iqc == null ? 0 : this.iqc.intValue();
}
public int getCycleRquestPeriod(){
return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
}
public WmsPart() {
}
@ -210,6 +222,10 @@ public class WmsPart extends BaseBean {
return max == null? 0:max;
}
public Double getCycleRquestQty() {
return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
this.partNo = partNo;

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-05 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_SHIFT")
@Api("班次信息")
public class WmsShift extends BaseBean{
private static final long serialVersionUID = 9214639813072592714L;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
private String shiftNo;
@Column(name="SHIFT_NAME")
@ApiParam("班次名称")
private String shiftName;
@Column(name="START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="END_TIME")
@ApiParam("结束时间")
private String endTime;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-11-05 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_SHIFT_REST")
@Api("班休信息")
public class WmsShiftRest extends BaseBean{
private static final long serialVersionUID = 9214639813072592715L;
@Column(name="REST_NO")
@ApiParam("班休代码")
private String restNo;
@Column(name="REST_NAME")
@ApiParam("班休名称")
private String restName;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
private String shiftNo;
@Column(name="START_REST_TIME")
@ApiParam("开始休息时间")
private String startRestTime;
@Column(name="END_REST_TIME")
@ApiParam("结束休息时间")
private String endRestTime;
}

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import javax.persistence.UniqueConstraint;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-12-03 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TERMINAL")
@Api("工位信息")
public class WmsTerminal extends BaseBean{
private static final long serialVersionUID = 9214639813072592713L;
@Column(name="TERMINAL_NO")
@ApiParam("工位代码")
private String terminalNo;
@Column(name="TERMINAL_NAME")
@ApiParam("工位名称")
private String terminalName;
@Column(name="PDLINE_NO")
@ApiParam("产线代码")
private String pdlineNo;
}

@ -23,13 +23,13 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TRANS_QUAN"/*, indexes = {
@Table(name = "WMS_TRANS_QUAN", indexes = {
@Index(columnList = "WH_NO"),
@Index(columnList = "ZONE_NO"),
@Index(columnList = "LOCATE_NO"),
@Index(columnList = "REF_SRC"),
@Index(columnList = "ORGANIZE_CODE")
}*/)
})
@Api("库存交易信息")
public class WmsTransQuan extends BaseBean {

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-05 14:49
* @Modify:
**/
@Repository
public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-12-05 14:49
* @Modify:
**/
@Repository
public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface WmsTerminalRepository extends BaseRepository<WmsTerminal, Long> {
}

@ -607,6 +607,8 @@ public class WmsHqlPack {
//供应商编号
DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
//客户编号
DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getCustNo(), "custNo", result);
//供应商简称
DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
//供应商全称
@ -2520,4 +2522,56 @@ public class WmsHqlPack {
return result;
}
/**
*
*
* @param wmsTerminal
* @return
*/
public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result);
DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result);
getStringBuilderPack(wmsTerminal, result);
return result;
}
/**
*
*
* @param wmsShift
* @return
*/
public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
getStringBuilderPack(wmsShift, result);
return result;
}
/**
*
*
* @param wmsShiftRest
* @return
*/
public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result);
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result);
getStringBuilderPack(wmsShiftRest, result);
return result;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version> <modules>
<version>1.0-DEV-SNAPSHOT</version> <modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
<module>modules/i3plus-pojo-model</module>

Loading…
Cancel
Save