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 6a9bff3..99f2ba2 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 @@ -4996,4 +4996,93 @@ public class MesEnumUtil { } } + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_TYPE { + BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + + private String code; + private String description; + + BOARD_TYPE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BOARD_TYPE getByCode(String code) { + for (BOARD_TYPE boardType : values()) { + if (boardType.getCode().equals(code)) { + return boardType; + } + } + return null; + } + + public static String valueOfDescription(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; + } + } + + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_OBJECT_TYPE { + ORGANIZE_CODE("organizeCode", "工厂代码"), + AREA_CODE("areaCode", "区域代码"), + WORK_CENTER_CODE("workCenterCode", "产线代码"); + + private String value; + private String description; + + BOARD_OBJECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static BOARD_OBJECT_TYPE getByCode(String code) { + for (BOARD_OBJECT_TYPE boardObjectType : values()) { + if (boardObjectType.getValue().equals(code)) { + return boardObjectType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(code)) { + 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 75612bd..b7d0c56 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 @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - SHIPPED(20, "已发运"); + CANCEL(20, "已发运"); private int value; private String description; 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 821ff98..57e81fc 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 @@ -304,6 +304,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { CREATE(10, "CREATE", "创建"), + PROCESSING(50, "PROCESSING", "发运中"), RECEIPTED(20, "FINISHED", "已完成"), CANCEL(30, "CANCLE", "行取消"), PRINTED(40, "PRINTED", "已打印"); @@ -6095,16 +6096,16 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(10, "星期一"), - TUESDAY(20, "星期二"), - WEDNESDAY(30, "星期三"), - THURSDAY(40, "星期四"), - FRIDAY(50, "星期五"), - SATURDAY(60, "星期六"), - SUNDAY(70, "星期七"); + MONDAY(20, "星期一"), + TUESDAY(30, "星期二"), + WEDNESDAY(40, "星期三"), + THURSDAY(50, "星期四"), + FRIDAY(60, "星期五"), + SATURDAY(70, "星期六"), + SUNDAY(10, "星期日"); - private int value; - private String description; + private final int value; + private final String description; WEEK_TYPE(int value, String description) { this.value = value; @@ -6363,4 +6364,203 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 采购计划历史状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PURCHASE_PLAN_HISTORY_STATUS { + CREATE(10, "CREATE", "采购订单创建"), + PUBLISH(20, "PUBLISH", "采购订单发布"), + VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"), + VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"), + VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"), + RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"), + FAIL(70, "FAIL", "质检完成"); + + private int value; + private String code; + private String description; + + PURCHASE_PLAN_HISTORY_STATUS(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 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); + } + } + + /** + * BatchHold 检测大类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_CHECK_TYPE { + FUNCTION(10, "FUNCTION", "功能检测"), + SIZE(20, "SIZE", "尺寸检测"), + DEPTH(30, "DEPTH", "熔深检测"); + + private int value; + private String code; + private String description; + + BH_CHECK_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 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); + } + } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_VALUE_TYPE { + NUMBER(10, "NUMBER", "功能检测"), + TEXT(20, "TEXT", "尺寸检测"); + + private int value; + private String code; + private String description; + + BH_VALUE_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 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); + } + } + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REWORK_STATUS { + INIT(10, "INIT", "初始化"), + BE_HANDLE(20, "BE_HANDLE", "待处理"), + FINISH(30, "FINISH", "已处理"), + NONE(40, "NONE", "不处理"); + + private int value; + private String code; + private String description; + + REWORK_STATUS(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 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); + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store new file mode 100644 index 0000000..cc05df3 Binary files /dev/null and b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store differ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 6922121..842f52f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -11,8 +11,10 @@ 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; +import java.util.List; /** * @Description: * @Author: jokelin @@ -53,4 +55,12 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @Column(name = "PLAN_CAPACITY") @ApiParam("计划产量") private Integer planCapacity; + + @Transient + @ApiParam("班次名称") + private String shiftName; + + @Transient + @ApiParam("看板时段计划产量") + private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 64f4771..e9138cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.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; /** @@ -49,4 +50,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @Column(name = "IS_SPANDAY") @ApiParam("是否跨天") private Integer isSpanday; + + @Transient + @ApiParam("班次名称") + private String shiftName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java index cdf0482..2b2e211 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.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; /** @@ -53,4 +54,8 @@ public class MesBoardShiftSectionCapacity extends BaseBean implements Serializab @Column(name = "PLAN_CAPACITY") @ApiParam("计划产量") private Integer planCapacity; + + @Transient + @ApiParam("实际产量") + private Integer actualCapacity; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java new file mode 100644 index 0000000..46fe2ed --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -0,0 +1,68 @@ +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/4/22 11:03 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OFF_LINE_RECORD") +@Api("MES_产品下线记录") +public class MesOffLineRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2767323581134885752L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "OFF_LINE_TIME") + @ApiParam("下线时间") + private String offLineTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java new file mode 100644 index 0000000..d1dd2da --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class BoardModel { + + @ApiParam("看板名称") + private String boardName; + + @ApiParam("班别") + private String shiftName; + + @ApiParam("对象值描述") + private String objectValueDesc; + + @ApiParam("计划人数") + private Integer planPeopleNum; + + @ApiParam("实际人数") + private Integer actualPeopleNum; + + @ApiParam("计划产量") + private Integer planCapacity; + + @ApiParam("目标达成数") + private Integer achievedNum; + + @ApiParam("看板图片路径") + private String pictureUrl; + + @ApiParam("看板时段计划产量") + private List boardShiftSectionCapacityList; + + @ApiParam("看板设备状态") + private List boardEquStatusList; + + @ApiParam("看板设备明细") + private List boardEquDetailList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java new file mode 100644 index 0000000..80e3159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesOffLineRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/22 11:10 上午 + * @Modify: + */ +@Repository +public interface MesOffLineRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java new file mode 100644 index 0000000..df22498 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448895L; + + @ApiParam(value = "表名称") + public String tableName; + + @ApiParam(value = "表字段名称") + private String fieldName; + + @ApiParam(value = "表字段描述") + private String fieldDesc; + + @ApiParam(value = "表字段类型") + private String fieldType; + + @ApiParam(value = "主键") + private String isFieldPrimaryKey; + + @ApiParam(value = "非空") + private String isFieldNull; + + @ApiParam(value = "外键") + private String isFieldForeignKey; + + @ApiParam(value = "唯一约束") + private String isFieldUnique; + + @ApiParam(value = "自增") + private String isFieldGeneric; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java new file mode 100644 index 0000000..fe7f66d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448495L; + + @ApiParam(value = "实体名称") + public String entityName; + + @ApiParam(value = "数据表名称") + private String tableName; + + @ApiParam(value = "数据表描述") + private String tableDesc; + + @ApiParam(value = "字段列表数据") + private List fieldInfoModelList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java new file mode 100644 index 0000000..4d0778d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 19:46 + * @Modify: + **/ +@Data +public class WmsMoveDetailsBySnModel implements Serializable { + + private static final long serialVersionUID = -3023644672955363786L; + + @ApiParam("明细数据") + private List detailsList; + + @ApiParam("分页") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java index c198e17..44c8c9a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable { @ApiParam("打印条码") private List wmsStockSnList; + + @ApiParam("单据条码") + private List wmsPoSnList; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java deleted file mode 100644 index 66904b1..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java +++ /dev/null @@ -1,40 +0,0 @@ -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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面") -public class PtlWindow extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443842758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "WINDOW_NAME") - @ApiParam("界面名称") - private String windowName; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java deleted file mode 100644 index 02ee762..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java +++ /dev/null @@ -1,40 +0,0 @@ -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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素") -public class PtlWindowElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java deleted file mode 100644 index b291eff..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java +++ /dev/null @@ -1,49 +0,0 @@ -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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素属性") -public class PtlWindowElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758285995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; - - @Column(name = "ATTRIBUTE_NO") - @ApiParam("属性代码") - private String attributeNo; - - @Column(name = "ATTRIBUTE_VALUE") - @ApiParam("属性值") - private String attributeValue; - -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java index d091e87..697f6dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单数量") @AnnoOutputColumn private Double qty; + + @ApiParam(value = "序号") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "零件组号") + @AnnoOutputColumn + public String partGroupNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index dba988a..59f3f84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -18,7 +18,7 @@ import javax.persistence.*; import java.io.Serializable; /** - * @Description : 包材BOM信息 + * @Description : QAD_BOP信息 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2020-01-09 14:40 @@ -29,7 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") -@Api("包材BOM信息") +@Api("QAD_BOP信息") public class QadBop implements Serializable { private static final long serialVersionUID = 4673217061075875734L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java new file mode 100644 index 0000000..e33e3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -0,0 +1,97 @@ +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.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 16:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="SOD_DET") +@Api("SOD_DET信息") +public class SodDet implements Serializable { + + private static final long serialVersionUID = 539607553249262854L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="COLUMN_GROUP") + @ApiParam("分组列名") + public String columnGroup; + + @Column(name="COLUMN_GROUP_VALUE") + @ApiParam("分组列名值") + public String columnGroupValue; + + @Column(name="PROPERTIES_NAME") + @ApiParam("参数名") + public String propertiesName; + + @Column(name="PROPERTIES_VALUE") + @ApiParam("参数值") + public String propertiesValue; + + @Column(name="table_name") + @ApiParam("表名") + public String tableName; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java new file mode 100644 index 0000000..e157150 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_BH_CHILD_DETECTION_ITEM") +@Api("BH子检测项") +public class WmsBhChildDetectionItem extends BaseBean { + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "ITEM_CHECK_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckCode; + + @Column(name = "ITEM_CHECK_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckName; + + @Column(name = "VALUE_TYPE") + @ApiParam("值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 65a6608..f250b58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,6 +40,7 @@ public class WmsCustWindow extends BaseBean { private String custWindowTime; @Column(name = "WEEKS") + @AnnoOutputColumn(refClass = WmsEnumUtil.WEEK_TYPE.class, refForeignKey = "value", value = "description") @ApiParam(value = "星期") private String weeks; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 65e800d..44e8a69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -138,4 +138,16 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "BOM生效日期") @Column(name = "EFF_START_TIME") private String effStartTime; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "ACTUAL_REPORT_LINE") + @ApiParam("实际报工产线") + private String actualReportLine; + + @Column(name = "BATCH_NO") + @ApiParam("批号") + private String batchNo; } 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 0b173cb..574361d 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 @@ -1,6 +1,7 @@ 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.WmsEnumUtil; import io.swagger.annotations.Api; @@ -11,8 +12,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; -import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description :移库单明细实体(用于转储类业务) @@ -108,6 +113,13 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + + /** + * 已创建，已收货，已发运，已拣货 + */ + @Transient + @ApiParam(value = "状态中文") + private String itemStatusStr; /** * 是否免费:0=计费,1=免费 */ @@ -174,6 +186,15 @@ public class WmsDocMovementDetails extends BaseBean { private String soOrderNo; @Transient + @ApiParam(value = "替代物料编码") + private String subPartNo; + + + @Transient + @ApiParam(value = "替代物料名称") + private String subPartName; + + @Transient @ApiParam("实际批次") private String actualLot; @@ -245,6 +266,14 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") private Integer executeStatus; + @Transient + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Transient + @ApiParam("执行") + private Integer isMakeUp; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index ead19c3..3fe234b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -11,7 +11,11 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -115,6 +119,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient private List movementDetailsList; 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 9e8d916..9bba40c 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,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; - @Transient @ApiParam("打印模板") private String templateNo; @@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("剩余箱数量") private Long countBox; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5ea2ac2..6c182e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -200,6 +200,54 @@ public class WmsMoveSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam("收货物料编码") + public String rcPartNo; + + @Transient + @ApiParam("发运物料编码") + public String outPartNo; + + @Transient + @ApiParam("发运单据") + public String outRefSrc; + + @Transient + @ApiParam("收货单据") + public String rcRefSrc; + + @Transient + @ApiParam("发运条码") + public String outSn; + + @Transient + @ApiParam("收货条码") + public String rcSn; + + @Transient + @ApiParam("发运单位") + public String outUnit; + + @Transient + @ApiParam("收货单位") + public String rcUnit; + + @Transient + @ApiParam("发运数量") + public Double outQty; + + @Transient + @ApiParam("收货数量") + public Double rcQty; + + @Transient + @ApiParam("委外发运时间") + public String outDatetime; + + @Transient + @ApiParam("委外收货时间") + public String rcDatetime; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -281,4 +329,35 @@ public class WmsMoveSn extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { + this.id = id; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.rcPartNo = rcPartNo; + this.outPartNo = outPartNo; + this.destQty = destQty; + } + + public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn, + String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, + String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) { + this.id = id; + this.organizeCode = organizeCode; + this.outRefSrc = outRefSrc; + this.rcRefSrc = rcRefSrc; + this.outSn = outSn; + this.rcSn = rcSn; + this.outPartNo = outPartNo; + this.rcPartNo = rcPartNo; + this.outUnit = outUnit; + this.rcUnit = rcUnit; + this.outQty = outQty; + this.rcQty = rcQty; + this.outDatetime = outDatetime; + this.rcDatetime = rcDatetime; + this.vendorNo = vendorNo; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 0544b33..2f5c2fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -163,6 +163,32 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("集装箱号") private String containerNo; + + @Transient + @ApiParam("采购订单状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer purchaseItemStatus; + + @Transient + @ApiParam("供应商") + private String vendorNo; + + @Transient + @ApiParam("供应商名称") + private String vendorName; + + @Transient + @ApiParam("开始时间") + private String planStratDate; + + @Transient + @ApiParam("结束时间") + private String planEndDate; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + public Double getSnpVal() { return snp; } @@ -185,4 +211,38 @@ public class WmsPOMasterDetails extends BaseBean { this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; } + + public WmsPOMasterDetails( + String organizeCode, + String orderNo, + Integer purchaseItemStatus, + String planDate, + String planTime, + String partNo, + String partNameRdd, + Double qty, + Double rcQty, + String vendorNo, + String createUser, + String createDatetime, + String modifyUser, + String modifyDatetime, + String remark + ){ + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.purchaseItemStatus = purchaseItemStatus; + this.planDate = planDate; + this.planTime = planTime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.rcQty = rcQty; + this.vendorNo = vendorNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.remark = remark; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java new file mode 100644 index 0000000..5af3d21 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_CHECK_TYPE") +@Api("物料检测大类") +public class WmsPartCheckType extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partName; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "SAMPLE_SIZE") + @ApiParam("样本数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer sampleSize; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java new file mode 100644 index 0000000..8498c36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : 物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_ITEM_CHECK") +@Api("物料子检测项") +public class WmsPartItemCheck extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "CHECK_ITEM_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @Column(name = "CHECK_ITEM_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @Column(name = "VALUE_TYPE") + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @Column(name = "STANDARD") + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double standard; + + @Column(name = "MAX") + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @Column(name = "MIN") + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java new file mode 100644 index 0000000..8691970 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java @@ -0,0 +1,62 @@ +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 javax.persistence.Transient; + +/** + * @Description : 采购计划历史 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PURCHASE_PLAN_HISTORY") +@Api("采购计划历史") +public class WmsPurchasePlanHistory extends BaseBean { + private static final long serialVersionUID = -8147353212724381079L; + + @Column(name = "ORDER_NO") + @ApiParam("单号") + private String orderNo; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "CAR_NO") + @ApiParam("车牌号") + private String carNo; + + @Column(name = "CONTACT") + @ApiParam("联系人") + private String contact; + + @Column(name = "CONTACT_TEL") + @ApiParam("联系电话") + private String contactTel; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + +} 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 917f0a0..c9fdc27 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 @@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Long boxQtys; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java new file mode 100644 index 0000000..28445f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TEST_RESULT_DETAILS") +@Api("检测结果明细表") +public class WmsTestResultDetails extends BaseBean { + + private static final long serialVersionUID = -3295112411840494690L; + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "CHECK_TYPE") + @ApiParam("大检测项类型") + public Integer checkType; + + @Column(name = "qr_code") + @ApiParam("二维码") + public String qrCode; + + @Column(name = "is_qualified") + @ApiParam("是否合格") + public Integer isQualified; + + @Column(name = "check_value") + @ApiParam("检测值") + public String checkValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java new file mode 100644 index 0000000..08d6631 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -0,0 +1,79 @@ +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 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 :检测结果汇总表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 10:50 + * @Modify: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TEST_RESULT_SUMMARY") +@Api("检测结果汇总表") +public class WmsTestResultSummary extends BaseBean { + + private static final long serialVersionUID = -4600850017207281216L; + + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "FLAG_NO") + @ApiParam("客户发往地") + public String flagNo; + + @Column(name = "IS_QUALIFIED") + @ApiParam("是否合格") + public Integer isQualified; + + @Column(name = "REWORK_STATUS") + @ApiParam("返修状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer reworkStatus; + + @Column(name = "REWORK_RESULT") + @ApiParam("返修结果") + public Integer reworkResult; + + @Column(name = "PICK_STATUS") + @ApiParam("挑选状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + + public Integer pickStatus; + + @Column(name = "PICK_RESULT") + @ApiParam("挑选结果") + public Integer pickResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java new file mode 100644 index 0000000..f26fe08 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :窗口输出类 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-21 2:37 下午 + * @Modify: + **/ +@Entity +@Data +@Api("窗口输出类") +public class WmsCustWindowDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @ApiParam(value = "星期一客户") + private String mondayCust; + + @ApiParam(value = "星期二客户") + private String tuesdayCust; + + @ApiParam(value = "星期三客户") + private String wednesdayCust; + + @ApiParam(value = "星期四客户") + private String thursdayCust; + + @ApiParam(value = "星期五客户") + private String fridayCust; + + @ApiParam(value = "星期六客户") + private String saturdayCust; + + @ApiParam(value = "星期日客户") + private String sundayCust; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java new file mode 100644 index 0000000..479bc1f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :移动单效率(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("移动单效率(出参)") +public class WmsMoveMovementEffectivenessDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "日期") + private String date; + + @ApiParam(value = "比列") + private Double percentage; + + public WmsMoveMovementEffectivenessDto(String date, Double percentage) { + this.date = date; + this.percentage = percentage; + } + + public WmsMoveMovementEffectivenessDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java new file mode 100644 index 0000000..ffaf492 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :装车单打印输出model(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("静态盘点查询输出实体类") +public class WmsStockSnDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "库位") + private String locateNo; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "生产批次") + private String dateCode; + + @ApiParam(value = "规格") + private String partSpec; + + @ApiParam(value = "存储区") + private String zoneNo; + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java new file mode 100644 index 0000000..680c401 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -0,0 +1,35 @@ +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-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("供应商延期输出实体类") +public class WmsSupplierExtensionDto { + + @ApiParam(value = "序号") + private Integer rn; + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "数量") + private Integer num; + + public WmsSupplierExtensionDto() { + + } + + public WmsSupplierExtensionDto(String vendorNo, Integer num) { + this.vendorNo = vendorNo; + this.num = num; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java new file mode 100644 index 0000000..d025df0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 中航WMS看板－仓库预警看板(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("中航WMS看板－仓库预警看板(出参)") +public class WmsWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "存储区") + private String zoneNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存") + private Double qty; + + @ApiParam(value = "最大库存") + private Double maxqty; + + @ApiParam(value = "最小库存") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "库位") + private String locateNo; + + @ApiParam(value = "颜色") + private String color; + + public WmsWarehouseWarningDto(String partNo, String zoneNo, String partNameRdd, Double qty, Double maxqty, + Double minqty, String stockStatus, String locateNo, String color) { + this.partNo = partNo; + this.zoneNo = zoneNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.maxqty = maxqty; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.locateNo = locateNo; + this.color = color; + } + + public WmsWarehouseWarningDto() { + + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java index 7ab26ec..e1103b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description :装车单打印输出model + * @Description :装车单打印输出model(出参) * @Reference : * @Author :QianHuaSheng * @CreateDate : 2020-04-10 3:21 下午 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java index f6c8ef8..c271680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop; * @CreateDate : 2020-01-09 15:06 * @Modify: **/ +@Repository public interface QadBopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java new file mode 100644 index 0000000..f5cf661 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import cn.estsh.i3plus.pojo.wms.bean.SodDet; +import org.springframework.stereotype.Repository; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +@Repository +public interface SodDetRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java new file mode 100644 index 0000000..9698716 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.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.WmsBhChildDetectionItem; +import org.springframework.stereotype.Repository; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsBhChildDetectionItemRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java new file mode 100644 index 0000000..5c0dbe7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.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.WmsPartCheckType; +import org.springframework.stereotype.Service; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Service +public interface WmsPartCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java new file mode 100644 index 0000000..4c6d2ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.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.WmsPartItemCheck; +import org.springframework.stereotype.Repository; + +/** + * @Description : 持久层物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsPartItemCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java new file mode 100644 index 0000000..9db9dd0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.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.WmsPurchasePlanHistory; +import org.springframework.stereotype.Repository; + +/** + * @Description : 采购计划历史dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 10:30 + * @Modify: + **/ +@Repository +public interface WmsPurchasePlanHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java new file mode 100644 index 0000000..7882dad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.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.WmsTestResultDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java new file mode 100644 index 0000000..8f8e536 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.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.WmsTestResultSummary; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果汇总表 + * @Reference : + * @Author : jimmy.z + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultSummaryRepository 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 b9e6a01..b62c8c8 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 @@ -3110,4 +3110,29 @@ public class WmsHqlPack { getStringBuilderPack(details, result); return result; } + + /** + * 检测结果汇总表 分页查询 + * + * @param wmsTestResultSummary + * @return + */ + public static DdlPackBean packHqWmsTestResultSummary(WmsTestResultSummary wmsTestResultSummary) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), + wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true); + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(), + wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true); + getStringBuilderPack(wmsTestResultSummary, result); + + return result; + } }