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
crish 6 years ago
parent 6c07f29317 e91369c82a
commit 3645541765
22 changed files with 173 additions and 90 deletions
Show Stats Download Patch File Download Diff File

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

@ -375,21 +375,21 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_MATCH_TYPE {
ORGANIZATION("10", "工厂"),
PART("20", "物料"),
CUST_CODE("30", "客户代码"),
CUST_PART_NO("40", "客户物料号"),
WORK_CENTER("50", "产线");
ORGANIZATION(10, "工厂"),
PART(20, "物料"),
CUST_CODE(30, "客户代码"),
CUST_PART_NO(40, "客户物料号"),
WORK_CENTER(50, "产线");
private String value;
private int value;
private String description;
MES_MATCH_TYPE(String value, String description) {
MES_MATCH_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
public int getValue() {
return value;
}
@ -397,7 +397,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(String val) {
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -414,19 +414,19 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_CODE_TYPE {
SERIAL_SN("10", "过程条码"),
PRODUCT_SN("20", "产品条码"),
PACK_SN("30", "包装条码");
SERIAL_SN(10, "过程条码"),
PRODUCT_SN(20, "产品条码"),
PACK_SN(30, "包装条码");
private String value;
private int value;
private String description;
MES_CODE_TYPE(String value, String description) {
MES_CODE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
public int getValue() {
return value;
}
@ -434,7 +434,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(String val) {
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -2962,7 +2962,8 @@ public class MesEnumUtil {
SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""),
PCN_LOGIN(160, "PCN_LOGIN",""),
PCN_MENU(170, "PCN_MENU",""),
PCN_MODULE(180, "PCN_MODULE","");
PCN_MODULE(180, "PCN_MODULE",""),
PCN_LOGOUT(190, "PCN_LOGOUT","");
private int value;
@ -3073,6 +3074,39 @@ public class MesEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
PLC("PLC", "PLC"),
DB("DB", "DB");
private String value;
private String description;
ONLINE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* WC_CHECK_TYPE 开线检查的模块
*/

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

@ -142,21 +142,21 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_MATCH_TYPE {
ORGANIZATION("10", "工厂"),
PART("20", "物料"),
CUST_CODE("30", "客户代码"),
CUST_PART_NO("40", "客户物料号"),
WORK_CENTER("50", "产线");
ORGANIZATION(10, "工厂"),
PART(20, "物料"),
CUST_CODE(30, "客户代码"),
CUST_PART_NO(40, "客户物料号"),
WORK_CENTER(50, "产线");
private String value;
private int value;
private String description;
MES_MATCH_TYPE(String value, String description) {
MES_MATCH_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
public int getValue() {
return value;
}
@ -164,7 +164,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(String val) {
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -175,9 +175,9 @@ public class MesPcnEnumUtil {
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_MATCH_TYPE getByValue(String value) {
public static MES_MATCH_TYPE getByValue(int value) {
for (MES_MATCH_TYPE mesMatchType : values()) {
if (mesMatchType.getValue().equals(value)) {
if (mesMatchType.getValue() == value) {
return mesMatchType;
}
}

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

@ -2810,7 +2810,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_PART_TYPE {
RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
private int value;
private String description;
@ -2850,8 +2850,9 @@ public class WmsEnumUtil {
}
public enum WMS_PART_TYPE_STR {
RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
private String value;
private String description;

15
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -493,6 +493,21 @@ public class DdlPreparedPack {
}
/**
* 两个提交用or拼接
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotOrIsNull(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and (model." + columnName + " in (:m_" + columnName + ") " +
"or model." + columnName + " is null)", data);
}
}
/**
* 封装in查询语句
*
* @param data

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

@ -124,7 +124,24 @@ public class LacLogTask extends BaseBean {
@ApiParam(value ="执行说明")
private String executionDescription;
@Transient
@ApiParam(value ="任务记录")
private LacCommandStackRecord record;
@Transient
@ApiParam(value ="任务记录")
private LacCommandStackTemplate template;
@Transient
@ApiParam(value ="任务步骤")
private LacCommandStackStep step;
@Transient
@ApiParam(value ="任务记录")
private LacCommandStackStepTask stackStepTask;
@Transient
@ApiParam(value ="步骤列表")
@ApiParam(value ="执行任务参数")
private List<LacLogTaskDetail> detailList;
}

5
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
Unescape Escape View File

@ -69,11 +69,6 @@ public class LacLogTaskDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long taskTypeId;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -100,21 +100,9 @@ public class MesPackage extends BaseBean {
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("打印缓存id")
private String printId;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
public MesPackage() {
}

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

@ -75,15 +75,15 @@ public class MesPart extends BaseBean {
@Column(name = "PROCESS_MATCH_TYPE")
@ApiParam("过程编码匹配类型")
private String processMatchType;
private Integer processMatchType;
@Column(name = "PACKAGE_MATCH_TYPE")
@ApiParam("包装编码匹配类型")
private String packageMatchType;
private Integer packageMatchType;
@Column(name = "PRODUCT_MATCH_TYPE")
@ApiParam("产品编码匹配类型")
private String productMatchType;
private Integer productMatchType;
@Transient
@ApiParam("分类名称")

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

@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
@ApiParam("开班时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("下班时间")
private String endTime;
@Column(name = "WORK_TIMES")
@ApiParam("作业时长")
private Double workTimes;

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

@ -73,9 +73,6 @@ public class ProdPackageModel {
@ApiParam("打印状态文字")
private String printStrStatus;
@ApiParam("客户代码名称")
private String custCodeName;
@ApiParam("包装层级名称")
private String packLevelName;

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

@ -53,4 +53,20 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("客户物料名称")
private String customerPartName;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("单位")
private String unit;
@ApiParam("特殊批号")
private String fixLotNo;
@ApiParam("生产工单号")
private String workOrderNo;
@ApiParam("生产线代码")
private String workCenterCode;
}

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

@ -99,16 +99,4 @@ public class MesPackage extends BaseBean {
@ApiParam("打印状态文字")
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
}

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

@ -79,13 +79,13 @@ public class MesPart extends BaseBean {
@Column(name = "PROCESS_MATCH_TYPE")
@ApiParam("过程编码匹配类型")
private String processMatchType;
private Integer processMatchType;
@Column(name = "PACKAGE_MATCH_TYPE")
@ApiParam("包装编码匹配类型")
private String packageMatchType;
private Integer packageMatchType;
@Column(name = "PRODUCT_MATCH_TYPE")
@ApiParam("产品编码匹配类型")
private String productMatchType;
private Integer productMatchType;
}

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

@ -30,11 +30,11 @@ public class MesProductEncodeCfg extends BaseBean {
@Column(name = "CODE_TYPE")
@ApiParam("编码类型")
private String codeType;
private Integer codeType;
@Column(name = "MATCH_TYPE")
@ApiParam("匹配类型")
private String matchType;
private Integer matchType;
@Column(name = "MATCH_VALUE")
@ApiParam("匹配值")

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

@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
@ApiParam("开班时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("下班时间")
private String endTime;
@Column(name = "WORK_TIMES")
@ApiParam("作业时长")
private Double workTimes;

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

@ -1700,10 +1700,10 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean);
}
if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) {
DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean);
DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean);
}
if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) {
DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean);
DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean);
}
if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) {
DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", packBean);

4
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
* 供应商批次
*/
public String dateCode;
@ApiParam(value = "物料信息")
public WmsPart wmsPart;
}

2
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -82,7 +82,7 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
return ddlPackBean;
}

44
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -104,7 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
/**
@ -112,7 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
*/
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isFree;
@Column(name = "REMARK")
@ -176,25 +176,25 @@ public class WmsDocMovementDetails extends BaseBean {
public Double inputMoveQty;
@Transient
@ApiParam(value ="标准包装",example = "1")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@Transient
@ApiParam(value ="条码总数量",example = "1")
@ApiParam(value = "条码总数量", example = "1")
private Double detailsSnCount;
@Transient
@ApiParam(value ="余数",example = "1")
@ApiParam(value = "余数", example = "1")
private Double restQty;
@Transient
@ApiParam("任务状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
private Integer isTask;
@Transient
@ApiParam("主表单据状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer orderMasterStatus;
@Transient
@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean {
return recommondLot == null ? "无" : this.recommondLot;
}
public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); }
public Double getQty() {
return qty == null ? 0D : this.qty.doubleValue();
}
public Double getOutQty() {
return outQty == null ? 0D : this.outQty.doubleValue();
}
public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); }
public Double getPickQty() {
return pickQty == null ? 0D : this.pickQty.doubleValue();
}
public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); }
public Double getActualQty() {
return actualQty == null ? 0D : this.actualQty.doubleValue();
}
public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
public Double getRecQty() {
return recQty == null ? 0D : this.recQty.doubleValue();
}
public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
public Integer getIsTaskVal() {
return isTask == null ? 0 : this.isTask.intValue();
}
public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
public Integer getOrderMasterStatus() {
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
}
@Version
@Column(name = "LOCK_VERSION")
@ -229,7 +245,7 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
@Column(name = "IS_SN")

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

@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean {
@Column(name = "SPEC_LEVEL")
@ApiParam(value = "规格层级")
private String specLevel;
private Integer specLevel;
@Column(name = "IS_MIXED")
@ApiParam(value = "是否混包")

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

@ -142,6 +142,10 @@ public class WmsPoSn extends BaseBean {
@ApiParam(value = "最晚收货时间")
public String latestReceTime;
@Column(name = "FIX_LOT_NO", nullable = false)
@ApiParam(value = "特殊批次")
private String fixLotNo = "";
public WmsPoSn(){}
public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){

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

@ -213,7 +213,7 @@ public class WmsHqlPack {
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getInPackList(numList, "priorRC", result);
DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
}else{
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}

Write Preview
Loading…
Cancel
Save