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 0fb1f78..7dc73f0 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 @@ -17,7 +17,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { - WORK_ORDER_LANDED(10, "生产工单下达"); + WORK_ORDER_LANDED(10, "生产工单下达"), + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); private int value; private String description; @@ -2915,7 +2916,9 @@ 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工单"), + STOCK_ORDER(60, "库存工单"); private int value; private String description; @@ -4068,7 +4071,7 @@ public class MesEnumUtil { * 客户JIT生产队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_STATUS { + public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), CANCEL(30, "取消"); @@ -4076,7 +4079,7 @@ public class MesEnumUtil { private int value; private String description; - MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -4104,13 +4107,119 @@ public class MesEnumUtil { * 客户JIT生产队列特殊标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); private int value; private String description; - MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + SHIPMENT(30, "已发运"); + + private int value; + private String description; + + QUEUE_JIS_STATUS(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 QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"); + + private int value; + private String description; + + QUEUE_ORDER_QUEUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIS发运队列明细 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_DETAIL_STATUS { + CREATE(10, "创建"), + SHIPMENT(20, "已发运"); + + private int value; + private String description; + + QUEUE_JIS_DETAIL_STATUS(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index cd9a311..8956db4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -476,7 +476,7 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7d3d688..3dfb805 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -351,12 +351,12 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_LIGHT_COLOR_CMD { - TAG_LIGHT_COLOR_RED("00", 0, "红"), - TAG_LIGHT_COLOR_GREEN("01", 1, "绿"), - TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"), - TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"), - TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"), - TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿"); + TAG_LIGHT_COLOR_RED("00", 1, "红"), + TAG_LIGHT_COLOR_GREEN("01", 2, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿"); private String code; private Integer value; @@ -441,18 +441,18 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FINISH_TAG_LIGHT_MUSIC_CMD { - FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"), - FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"), - FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"), - FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"), - FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"), - FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"), - FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"), - FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"), - FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"), - FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"), - FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"), - FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss"); + FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss"); private String code; private Integer value; @@ -927,6 +927,9 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), @@ -956,67 +959,11 @@ public class PtlPcnEnumUtil { } /** - * PTL_区段亮灯任务明细状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TASK_DETAIL_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); - - private int value; - private String code; - private String description; - - TASK_DETAIL_STATUS(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); - } - } - - /** - * PTL_区段、区域亮灯任务状态 + * PTL_区段亮灯任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_STATUS { CREATE(10, "CREATE", "新建"), - RECEIPT(20, "RECEIPT", "执行中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); private int value; @@ -1360,7 +1307,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; @@ -1525,64 +1472,10 @@ public class PtlPcnEnumUtil { return valueOf(val); } } - /** - * 区域任务状态(ASN,PO,MOVE,QC) - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MASTER_ORDER_STATUS { - CREATE(10, "CREATE", "创建"), - RECEIPT(20, "IN_PROGRESS", "处理中"), - RECEIPT_FINISH(30, "COMPLETED", "已完成"), - CANCELLED(40, "CANCELLED", "已取消"); - private int value; - private String code; - private String description; - MASTER_ORDER_STATUS(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); - } - } /** - * 区域任务类型(ASN,PO,MOVE,QC) + * 区段任务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_TYPE { @@ -1636,14 +1529,14 @@ public class PtlPcnEnumUtil { return valueOf(val); } } + /** - * 区域任务状态(ASN,PO,MOVE,QC) + * 区域任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_STATUS { CREATE(10, "CREATE", "创建"), - RECEIPT(20, "IN_PROGRESS", "处理中"), - RECEIPT_FINISH(30, "COMPLETED", "已完成"); + RECEIPT_FINISH(30, "COMPLETED", "完成"); private int value; private String code; @@ -1693,7 +1586,7 @@ public class PtlPcnEnumUtil { } /** - * 区域任务类型(ASN,PO,MOVE,QC) + * 区域任务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_TYPE { 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 57cadad..44f3039 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 @@ -3155,10 +3155,21 @@ public class WmsEnumUtil { } 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); } + public static int descriptionOfValue(String desc) {return descOf(desc);} + } @@ -4955,10 +4966,20 @@ public class WmsEnumUtil { } 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); } + public static int descriptionOfValue(String desc) {return descOf(desc);} } /** @@ -5066,4 +5087,67 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 交易类型-单据回退类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_BACK_TYPE { + REC_QTY(10, "REC_QTY", "已收货数量"), + PICK_QTY(20, "PICK_QTY", "已拣货数量"), + MOVE_QTY(30, "MOVE_QTY", "已移库数量"), + OUT_QTY(40, "OUT_QTY", "已出库数量"); + + private int value; + private String code; + private String description; + + ORDER_BACK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static ORDER_BACK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 620fa7d..649fe2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Map; @@ -378,4 +379,7 @@ public interface BaseRepository extends JpaReposito double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + List findByHqlWhereByClear(DdlPackBean packBean, String dateTime); + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 103be31..d9c5e6f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1548,4 +1548,23 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return num; } + + @Override + public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + LOGGER.info("PTL-PCN数据清除查询"); + StringBuffer queryString = new StringBuffer(); + queryString.append("select model from " + persistentClass.getSimpleName() + + " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " "); + + if (packBean != null) { + queryString.append(packBean.getWhereAppend()); + } + + Query query = entityManager.createQuery(queryString.toString()); + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.getResultList(); + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 8e246ce..54b9201 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean { } @Transient + @ApiParam(value ="是否为数据有效字段") + private transient Integer isValidProperty; + + @Transient + @ApiParam(value ="是否为弱删除字段") + private transient Integer isDeleteWeaklyProperty; + + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 43874a3..ee72ad6 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.form.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -79,6 +78,22 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_DEL_WEAK") + @ApiParam(value = "是否弱删除") + private Integer isObjectDelWeak; + + @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID") + @ApiParam(value = "元素弱删除属性id") + private Long elementDelWeakAttrId; + + @Column(name = "IS_OBJECT_VALID") + @ApiParam(value = "是否有效") + private Integer isObjectValid; + + @Column(name = "ELEMENT_VALID_ATTR_ID") + @ApiParam(value = "元素有效属性id") + private Long elementValidAttrId; + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java new file mode 100644 index 0000000..097c8d3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 8:59 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_DETAIL") +@Api("MES_散件产品配置关系") +public class MesProdScatterDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3602480079910597288L; + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("散件产品名称") + private String partName; +} 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 1133c1a..a459fb4 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 @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @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/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 249fd29..4a6ca87 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + @Transient @ApiParam("颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 5ac2924..8c8e9bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e3f8e55..0f191b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -88,4 +88,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户需求结束时间") private String custPointEndDate; + @Transient + @ApiParam("产品配置名称") + private String prodCfgName; + + @Transient + @ApiParam("状态名称") + private String statusName; + + @Transient + @ApiParam("特殊标识名称") + private String specialFlagName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 77e6c6f..832419c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1442091799346314190L; - @Column(name = "QGR_CODE") - @ApiParam("分组规则代码") - private String qgrCode; + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; @Column(name = "PROD_CFG_CODE") @ApiParam("配置代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 159aa03..fa0c07b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaCode; + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "WORK_TYPE") + @ApiParam("区域代码") + private String workType; + + @Column(name = "QUEUE_TYPE") + @ApiParam("队列类型") + private Integer queueType; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; 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 040bac7..1b817ca 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 @@ -72,11 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "产品生产类型") +@Column(name = "产品生产类型") @ApiParam("产品类型名称") private String pptCode; - @Transient + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index d3ab791..3cd4e8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("按配置修改按钮") private boolean updateButtonConfig; + @ApiParam("按散件修改按钮") + private boolean updateButtonScatter; + @ApiParam("下达按钮") private boolean transmitButton; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4961d3..357f9e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @ApiParam("生产主队列编号") + private String orderNo; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java new file mode 100644 index 0000000..254cfb8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 9:16 上午 + * @Modify: + */ +public interface MesProdScatterDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9e068c0..914920f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -226,15 +226,28 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean); } + if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); + } + if (mesQueueOrder.getQueueType() != null) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean); + } + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesQueueOrder.getCreateDateTimeStart(), - mesQueueOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - + if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesQueueOrder.getCreateDateTimeStart(), + mesQueueOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } // DdlPreparedPack.getOrderDefault(mesQueueOrder); return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java index b4d1527..5d35929 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -30,4 +30,7 @@ public class WmsSearchGroupModel { @ApiParam(value = "有效性") public Integer isValid; + + @ApiParam(value = "工厂代码") + public String organizeCode; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java new file mode 100644 index 0000000..4033d02 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 更改三维坐标MoDel + * @Reference + * @Author dragon + * @CreateDate 2020/3/6 17:57 + * @Modify + */ +@Data +public class WmsTdChangeModel implements Serializable { + private static final long serialVersionUID = -2682858106052506217L; + + private List wmsZonesList; + private List wmsFurnitureList; + private List wmsLocateList; + private String organizeCode; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 6aec23d..55a0d3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -82,11 +82,11 @@ public class PtlBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effStartTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effEndTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effEndTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java new file mode 100644 index 0000000..360d748 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * @author adair.song + * @date 2020/03/09 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_PCN_CLEAR") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_PCN数据清理") +public class PtlPcnClear extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443273899197995L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam("获取数据条件") + private String extractCondition; + + @Column(name = "ACTION_FREQUENCY") + @ApiParam("执行频率") + private Integer actionFrequency; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam("上一执行时间") + private String lastSyncTime; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 6fd597a..060404d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -77,6 +77,26 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; + @Column(name = "IS_IGNORE_ORG") + @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; + } + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 7dd41d4..32bbe43 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -44,4 +44,7 @@ public class LightOnModel implements Serializable { @ApiParam("是否熄灯") private Integer lightFlag; + @ApiParam("状态") + private Integer status; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java new file mode 100644 index 0000000..c39a211 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnClear; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnClearRepository extends BaseRepository { +} 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 39fec2c..bbb4564 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 @@ -235,6 +235,7 @@ public class PtlHqlPack { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index e3ddc5b..30d7725 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,52 +28,63 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_WAREHOUSE") +@Table(name = "WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; - @Column(name="CODE") + @Column(name = "CODE") @ApiParam("仓库代码") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String code; - @Column(name="NAME") + @Column(name = "NAME") @ApiParam("仓库名称") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String name; - @Column(name="ADDRESS") + @Column(name = "ADDRESS") @ApiParam("仓库地址") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; - @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)") - @ApiParam(value = "长") + @Column(name = "WH_LENGTH") + @ApiParam(value = "长(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whLength; + private Integer whLength; - @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)") - @ApiParam(value = "宽") + @Column(name = "WH_WIDTH") + @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whWidth; + private Integer whWidth; - @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)") - @ApiParam(value = "高") + @Column(name = "WH_HEIGHT") + @ApiParam(value = "高(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whHeight; + private Integer whHeight; + + @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") + @ApiParam(value = "基本单元（米）") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Double baseUnit; @Transient - @ApiParam(value ="存储区列表") + @ApiParam(value = "存储区列表") private List zoneList; - public double getWhLengthVal() { - return this.whLength == null ? 0 : this.whLength.doubleValue(); + public Integer getWhLengthVal() { + return this.whLength == null ? 0 : this.whLength.intValue(); + } + + public Integer getWhWidthVal() { + return this.whWidth == null ? 0 : this.whWidth.intValue(); } - public double getWhWidthVal() { - return this.whWidth == null ? 0 : this.whWidth.doubleValue(); + + public Integer getWhHeightVal() { + return this.whHeight == null ? 0 : this.whHeight.intValue(); } - public double getWhHeightVal() { - return this.whHeight == null ? 0 : this.whHeight.doubleValue(); + + public Double getBaseUnitVal() { + return this.baseUnit == null ? 0 : this.baseUnit.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index fe8ebc7..6d70ddc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean { public String[] wmsCSParts; @Transient + @ApiParam(value = "盘点物料清单") + public String wmsCSPartsStr; + + @Transient @ApiParam(value = "盘点存储区清单") public String[] wmsCSZones; @Transient + @ApiParam(value = "盘点存储区清单") + public String wmsCSZonesStr; + + @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 9c02389..33453b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("客户订单号") public String custOrderNo; + @Column(name = "ASSIGN_DATE_CODE") + @ApiParam(value = "指定生产日期") + private String assignDateCode; + @Transient @ApiParam("实际批次") private String actualLot; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d05658c..9e8d916 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -127,6 +127,11 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + + @Transient + @ApiParam("打印模板") + private String templateNo; + @Transient @ApiParam("剩余箱数量") private Long countBox; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index a6f6904..929b274 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.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; /** * @Description 家具实体 @@ -49,7 +50,35 @@ public class WmsFurniture extends BaseBean { @ApiParam(value = "是否储物") private Integer isSaveGoods; - public int getIsSaveGoodsVal() { + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; + + @Transient + @ApiParam(value = "层") + private Integer storey; + + @Transient + @ApiParam(value = "列") + private Integer fntCol; + + public WmsFurniture() { + } + + public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo, + Integer isSaveGoods, String position, Integer storey, Integer fntCol) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.typeCode = typeCode; + this.furnitureNo = furnitureNo; + this.isSaveGoods = isSaveGoods; + this.position = position; + this.storey = storey; + this.fntCol = fntCol; + } + + public Integer getIsSaveGoodsVal() { return this.isSaveGoods == null ? 0 : this.isSaveGoods; } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java index 2ee5b0f..d9dd033 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java @@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean { @ApiParam(value = "类型名称") private String typeName; - @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_LENGTH") @ApiParam(value = "长") - private Double fntLength; + private Integer fntLength; - @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_WIDTH") @ApiParam(value = "宽") - private Double fntWidth; + private Integer fntWidth; - @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_HEIGHT") @ApiParam(value = "高") - private Double fntHeight; + private Integer fntHeight; @Column(name = "STOREY") @ApiParam(value = "层") @@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean { @ApiParam(value = "是否储物") private Integer isSaveGoods; - public Double getFntLengthVal() { - return this.fntLength == null ? 0 : this.fntLength.doubleValue(); + public Integer getStoreyVal() { + return this.storey == null ? 0 : this.storey.intValue(); } - public Double getFntWidthVal() { - return this.fntWidth == null ? 0 : this.fntWidth.doubleValue(); + + public Integer getFntColVal() { + return this.fntCol == null ? 0 : this.fntCol.intValue(); + } + + public Integer getFntLengthVal() { + return this.fntLength == null ? 0 : this.fntLength.intValue(); + } + + public Integer getFntWidthVal() { + return this.fntWidth == null ? 0 : this.fntWidth.intValue(); + } + + public Integer getFntHeightVal() { + return this.fntHeight == null ? 0 : this.fntHeight.intValue(); } - public Double getFntHeightVal() { - return this.fntHeight == null ? 0 : this.fntHeight.doubleValue(); + + public Integer getIsSaveGoodsVal() { + return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue(); } } 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 41092ce..a5b6221 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 @@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; - @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "LC_LENGTH") @ApiParam(value = "长") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcLength; + private Integer lcLength; - @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "LC_WIDTH") @ApiParam(value = "宽") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcWidth; + private Integer lcWidth; - @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)") + @Column(name = "LC_HEIGHT") @ApiParam(value = "高") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcHeight; + private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") @@ -147,6 +147,10 @@ public class WmsLocate extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; + // 导入用 @ApiParam(value = "工厂") @Transient @@ -240,18 +244,28 @@ public class WmsLocate extends BaseBean { return this.locateType== null ? 0 : this.locateType.intValue(); } - public Double getLcLengthVal() { - return this.lcLength == null ? 0 : this.lcLength.doubleValue(); + public Integer getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.intValue(); + } + + public Integer getLcLengthVal() { + return this.lcLength == null ? 0 : this.lcLength.intValue(); } - public Double getLcWidthVal() { - return this.lcWidth == null ? 0 : this.lcWidth.doubleValue(); + public Integer getLcWidthVal() { + return this.lcWidth == null ? 0 : this.lcWidth.intValue(); } - public Double getLcHeightVal() { - return this.lcHeight == null ? 0 : this.lcHeight.doubleValue(); + public Integer getLcHeightVal() { + return this.lcHeight == null ? 0 : this.lcHeight.intValue(); } - public Integer getFrequencyVal() { - return this.frequency == null ? 0 : this.frequency.intValue(); + public Integer getXVal() { + return this.x == null ? 0 : this.x.intValue(); + } + public Integer getYVal() { + return this.y == null ? 0 : this.y.intValue(); + } + public Integer getZVal() { + return this.z == null ? 0 : this.z.intValue(); } 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 292a424..f9e000a 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 @@ -310,6 +310,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "预计完成时间") private String planCompleteTime; + @Transient + @ApiParam(value = "集装箱号") + private String containerNo; + public WmsStockSn() { } @@ -395,4 +399,12 @@ public class WmsStockSn extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + this.partNo = partNo; + this.packageNo =packageNo; + this.locateNo = locateNo; + this.createDatetime=createDatetime; + this.modifyDatetime = modifyDatetime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 107503e..a20ea25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "是否发送异常邮件") private Integer isSendErrorEmail; + @Column(name = "ORDER_BACK_TYPE") + @ApiParam(value = "单据回退类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description") + private Integer orderBackType; + @Transient @ApiParam("菜单URL") private String menuUrl; @@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean { @ApiParam("交易处理组件调用类") private String callClass; - public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 4c9e00d..e11133a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -103,15 +103,19 @@ public class WmsZones extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer checkFifo; - @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double zoneLength; + private Integer zoneLength; - @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double zoneWidth; + private Integer zoneWidth; + + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; @Transient @ApiParam(value = "子存储区列表") @@ -129,10 +133,10 @@ public class WmsZones extends BaseBean { public WmsZones() { } - public double getZoneLengthVal() { - return this.zoneLength == null ? 0 : this.zoneLength.doubleValue(); + public Integer getZoneLengthVal() { + return this.zoneLength == null ? 0 : this.zoneLength.intValue(); } - public double getZoneWidthVal() { - return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue(); + public Integer getZoneWidthVal() { + return this.zoneWidth == null ? 0 : this.zoneWidth.intValue(); } } 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 aec24ee..abff614 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 @@ -418,6 +418,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); @@ -541,7 +542,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);