I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
zcg 5 years ago
parent bc1825fd35 a094473333
commit 8a04ca4e3d
23 changed files with 189 additions and 159 deletions
Show Stats Download Patch File Download Diff File

19
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
Unescape Escape View File

@ -34,21 +34,24 @@ public class OperInput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@Column(name="INPUT_MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
@FieldAnnotation(relation = "InputMaterial", notEmpty = true)
private Long inputMaterialId;
@Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输入量")
@FieldAnnotation(defaultValue = "1.0")
private Double inputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount;
@Column(name="CONS_TYPE")
@ -73,13 +76,13 @@ public class OperInput extends BaseAPS {
BeanRelation.set(this, EOperInput.Operation, oper);
}
public Material getMaterial() {
return BeanRelation.get(this, EOperInput.Material);
public Material getInputMaterial() {
return BeanRelation.get(this, EOperInput.InputMaterial);
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperInput.Material, material);
public void setInputMaterial(Material material) {
this.inputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperInput.InputMaterial, material);
}
@JsonBackReference

17
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
Unescape Escape View File

@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@Column(name="OUTPUT_MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
private Long outputMaterialId;
@Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输出量")
@FieldAnnotation(defaultValue = "1.0")
private Double outputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount;
public Operation getOperation() {
@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS {
BeanRelation.set(this, EOperOutput.Operation, oper);
}
public Material getMaterial() {
return BeanRelation.get(this, EOperOutput.Material);
public Material getOutputMaterial() {
return BeanRelation.get(this, EOperOutput.OutputMaterial);
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperOutput.Material, material);
public void setOutputMaterial(Material material) {
this.outputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperOutput.OutputMaterial, material);
}
@JsonBackReference

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="SPECIFY_ROUTING")
@ApiParam(value ="指定工艺路线")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
private String specifyRouting;
@Column(name="RECALC_COUNT")

13
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
Unescape Escape View File

@ -211,7 +211,12 @@ public class BeanInfo {
}
public static Set<Class<? extends BaseBean>> getBeanClasses() {
return beanInfos.keySet();
Set<Class<? extends BaseBean>> beanClasses = new HashSet<>();
for (Map.Entry<Class<? extends BaseBean>, BeanInfo> entry : beanInfos.entrySet()) {
beanClasses.add(entry.getKey());
}
return beanClasses;
}
public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
@ -234,9 +239,9 @@ public class BeanInfo {
public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo beanInfo : beanInfos) {
beanClasses.add(beanInfo.getBeanClass());
List<BeanInfo> childBeanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo childBeanInfo : childBeanInfos) {
beanClasses.add(childBeanInfo.getBeanClass());
}
return beanClasses;
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java
Unescape Escape View File

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperInput {
Operation,
Material,
InputMaterial,
WorkInputs
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java
Unescape Escape View File

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperOutput {
Operation,
Material,
OutputMaterial,
WorkOutputs
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
Unescape Escape View File

@ -40,4 +40,5 @@ public class APSPager extends Pager {
}
private String filter;
private List<SortData> sorts;
private String query;
}

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperInput">
<Relation field="Material" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
<Relation field="InputMaterial" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperOutput">
<Relation field="Material" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
<Relation field="OutputMaterial" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
Unescape Escape View File

@ -333,7 +333,7 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_LOCK_TYPE {
NONE("NONE", "不锁定"), //
NONE("NONE", "不锁定"),
PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"),
PRODUCE_END("PRODUCE_END", "后工序生产结束时刻");

7
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -50,14 +50,14 @@ public class MesEnumUtil {
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -3419,7 +3419,8 @@ public class MesEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;

46
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -16,49 +16,14 @@ public class MesPcnEnumUtil {
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_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;
}
}
/**
* JIS发运是否按主队列顺序扫描
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_TYPE {
TRUE(10, "是"),
FALSE(20, "否");
private int value;
private String description;
MES_JIS_SCAN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -86,7 +51,7 @@ public class MesPcnEnumUtil {
* JIS发运队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QUEUE_JIS_STATUS {
public enum JIS_QUEUE_STATUS {
TRUE(10, "已发运"),
FALSE(20, "未发运");
@ -94,7 +59,7 @@ public class MesPcnEnumUtil {
private int value;
private String description;
MES_QUEUE_JIS_STATUS(int value, String description) {
JIS_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;

111
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -174,6 +174,7 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 主表信息 单据类型
*/
@ -700,9 +701,9 @@ public class WmsEnumUtil {
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", "坤泰拣货"),
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用");
private int value;
private String code;
@ -897,7 +898,7 @@ public class WmsEnumUtil {
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用");
private String value;
private String description;
@ -1037,7 +1038,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
SCRAP(70,"报废"),
SCRAP(70, "报废"),
COMMING(80, "在途");
private int value;
@ -1470,6 +1471,7 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 库存移动单状态状态:10=新建,20=已处理,30=处理出错
*/
@ -2936,64 +2938,56 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IMPORT_ORDER_TYPE {
PO("PO", "要货计划"),
ASN("ASN", "ASN"),
INSTRUCTIONS("INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "零星出库指令"),
SCATTERED_INT("C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
NC_SCRAPPED("C04", "NC报废指令"),
NOT_JIS("NOTJIS", "非JIS指令"),
STOCK_DUMP("D00", "库存转储指令"),
NC_INSTOCK("D01", "NC入库指令"),
SMRR("B00", "SMRR退货"),
DMR("B01", "DMR退货"),
OUT_SOURCING("A00", "委外发料指令"),
OUT_REBACK("A01", "委外退料指令"),
OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
OUT_RETURN_("A03", "委外返工退料指令"),
SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
CS("CS", "盘点指令"),
CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
PO("1", "PO", "要货计划"),
ASN("2", "ASN", "ASN"),
INSTRUCTIONS("3", "INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "C00", "零星出库指令"),
SCATTERED_INT("C01", "C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"),
NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"),
NC_SCRAPPED("C04", "C04", "NC报废指令"),
NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"),
STOCK_DUMP("D00", "D00", "库存转储指令"),
NC_INSTOCK("D01", "D01", "NC入库指令"),
SMRR("B00", "B00", "SMRR退货"),
DMR("B01", "B01", "DMR退货"),
OUT_SOURCING("A00", "A00", "委外发料指令"),
OUT_REBACK("A01", "A01", "委外退料指令"),
OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"),
OUT_RETURN_("A03", "A03", "委外返工退料指令"),
SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"),
CS("CS", "CS", "盘点指令"),
CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令");
private String value;
private String code;
private String description;
IMPORT_ORDER_TYPE(String value, String description) {
IMPORT_ORDER_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public String getDescription() {
return description;
public String getValue() {
return value;
}
public String getCode() {
return value;
return code;
}
public String getValue() {
return value;
public String getDescription() {
return description;
}
public static IMPORT_ORDER_TYPE codeOf(String value) {
public static IMPORT_ORDER_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return null;
}
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -3083,7 +3077,6 @@ public class WmsEnumUtil {
}
/**
* 任务数据来源：检查子数据
*/
@ -3496,7 +3489,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_STOCK_TYPE {
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码");
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
private int value;
private String description;
@ -4488,8 +4481,8 @@ public class WmsEnumUtil {
WAIT_RECEIVING(10, "待收货"),
RECEIVING(20, "收货中"),
COMPLETE_RECEIVING(30, "收货完成"),
CLOSE(40,"已关闭"),
CANCEL(50,"已取消"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消"),
UN_RECEIVED(60, "延迟未收货");
private int value;
@ -4580,9 +4573,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_MASTER_STATUS {
CREATE(10,"CREATE", "创建"),
PLANNED(20,"PLANNED", "已计划"),
CLOSE(30,"CLOSE", "已关闭");
CREATE(10, "CREATE", "创建"),
PLANNED(20, "PLANNED", "已计划"),
CLOSE(30, "CLOSE", "已关闭");
private int value;
private String code;
@ -4668,8 +4661,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_DETAILS_STATUS {
BE_HANDLE(10,"BE_HANDLE", "待处理"),
CANCELLATION(20,"CANCELLATION", "已处理");
BE_HANDLE(10, "BE_HANDLE", "待处理"),
CANCELLATION(20, "CANCELLATION", "已处理");
private int value;
private String code;
@ -4720,10 +4713,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_MASTER_STATUS {
CREATE(10,"CREATE", "创建"),
ENABLED(20,"ENABLED", "已启动"),
COMPLETE(30,"COMPLETE", "已完成"),
CLOSE(40,"CLOSE", "已关闭");
CREATE(10, "CREATE", "创建"),
ENABLED(20, "ENABLED", "已启动"),
COMPLETE(30, "COMPLETE", "已完成"),
CLOSE(40, "CLOSE", "已关闭");
private int value;
private String code;
@ -4804,8 +4797,8 @@ public class WmsEnumUtil {
}
/**
* WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
* WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE {
@ -4881,7 +4874,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;

28
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java
Unescape Escape View File

@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "QUEUE_NO")
@ApiParam("显示主队列数")
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型组")
private String produceCategoryCode;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
}

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java
Unescape Escape View File

@ -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;
/**
* @Description :JIS发运队列
@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean {
@ApiParam("工作单元代码")
private String workCellCode;
@Transient
@ApiParam("颜色")
private String color;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java
Unescape Escape View File

@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
@ApiParam("状态")
private Integer status;
@Column(name = "FINAL_STATUS")
@ApiParam("明细整体状态")
private Integer finalStatus;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

24
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java
Unescape Escape View File

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("产品包装model")
public class ProductDataModel {
@ApiParam("字段代码")
private String fieldCode;
@ApiParam("字段名称")
private String fieldName;
@ApiParam("字段值")
private String fieldValue;
}

20
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java
Unescape Escape View File

@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable {
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("明细整体状态")
private Integer finalStatus;
@ApiParam("状态名称")
private String statusName;
@ApiParam("明细状态名称")
private String detailStatusName;
@ApiParam("明细整体状态名称")
private Integer finalStatusName;
@ApiParam("颜色")
private String color;
public String getStatusName() {
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status);
}
public String getDetailStatusName() {
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus);
}
public String getFinalStatusName() {
return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus);
}
public QueueJisModel() {
}
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) {
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) {
this.jisNo = jisNo;
this.vinCode = vinCode;
this.carNo = carNo;
@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable {
this.produceCategoryCode = produceCategoryCode;
this.detailStatus = detailStatus;
this.serialNumber = serialNumber;
this.finalStatus = finalStatus;
}
}

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java
Unescape Escape View File

@ -49,4 +49,7 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("图片路径")
private String imageUrl;
@ApiParam("多个数据集")
private List<StationResultBean<T>> stationResultBeans;
}

28
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
Unescape Escape View File

@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "QUEUE_NO")
@ApiParam("显示主队列数")
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理队列数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型组")
private String produceCategoryCode;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java
Unescape Escape View File

@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
@ApiParam("状态")
private Integer status;
@Column(name = "FINAL_STATUS")
@ApiParam("发运整体状态")
private Integer finalStatus;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -2105,8 +2105,8 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(patternJis.getPatternNo())) {
DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean);
}
if (!StringUtils.isEmpty(patternJis.getTopNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean);
if (!StringUtils.isEmpty(patternJis.getQueueNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean);
}
if (!StringUtils.isEmpty(patternJis.getHandleNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
import org.springframework.stereotype.Repository;
/**
* @Description : 系统配置
@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
* @CreateDate : 2019-03-07 10:00
* @Modify:
**/
@Repository
public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
/**

Write Preview
Loading…
Cancel
Save