diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java new file mode 100644 index 0000000..07513fd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :刷新计划规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-07-11 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_FLUSH_PLAN_RULE") +@Api("刷新计划规则") +public class FlushPlanRule extends BaseRule { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 6d1814a..a5caf9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -28,6 +28,7 @@ public class DateDuration { private int time = 0; private double rate = 0.0; private boolean bValid = false; + private int unit = 0; public DateDuration(int value) { this.time = value; @@ -147,6 +148,9 @@ public class DateDuration { if (amount < PRECISION) return getTime(); + if (this.unit > 0) { + amount = Math.ceil(amount / this.unit); + } double result = (amount * this.rate) + this.time; return (int)Math.ceil(result); } @@ -184,10 +188,11 @@ public class DateDuration { for (EV_STRING evs : lst) { if (evs.type == EV_STRING_TYPE.EVS_GOOD) { AbstractMap.SimpleEntry extraTime = transTimeEach(evs.value); - if (extraTime.getKey() || !oFlg) { + if (extraTime.getKey() || oFlg) { this.time += extraTime.getValue(); } else { - this.time += extraTime.getValue() * 1; + //this.time += extraTime.getValue() * 1; + this.unit = extraTime.getValue(); } } else { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java new file mode 100644 index 0000000..2331242 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * 表格右键菜单 + */ +@Data +public class ContextMenu { + + private String text; + + private String uri; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java new file mode 100644 index 0000000..481eb3e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Data +public class ShiftReportModel { + private List dates = new ArrayList<>(); + private List headers = new ArrayList<>(); + private Set labels = new HashSet<>(); + + private List>> datas = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java new file mode 100644 index 0000000..703a137 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.Date; + +/** + * @Description :时间段信息，包含指示该时间段是上班还是下班 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +public class TimeBlock implements Comparable { + private Date begin; + private Date end; + private boolean onDuty = true; + private String shift; + + @Override + public int compareTo(TimeBlock o) { + if (this.getBegin().equals(o.getBegin())) { + if (this.getEnd().equals(o.getEnd())) { + return 0; + } + return this.getEnd().before(o.getEnd()) ? -1 : 1 ; + } + return this.getBegin().before(o.getBegin()) ? -1 : 1; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java new file mode 100644 index 0000000..1a3ee55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FlushPlanRule; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FlushPlanRuleRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9367fd1..d537b55 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") - @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, dataSrc = "/impp/operate/sys-user/query-user-by-pager", searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") @@ -97,7 +96,6 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") - @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, dataSrc = "/impp/operate/sys-user/query-user-by-pager", searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 23def74..43ae439 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -283,7 +283,8 @@ public class ApsEnumUtil { CANCEL_PLAN("CANCEL_PLAN", "取消计划"), MAT_CALC("MAT_CALC", "物料运算"), HEURISTIC("HEURISTIC", "排程运算"), - FIELD_SET("FIELD_SET", "字段赋值"); + FIELD_SET("FIELD_SET", "字段赋值"), + FLUSH_PLAN("FLUSH_PLAN", "刷新计划"); private String value; private String description; @@ -420,7 +421,9 @@ public class ApsEnumUtil { NEARLY_WORK("NEARLY_WORK", "前后工作"), POST_RESOURCE("POST_RESOURCE", "后资源制约"), SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"), - RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"); + RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"), + RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"), + CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index ce238d6..cc7e9ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6640,4 +6640,55 @@ public class MesEnumUtil { return tmp; } } + + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"); + + private Integer value; + private String code; + private String description; + + GROUP_SIDE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 2e23a27..336731e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -718,7 +718,7 @@ public class MesPcnEnumUtil { DEFECTED(20, "不合格"), SCRAPED(30, "报废"), DISMANTLED(40, "已拆解"), - PRE_CHECK(50, "待检测"); + PRE_CHECK(5, "待检测"); private int value; private String description; @@ -2385,6 +2385,7 @@ public class MesPcnEnumUtil { INSTOCKED(40, "入库"), SHIPPING(50, "发运"), REDO(60, "重做"), + FORCE(70, "强过"), CLOSE(90, "关闭"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d298220..e1371ad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -300,6 +300,63 @@ public class WmsEnumUtil { } /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS_KANBAN { + TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), + RECEIVING(20, "RECEIVING", "收货中"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + COMPLETED(40, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + REC_STATUS_KANBAN(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 订单明细状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -515,7 +572,8 @@ public class WmsEnumUtil { SPILLAGE_LOCATE(70, "Y", "溢料库"), TRANSIT_LOCATE(80, "T", "在途库"), UTENSIL_LOCATE(90, "U", "器具库"), - OPERATION_PALTFORM(100, "W", "工作台"); + OPERATION_PALTFORM(100, "W", "工作台"), + CUST_LOCATE(110, "CUST", "客户库位"); private int value; private String code; @@ -1649,6 +1707,42 @@ public class WmsEnumUtil { * 质检业务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + INSPECTION_FREE(10, "免检"), + PENDING_QUALITY_INSPECTION(20, "待质检"), + QUALITY_INSPECTION_COMPLETED(30, "质检完成"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(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 QC_INFO_STATUS { CREATE(10, "新建"), FINISH(20, "处理中"), @@ -2546,7 +2640,8 @@ public class WmsEnumUtil { BOX(10, "BOX", "BOX（盒）"), CARTON(20, "CARTON", "CARTON（箱）"), PALLET(30, "PALLET", "PALLET（栈板）"), - CONTAINER(40, "PALLET", "PALLET（集装箱）"); + CONTAINER(40, "PALLET", "PALLET（集装箱）"), + FEEDER(50, "FEEDER", "料架"); private String code; private String description; @@ -2569,6 +2664,16 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } /** @@ -8454,4 +8559,154 @@ public class WmsEnumUtil { return null; } } + + /** + * RFID操作类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RFID_OPERATE_TYPE { + IN_STORAGE(10, "IN_STORAGE", "入库"), + SHIPEMNT(20, "SHIPEMNT", "发运"), + BACK_STORAGE(30, "BACK_STORAGE", "回库"), + UN_BUNDING(40, "UN_BUNDING", "解绑"), + BUNDING(50, "BUNDING", "绑定"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + RFID_OPERATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static RFID_OPERATE_TYPE 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; + } + } + + /** + * 频次 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FREQUENCY { + ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"), + STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"), + TASK_GENERATE(30, "AMP", "AMP"); + + private int value; + private String code; + private String description; + + FREQUENCY(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static FREQUENCY 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 7bfc2e8..25b58db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -36,7 +36,7 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { private String custPlantCode; @Column(name = "QTY") - @ApiParam("数量") + @ApiParam("配置数量") private Integer qty; @Column(name = "THRESHOLD_QTY") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index 42b3801..419799b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -27,14 +27,14 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_TYPE") -@Api("产品配置类型") +@Api("项目") public class MesProdCfgType extends BaseBean implements Serializable { private static final long serialVersionUID = -1726288926948811617L; @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("产品配置类型代码") + @ApiParam("项目代码") private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") - @ApiParam("产品配置类型名称") + @ApiParam("项目名称") private String prodCfgTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 6357830..e632e1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -68,4 +68,8 @@ public class MesProdPack extends BaseBean implements Serializable { @Column(name = "PROD_CFG_TYPE") @ApiParam("项目") private String prodCfgType; + + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index c0d1436..3bfe3b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("是否执行 1=是 2=否") private Integer isActive; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index a459fb4..1c1795f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -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; import java.io.Serializable; /** @@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "CNT_QTY") @ApiParam("累计数") private Integer cntQty; + + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java index c9e3f4f..dd39bd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_GROUP_COUNT + * @Description : * @Reference : * @Author : joke * @CreateDate : 2020-03-06 10:16 上午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 5aba4be..394d96c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -116,6 +116,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("已生产数量") private Double finsihQty; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("Vin") private String vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 7eab5e8..5a75ba4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 9a83d79..40dadcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -282,6 +282,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("零件名称集合") private String partNameList; + @Transient + @ApiParam("客户集合") + private List custList; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 808c05f..2265b41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean { @ApiParam("父阶物料名称") private String parentPartName; + @ApiParam("实际包装数量") + private Integer compQty; + private List prodPackageList; private String partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 28f65f5..b554be7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable { @ApiParam("产品条码") public String productSn; + @ApiParam("过程条码") + private String serialNumber; + // 包装主表--包装编号 @ApiParam("一检箱条码") public String packageNo; @@ -60,15 +63,15 @@ public class ProdPackModel implements Serializable { public ProdPackModel() { } - public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.createDatetime = createDatetime; this.printStatus = printStatus; } - public ProdPackModel(String productSn, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.custSn = custSn; this.printStatus = printStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f271030..5f310b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; - this.pptCode=pptCode; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; } + //getAlreadyQueueOrderModelNoSn - public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; - this.serialNumber=serialNumber; + this.serialNumber = serialNumber; } //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo @@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 8adee52..4d37f07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -73,6 +73,9 @@ public class StepModel implements Serializable { @ApiParam("参数代码") private String paramCode; + @ApiParam("工步展示名称") + private String stepDisplayName; + /** * 工作单元代码 */ @@ -83,7 +86,7 @@ public class StepModel implements Serializable { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -93,6 +96,7 @@ public class StepModel implements Serializable { this.processCode = processCode; this.stepSeq = stepSeq; this.paramCode = paramCode; + this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index ce8737a..04924a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -630,6 +630,9 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } + if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) { + DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 56b2696..9036bc3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -885,6 +885,23 @@ public class CoreHqlPack { return result; } + + /** + * 任务复杂查询 + * + * @param sysTask + * @return + */ + public static DdlPackBean packHqlCheckSysTaskOnly(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(sysTask.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getTaskCode(), "taskCode", result); + + return result; + } + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) { StringBuffer result = new StringBuffer(); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index fbc0fe3..001ffe6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -39,10 +39,18 @@ public class IfPickData extends BaseBean implements Serializable { @ApiParam("区段编号") private String sectionNo; + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + @Column(name = "PART_NO") @ApiParam("物料编号") private String partNo; + @Column(name = "BIN位代码") + @ApiParam("物料编号") + private String binNo; + @Column(name = "QTY") @ApiParam("拣货数量") private Integer qty; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index c40e78d..4d24640 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -335,6 +335,12 @@ public class PtlHqlPack { return packBean; } + /** + * 区域 + * @param area + * @param organizeCode + * @return + */ public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode); DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean); @@ -342,6 +348,12 @@ public class PtlHqlPack { return packBean; } + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); @@ -351,4 +363,16 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); return packBean; } + + /** + * IF_拣货数据 + * @param pickData + * @param organizeCode + * @return + */ + public static DdlPackBean getIfPickData(IfPickData pickData, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 1f2f1d4..f6e866e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -16,6 +16,7 @@ import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 盘点单冻结信息 @@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; + /** + * 差异类型：10：盘平，20：盘亏，30盘赢 + */ + @Transient + @ApiParam("差异集合") + @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description") + public List differenceTypeList; + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 640dca1..8734084 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -227,6 +227,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "库位箱数") private Long qty; + @Transient + @ApiParam(value = "不等于库位类型") + private Integer notLocateType; + public WmsLocate() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index ee9d550..0c358df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -235,7 +235,7 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, - String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) { this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; @@ -256,6 +256,7 @@ public class WmsMoveMaster extends BaseBean { this.createUser = createUser; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.refSrc = refSrc; } public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 189a4f6..31cf362 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -1,6 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +38,7 @@ public class WmsPackage extends BaseBean { public String packageNo; @Column(name="PACKAGE_TYPE_ID") + @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) @ApiParam(value = "包装类型", example = "1") public Integer packTypeId; @@ -64,4 +69,9 @@ public class WmsPackage extends BaseBean { @Column(name="MEMO") @ApiParam(value = "备注") public String memo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 1878152..d0c88bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -284,6 +284,13 @@ public class WmsPart extends BaseBean { public Integer isRecycle; + @Column(name = "FREQUENCY") + @ApiParam(value = "频次", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY") + @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true) + private Integer frequency; + + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java new file mode 100644 index 0000000..2a808e1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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 : RFID条码操作记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-10 14:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_RFID_OPERATE_RECORD") +@Api("RFID条码操作记录表") +public class WmsRfidOperateRecord extends BaseBean { + private static final long serialVersionUID = -2506345764570725810L; + + @Column(name="RFID_SN") + @ApiParam("RFID_条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String rfidSn; + + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Integer operateType; + + @Column(name="SRC_LOCATE") + @ApiParam("源库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String srcLocate; + + @Column(name="DEST_LOCATE") + @ApiParam("目标库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String destLocate; + + @Column(name="SRC_QTY") + @ApiParam("源数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Integer srcQty; + + @Column(name="DEST_QTY") + @ApiParam("目标数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Integer destQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 5ad3da6..a3f367b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "检测结果ID") private Long summaryId; + @Transient + @ApiParam(value = "颜色") + private String color; + public WmsStockSn() { } @@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd, String workOrderCode) { + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -792,6 +796,7 @@ public class WmsStockSn extends BaseBean { this.prodCfgTypeName = prodCfgTypeName; this.custNameRdd = custNameRdd; this.workOrderCode = workOrderCode; + this.color = color; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index c945e71..8a5f846 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class MappingItem { +public class MappingItem implements Comparable { /** * 来源字段名称 */ @@ -38,6 +38,11 @@ public class MappingItem { */ public Object defaultValue; + /** + * 字段的顺序号 + */ + public int seq; + @Override public String toString() { return "srcName:" @@ -45,6 +50,12 @@ public class MappingItem { + this.destBeanName + ", destName" + this.destName + ", defaultValue:" + this.defaultValue + ", destPk:" - + this.destPk; + + this.destPk + ", seq:" + + this.seq; + } + + @Override + public int compareTo(MappingItem o) { + return this.seq - o.seq; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java new file mode 100644 index 0000000..f5f2c4a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-07-09 9:50 上午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出实体类") +public class WmsReceiptKanbanDto { + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "频次") + private String frequency; + + @ApiParam(value = "供应商名称") + private String verdorName; + + @ApiParam(value = "订单号") + private String orderNo; + + + @ApiParam(value = "道口") + private String dock; + + @ApiParam(value = "项目") + private String prodCfgTypeCode; + + @ApiParam(value = "窗口时间") + private String planDate; + + @ApiParam(value = "开始收货时间") + private String earliestReceTime; + + @ApiParam(value = "结束收货时间") + private String latestReceTime; + + @ApiParam(value = "收货状态") + private String receStatus; + + @ApiParam(value = "质检状态") + private String qcStatus; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java new file mode 100644 index 0000000..d36ff17 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsRfidOperateRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : RFID条码操作记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-10 14:46 + * @Modify: + **/ +@Repository +public interface WmsRfidOperateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d132855..1da58a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -198,6 +198,7 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean); DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean); DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./