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

解决冲突

Browse Source
yun-zuoyi
王杰 5 years ago
parent 339dc46a56 9ee137a5c3
commit 9034418b7e
64 changed files with 554 additions and 178 deletions
Show Stats Download Patch File Download Diff File

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

@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="指定工艺路线")
private String specifyRouting;
@Column(name="RESYNCHRONIZE")
@ApiParam(value ="是否同步")
@FieldAnnotation(defaultValue = "true")
private Boolean resynchronize;
@Column(name="RECALC_COUNT")
@ApiParam(value ="是否重新计算数量")
@FieldAnnotation(defaultValue = "true")

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

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import cn.estsh.i3plus.pojo.base.common.Pager;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Description : 甘特图分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("甘特图分页查询参数")
public class GanttEventModel {
private Long[] resourceIds;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date begin;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date end;
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java → modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java
Unescape Escape View File

@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
@Data
public class ResourceLodaRequest {
public class ResourceLoadRequest {
private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)

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

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Description : 模块表单枚举类
@ -1973,7 +1972,7 @@ public class BlockFormEnumUtil {
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil {
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true";
}
}

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

@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATABASE_OPERATE_TYPE{
READ(1,"读取"),
WRITE(2,"写入");
WRITE(2,"写入"),
BATCH_WRITE(3,"批量写入");
private int value;
private String description;

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

@ -223,7 +223,8 @@ public class LacEnumUtil {
public enum PARAM_VALUE_TYPE{
INTEGER(1,"整数"),
STRING(2,"字符串"),
FLOAT(3,"浮点");
FLOAT(3,"浮点"),
ORGIN(99,"原始数据");
private int value;
private String description;
@ -347,15 +348,17 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOGICAL_OPERATOR{
OR(10,"或"),
AND(20,"与");
OR(10,"或","||"),
AND(20,"与","&&");
private int value;
private String description;
private String operator;
LOGICAL_OPERATOR(int value, String description) {
LOGICAL_OPERATOR(int value, String description, String operator) {
this.value = value;
this.description = description;
this.operator = operator;
}
public int getValue() {
@ -376,6 +379,16 @@ public class LacEnumUtil {
return tmp;
}
public static String valueOfOperator(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].operator;
}
}
return tmp;
}
}
/**
@ -383,19 +396,21 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RELATIONAL_OPERATOR{
GT(10,">"),
LT(20,"<"),
EQ(20,"=="),
NE(20,"!="),
GE(20,">="),
LE(20,"<=");
GT(10,"大于",">"),
LT(20,"小于","<"),
EQ(30,"等于","=="),
NE(40,"不等于","!="),
GE(50,"大于等于",">="),
LE(60,"小于等于","<=");
private int value;
private String description;
private String operator;
RELATIONAL_OPERATOR(int value, String description) {
RELATIONAL_OPERATOR(int value, String description,String operator) {
this.value = value;
this.description = description;
this.operator = operator;
}
public int getValue() {
@ -416,6 +431,16 @@ public class LacEnumUtil {
return tmp;
}
public static RELATIONAL_OPERATOR valueOf(int val) {
RELATIONAL_OPERATOR tmp = EQ;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
}
}
return tmp;
}
}
/**

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

@ -12,6 +12,76 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
ONE(10, "一套发运"),
TRUE(20, "多套发运"),
FALSE(30, "单产品多套发运");
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;
}
}
/**
* 是否解析
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_IS_PARSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
PLC_IS_PARSE(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALENDAR_TYPE {
@ -802,7 +872,7 @@ public class MesEnumUtil {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -2351,82 +2421,6 @@ public class MesEnumUtil {
}
/**
* mes按钮状态配置 判断符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_JUDGE_FLAG {
EQUAL("=", "等于"),
NOT_EQUAL("!=", "不等于"),
GREATER_THAN(">", "大于"),
NOT_LESS_THAN(">=", "大于大于"),
LESS_THAN("<", "小于"),
NOT_GREATER_THAN("<=", "小于等于");
private String value;
private String description;
MES_BUTTON_STATUS_JUDGE_FLAG(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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes按钮状态配置 逻辑符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_LOGIC_FLAG {
AND("&&", "逻辑与"),
OR("||", "逻辑或");
private String value;
private String description;
MES_BUTTON_STATUS_LOGIC_FLAG(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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrder实体对应的approvalStatus值 审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2860,7 +2854,8 @@ public class MesEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");;
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单");
private int value;
private String description;
@ -3565,8 +3560,8 @@ public class MesEnumUtil {
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
private int value;
private String code;

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

@ -131,8 +131,8 @@ public class MesPcnEnumUtil {
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
private int value;
private String code;
@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单");
private int value;
private String description;

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

@ -239,7 +239,7 @@ public class WmsEnumUtil {
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CLOSED(40, "CLOSED", "已关闭"),
CANCELLED(50, "CANCELLED", "已取消"),
FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成");
private int value;
private String code;
@ -701,7 +701,8 @@ public class WmsEnumUtil {
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生产入库");
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
private int value;
private String code;
@ -885,7 +886,8 @@ public class WmsEnumUtil {
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", "坤泰拣货");
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
private String value;
private String description;
@ -1077,7 +1079,7 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CARRIAGE_STATUS {
CREATE(10, "创建"),
PUBLISH(20, "发布"),
PUBLISH(20, "已发布"),
RECEIVE(30, "承运商接收"),
ARRIVE(40, "车辆到达"),
INSTALL(50, "装车完成"),
@ -3030,8 +3032,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", "容器"),
UTENSIL("50", "器具");
private String value;
private String description;
@ -3057,6 +3059,16 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}

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

@ -9,6 +9,7 @@ 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;
@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean {
@ApiParam(value ="步骤任务列表")
private List<LacCommandStackStepTask> stepTaskList;
@Transient
@ApiParam(value ="步骤任务检查")
private List<LacTaskCheck> taskCheckList;
public LacCommandStackStep() {
}

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

@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean {
// @Column(name="STEP_NAME_RDD")
// @ApiParam(value ="步骤名称")
// private String stepNameRdd;
//
// @Column(name="STEP_CODE_RDD")
// @ApiParam(value ="步骤代码")
// private String stepCodeRdd;
@Column(name="STEP_CODE_RDD")
@ApiParam(value ="步骤代码")
private String stepCodeRdd;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean {
@ApiParam(value ="步骤名称")
private String taskNameRdd;
@Column(name="STEP_CODE_RDD")
@Column(name="TASK_CODE_RDD")
@ApiParam(value ="任务代码")
private String taskCodeRdd;

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

@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean {
@Column(name="PARAM_VALUE_TYPE")
@ApiParam(value ="参数值类型")
@AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValueType;
@Column(name="PARAM_DEFAULT_VALUE")

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

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean {
@ApiParam(value ="目标步骤ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long targetStepId;
@Column(name="TARGET_STEP_NAME_RDD")
@ApiParam(value ="目标步骤名称")
private String targetStepNameRdd;
@Transient
private String value;
}

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

@ -27,6 +27,11 @@ import javax.persistence.Table;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

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

@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable {
@Transient
@ApiParam("显示颜色")
private String color;
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("展示行数")
private Integer prodNum;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工位")
private String workCellCode;
public QueueOrderModel() {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.annotation;
import java.lang.annotation.*;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/25 1:45 下午
* @Description:
**/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
public @interface UseMongoDb {
}

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

@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
@ApiParam("实体类名称")
private String ClassName;
@Column(name = "STATUS_FIELD")
@ApiParam("状态字段")
private String statusField;
@Column(name = "JUDGE_FLAG")
@ApiParam("判断符合")
private String judgeFlag;
@Column(name = "STATUS_VALUE")
@ApiParam("状态值")
private String statusValue;
@Column(name = "LOGIC_FLAG")
@ApiParam("逻辑符合")
private String logicFlag;
@Column(name = "APPEND_HQL")
@ApiParam("拼接HQL")
private String appendHql;
@Column(name = "STATUS_DESC")
@ApiParam("描述")

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

@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean {
@Transient
@ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
public String orderTimeEnd;
@Transient
@ApiParam("订单类型名称")
private String orderTypeName;
@Transient
@ApiParam("状态名称")
private String statusName;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.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;
/**
* @Author: Wynne.Lu
@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean {
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
@Transient
@ApiParam("操作类型名称")
private String operateTypeName;
}

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

@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean {
@ApiParam("对象类型")
private Integer notifyObjectType;
@Transient
@ApiParam("对象类型名称")
private String notifyObjectTypeName;
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.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 :设备作业通知配置
@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean {
@ApiParam("通知方式")
private Integer notifyPattern;
@Transient
@ApiParam("作业类型名称")
private String taskTypeName;
@Transient
@ApiParam("通知类型名称")
private String notifyTypeName;
@Transient
@ApiParam("通知方式名称")
private String notifyPatternName;
}

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

@ -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:
@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean {
@ApiParam("供应商代码")
private String supplierCode;
@Transient
@ApiParam("绑定规则名称")
private String bandRuleName;
public int getLengthVal() {
return this.length == null ? 0 : this.length;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.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;
/**
* @Author: Wynne.Lu
@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("是否存储")
private Integer isSave;
@Transient
@ApiParam("是否存储")
private String isSaveName;
}

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :包装规格
@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean {
@ApiParam("是否混包4")
private Integer isMixed4;
@Transient
@ApiParam("是否混包名称")
private String isMixedName;
@Transient
@ApiParam("是否混包2名称")
private String isMixedName2;
@Transient
@ApiParam("是否混包3名称")
private String isMixedName3;
@Transient
@ApiParam("是否混包4名称")
private String isMixedName4;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

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

@ -88,4 +88,16 @@ public class MesPart extends BaseBean {
@Column(name = "PRODUCT_MATCH_TYPE")
@ApiParam("产品编码匹配类型")
private Integer productMatchType;
@Transient
@ApiParam("过程编码匹配类型名称")
private String processMatchTypeName;
@Transient
@ApiParam("包装编码匹配类型")
private String packageMatchTypeName;
@Transient
@ApiParam("产品编码匹配类型")
private String productMatchTypeName;
}

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

@ -40,7 +40,7 @@ public class MesPcn extends BaseBean {
private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域")
@ApiParam("区域名称")
private String areaName;
@Column(name = "WORK_CENTER_CODE")
@ -48,7 +48,7 @@ public class MesPcn extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "PCN_VERSION")

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.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:
@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiParam("同步方式")
private String syncPatternName;
@Transient
@ApiParam("同步类型名称")
private String syncTypeName;
@Transient
@ApiParam(value = "同步的时候是否区分工厂")
private String isIgnoreOrgName;
public int getIsIgnoreOrgVal() {
return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
}

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

@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean {
public String areaCode;
@Transient
@ApiParam("状态名称")
private String statusName;
@Transient
@ApiParam("计划类型")
private String planTypeName;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeStart;

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,6 +34,7 @@ import javax.persistence.Transient;
@Index(columnList = "OBJECT_CODE"),
@Index(columnList = "MODIFY_DATE_TIME")
})
//@UseMongoDb
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")

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

@ -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:
@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean {
@Column(name = "RULE_CODE")
@ApiParam("编码规则代码")
private String ruleCode;
@Transient
@ApiParam("编码类型名称")
private String codeTypeName;
@Transient
@ApiParam("匹配类型名称")
private String matchTypeName;
}

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

@ -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:
@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean {
@ApiParam("检测项类型")
private String checkItemType;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;
}

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

@ -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 :工序工作单元
@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean {
@ApiParam("工作中心")
private String workCenterCode;
@Transient
@ApiParam("流程代码名称")
private String routeCodeName;
@Transient
@ApiParam("工序代码名称")
private String processCodeName;
}

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

@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean {
@ApiParam(value = "绑定数量")
private Double boundQty;
@Transient
@ApiParam(value = "是否可重复名称")
private String isRepeatName;
@Transient
@ApiParam(value = "是否检查名称")
private String isCheckName;
@Transient
@ApiParam(value = "是否投料配置名称")
private String isFeedName;
@Transient
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.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;
/**
* @Author: Wynne.Lu
@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean {
@ApiParam("检查标准")
private String standard;
@Transient
@ApiParam("检查类型名称")
private String checkTypeName;
}

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

@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean {
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Transient
@ApiParam("工位类型名称")
private String workCellTypeName;
}

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

@ -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 :工作单元参数
@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
@Transient
@ApiParam("参数类型名称")
private String paramTypeName;
@Transient
@ApiParam("参数模式名称")
private String paramModelName;
}

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

@ -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 :工作单元参数配置
@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean {
@Column(name = "IS_CHECK")
@ApiParam("是否必须校验")
private Integer isCheck;
@Transient
@ApiParam("是否必须校验名称")
private String isCheckName;
}

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

@ -31,6 +31,11 @@ import java.util.List;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

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

@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable {
@ApiParam("数据库名称")
private String dsDbName;
@ApiParam("数据源类型名称")
private String dsTypeName;
public MesDatasourceModel() {
}

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

@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
@ApiParam("作业类型名称")
private String taskTypeName;
@ApiParam("设备类别")
@ApiParam("设备类别名称")
private String equipmentCategoryName;

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
//package cn.estsh.i3plus.pojo.mes.repositorymongo;
//
//
//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
//import org.springframework.stereotype.Repository;
//
///**
// * @Author: Wynne.Lu
// * @CreateDate: 2019/12/25 1:30 下午
// * @Description:
// **/
//@Repository
//public interface MesProductDataRepository extends BaseMongoRepository<MesProductData, Long> {
//}

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

@ -2097,4 +2097,6 @@ public class MesHqlPack {
}
return packBean;
}
}

9
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import lombok.Data;
import org.slf4j.LoggerFactory;
@ -55,9 +56,13 @@ public class LacCommandStackModel {
this.recordId = commandStackRecord.getId();
}
public Object getTaskRequestParam(String taskCode){
public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
for (Task task : this.getRequest().getTaskList()) {
if(task.getCode().equals(taskCode)){
// 步骤代码为空时匹配所有任务参数
if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
return task.getParamList();
} else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd())
&& task.getCode().equals(stepTask.getTaskCodeRdd())) {
return task.getParamList();
}
}

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

@ -33,4 +33,10 @@ public class WmsStockFifoModel {
@ApiParam(value = "物料对应的存储区集合")
Map<String,List<String>> partToZonesMap;
@ApiParam(value = "波次配料物料清单")
boolean collectPicking = false;
@ApiParam("默认规则")
private String defaultRule;
}

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

@ -70,6 +70,12 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
private Integer softType;
public int getSoftTypeVal(){
if(softType==null){
return CommonEnumUtil.SOFT_TYPE.IMPP.getValue();
}
return softType.intValue();
}
//系统自带需要有初始化表，只能修改value，无法删除。
@Column(name="is_system")

22
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.thoughtworks.xstream.annotations.XStreamAlias;
@ -13,10 +14,12 @@ import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.math.NumberUtils;
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.Transient;
import java.util.List;
/**
* @Description : 适配器出入参
@ -53,6 +56,10 @@ public class BsSuitCaseParam extends BaseBean {
@ApiParam(value = "参数名称)")
private String paramName;
@Column(name = "PARENT_PARAM_Id")
@ApiParam(value = "上级参数id")
private String parentParamId;
@Column(name = "PARENT_PARAM_NAME")
@ApiParam(value = "上级参数名称)")
private String parentParamName;
@ -62,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean {
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValTypeId;
@JsonIgnore
public int getParamValTypeIdVal() {
return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue();
}
@ -80,7 +88,19 @@ public class BsSuitCaseParam extends BaseBean {
@Transient
@ApiParam(value = "参数值")
private String paramValue;
private Object paramValue;
@JsonIgnore
public String getParamValueStr() {
if (paramValue == null) {
return null;
}
return paramValue.toString();
}
@Transient
@ApiParam(value = "子级参数")
private List<BsSuitCaseParam> bsSuitCaseParamList;
}

7
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
Unescape Escape View File

@ -7,10 +7,8 @@ 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.Index;
import javax.persistence.Table;
import javax.persistence.*;
/**
* @Description : 适配记录参数
@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean {
@ApiParam(value = "参数名称")
private String paramName;
@Lob
@Column(name = "PARAM_VAL")
@ApiParam(value = "参数值")
private String paramVal;

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

@ -338,6 +338,7 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());

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

@ -123,4 +123,13 @@ public class WmsBom extends BaseBean {
this.bomNum = bomNum;
this.itemQty = itemQty;
}
public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) {
this.itemPartNo = itemPartNo;
this.itemPartNam = itemPartNam;
this.itemUnit = itemUnit;
this.bomNum = bomNum;
this.itemQty = itemQty;
this.effStartTime = effStartTime;
}
}

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

@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean {
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
}
public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) {
this.orderNo = orderNo;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.factQty = factQty;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.sn = sn;
this.qty = qty;
this.unit = unit;
this.srcLocateNo = srcLocateNo;
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
this.vendorNo= vendorNo;
}
public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
this.partNo=partNo;
this.partNameRdd = partNameRdd;

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -28,7 +29,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_CS_DETAILS")
@Table(name = "WMS_DOC_CS_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "VENDOR_NO"),
@Index(columnList = "SN")
})
@Api("盘点单冻结信息")
public class WmsCSOrderDetails extends BaseBean {
private static final long serialVersionUID = 1054153436116196360L;

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

@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean {
@ApiParam(value = "是否回收")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
private Integer isRecycle;
@Column(name = "LIMIT_UOM")
@ApiParam(value = "期限单位")
private String limitUom;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean {
@Column(name="COMMIT_DATE")
@ApiParam("提交日期")
public String commitDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "BOM生效日期")
@Column(name = "EFF_START_TIME")
private String effStartTime;
}

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

@ -208,7 +208,8 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("优先级")
private String priority;
private Integer priority;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
@ -272,4 +273,15 @@ public class WmsDocMovementDetails extends BaseBean {
this.destLocateNo = destLocateNo;
}
public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
this.partNo = partNo;
this.priority = priority;
this.orderNo = orderNo;
}
public WmsDocMovementDetails (String partNo,String orderNo) {
this.partNo = partNo;
this.orderNo = orderNo;
}
}

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

@ -8,10 +8,7 @@ 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;
import javax.persistence.*;
/**
* @Description : 附件表
@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
@Transient
@ApiParam("预览前缀")
public String previewPrefix;
}

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

@ -62,9 +62,9 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "已处理数量", example = "0")
public Double handledQty;
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
@ -198,17 +198,6 @@ public class WmsMoveDetails extends BaseBean {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
/* @JSONField(name="fPartNo")
public String getfPartNo() {
return fPartNo;
}
@JSONField(name="fPartName")
public String getfPartName() {
return fPartName;
}*/
public WmsMoveDetails() {
}
@ -289,4 +278,12 @@ public class WmsMoveDetails extends BaseBean {
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
public Double getHandledQtyVal() {
return this.handledQty == null ? 0 : this.handledQty.doubleValue();
}
}

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

@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean {
@Column(name = "POCKET_TYPE")
@ApiParam(value = "默认容器类型")
@ApiParam(value = "容器类型")
private String pocketType;
@ApiParam(value = "上级规格名称")

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

@ -90,7 +90,7 @@ public class WmsPart extends BaseBean {
private Double pu2su;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam(value = "标准包装", example = "1")
@ApiParam(value = "标包", example = "1")
private Double snp;
@ColumnDefault("2")

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

@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目的库位")
private String destLocateNo;
@Column(name = "DEST_MOVE_TYPE")
@ApiParam(value = "目的库位")
private String destMoveType;
public WmsRoutingRule(){}
}

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

@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
private String prodCfgTypeName;
@Transient
@ApiParam(value = "箱数", example = "-1")
@ApiParam(value = "箱数")
private Integer boxQty;
@Transient
@ApiParam(value = "零件数", example = "-1")
@ApiParam(value = "零件数")
private Double partQty;
@Transient
@ApiParam(value = "处理中数量")
private Double transQty;
@Transient
@ApiParam(value = "ERP库存地")
private String areaNo;
@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean {
public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
}
}

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

@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
@Transient
@ApiParam(value = "是否最早批次")
public String isFifo;
public WmsStockSn() {
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
Unescape Escape View File

@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("回执单地址")
private String pathUrl;
@ApiParam("关联单号")
private String refOrderNo;
}

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

@ -229,13 +229,13 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
}else{
} else {
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}
@ -923,8 +923,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@ -1613,7 +1613,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
new String[]{"sn", "createDatetime"}, result);
return result;
}
@ -1858,6 +1860,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result);
DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);
DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result);
@ -2006,8 +2009,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
@ -2426,7 +2429,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
@ -2617,15 +2620,15 @@ public class WmsHqlPack {
* @param wmsPullTaskMaster
* @return
*/
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) {
DdlPackBean result = new DdlPackBean();
List<String> stringList = null;
List<Integer> integerList = null;
//List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
if(StringUtils.isNotBlank(statusList)){
if (StringUtils.isNotBlank(statusList)) {
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
for(String sl : stringList){
for (String sl : stringList) {
integerList.add(Integer.valueOf(sl));
}
}

3
pom.xml
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save