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 604aa39..e92e50f 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 @@ -2024,7 +2024,8 @@ public class MesPcnEnumUtil { NORMAL(10, "正常"), CLOSE(20, "关闭"), - FINISH(30, "完成"); + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; @@ -4210,4 +4211,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 绑定模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KEY_BIND_MODE { + + PRODUCE_BOM_BIND(10, "产品BOM绑定"), + SCATTER_BOM_BIND(20, "散件BOM绑定"); + + private int value; + private String description; + + KEY_BIND_MODE(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 482019c..c22fa26 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 @@ -8115,4 +8115,132 @@ public class WmsEnumUtil { return description; } } + + /** + * 动作类型 + * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 80-取消任务、90-递进交换 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STRATEGY_ACTION_TYPE { + LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), + UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), + LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), + UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), + LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), + GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), + CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), + PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换"); + + private int value; + private String code; + private String description; + + STRATEGY_ACTION_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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static STRATEGY_ACTION_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 自动化策略 数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_STRATEGY_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"); + + private int value; + private String description; + + AUTO_STRATEGY_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_STRATEGY_QTY_CONTROL 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index e2b4a01..817a07c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; + @Column(name = "PART_SPEC_QTY") + @ApiParam("标准包规数量") + private Double partSpecQty; + @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") private String categoryCode1; 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 fa22aa7..5aba4be 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 @@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private String workType; @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") + @ApiParam("产品位置") private String produceCategoryCode; @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") + @ApiParam("产品位置名称") private String produceCategoryNameRdd; @Column(name = "PPT_CODE") @@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 53ce112..91a7275 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("显示颜色") private String color; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置代码") + private String produceCategoryCode; + public double getQueueSeqVal() { return this.queueSeq == null ? 0 : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java index e0f1f6f..45d14ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java @@ -40,6 +40,9 @@ public class MesStationBomModel { @ApiParam("报废数") private Integer scrapQty; + @ApiParam(value = "是否可重复") + private Integer isRepeat; + public MesStationBomModel() { } @@ -72,4 +75,19 @@ public class MesStationBomModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; } + + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) { + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.isRepeat = isRepeat; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index bf91927..f128cd8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable { @ApiParam("JIT队列批次") private String jitLotNo; + @ApiParam("vin") private String vinCode; @ApiParam("客户JIT队列编号") private String jitActualNo; + @ApiParam("产品位置") + private String produceCategoryCode; + public QueueOrderModel() { } @@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable { this.serialNumber=serialNumber; } - //料架分组队列展示组件 + //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.organizeCode = organizeCode; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; } - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) { + public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; this.organizeCode = organizeCode; + this.produceCategoryCode = produceCategoryCode; } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index 6bfdd58..2c30912 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -17,6 +17,7 @@ public class WmsJobParamModel implements Serializable { private static final long serialVersionUID = 5784492509251527816L; private String organizeCode;//工厂代码 private List zonesNoList;//存储区编号 + private String src;//单据来源枚举 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index aa9bd67..f7fbfb9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -46,7 +46,7 @@ public class BsSuitCaseFTP extends BaseBean { @Column(name = "FILE_ENCODE") @ApiParam(value = "文件编码") - private String fileEncode; + private Integer fileEncode; @Column(name = "IS_TRANSFORM_MESSAGE") @ApiParam(value = "是否转换报文") @@ -98,6 +98,18 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); } + @Column(name = "IS_INCREMENTAL_WRITE") + @ApiParam(value = "是否增量写入") + private Integer isIncrementalWrite; + + public int getIsIncrementalWriteVal(){ + return isIncrementalWrite == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isIncrementalWrite; + } + + public boolean isIncrementalWrite() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); + } + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java new file mode 100644 index 0000000..e5fb349 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-20 16:51 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = { + @Index(columnList = "AUTO_STRATEGY_NO"), + @Index(columnList = "STRATEGY_ITEM_NO") +}) +@Api("自动化策略明细表") +public class WmsAutoStrategyDetail extends BaseBean { + private static final long serialVersionUID = 6855278572650548519L; + + @Column(name = "AUTO_STRATEGY_NO") + @ApiParam(value = "自动化策略编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String autoStrategyNo; + + @Column(name = "STRATEGY_ITEM_NO") + @ApiParam(value = "策略项编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemNo; + + @Column(name = "STRATEGY_ITEM_NAME") + @ApiParam(value = "策略项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemName; + + @Column(name = "STRATEGY_ITEM_SPEC") + @ApiParam(value = "策略项描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemSpec; + + @Column(name = "FILTER_CONDITION") + @ApiParam(value = "过滤条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String filterCondition; + + @Column(name = "SORT_CONDITION") + @ApiParam(value = "排序条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String sortCondition; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @AnnoOutputColumn(refClass = WmsEnumUtil.STRATEGY_ACTION_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "SCRIPT_NO") + @ApiParam(value = "脚本编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String scriptNo; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java index ca598b0..9a4437d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -72,7 +72,7 @@ public class WmsAutoStrategyMaster extends BaseBean { @Column(name = "STRATEGY_QTY_CONTROL") @ApiParam(value = "数量控制") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") - @AnnoOutputColumn(refClass = WmsEnumUtil.SHIPP_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) private Integer strategyQtyControl; @Column(name = "START_EFFECT_DATE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java new file mode 100644 index 0000000..31f0174 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java @@ -0,0 +1,51 @@ +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.CommonEnumUtil; +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.Index; +import javax.persistence.Table; + +/** + * @Description : 自动化策略方法 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = { + @Index(columnList = "STRATEGY_ACTION") +}) +@Api("自动化策略方法") +public class WmsAutoStrategyMethod extends BaseBean { + private static final long serialVersionUID = -4424882984978962477L; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "策略方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "STRATEGY_SPEC") + @ApiParam(value = "策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategySpec; +} 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 08e50e1..48fcef0 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 @@ -1,6 +1,8 @@ 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.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -153,4 +155,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String fixLotNo = ""; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 8ee1297..117d091 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -89,6 +89,11 @@ public class WmsSerialSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + public WmsSerialSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java new file mode 100644 index 0000000..4806018 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.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.WmsAutoStrategyDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java new file mode 100644 index 0000000..d6200d8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.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.WmsAutoStrategyMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java new file mode 100644 index 0000000..fba9918 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.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.WmsAutoStrategyMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:51 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMethodRepository 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 667156b..d88c8fd 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 @@ -3407,4 +3407,64 @@ public class WmsHqlPack { getStringBuilderPack(wmsSerialSnTrans, packBean);*/ return packBean; } + + /** + * 自动化策略主表 分页查询 + * + * @param wmsAutoStrategyMaster + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMaster(WmsAutoStrategyMaster wmsAutoStrategyMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyNo(), "strategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyName(), "strategyName", result); + DdlPreparedPack.getNumEqualPack(wmsAutoStrategyMaster.getStrategyType(), "strategyType", result); + DdlPreparedPack.getStringEqualPack(wmsAutoStrategyMaster.getRoutingCode(), "routingCode", result); + if (StringUtils.isNotBlank(wmsAutoStrategyMaster.getStartEffectDate()) && StringUtils.isNotBlank(wmsAutoStrategyMaster.getEndEffectDate())) { + result.setWhereAppend(result.getWhereAppend() + " and (startEffectDate >= '"+wmsAutoStrategyMaster.getStartEffectDate()+"' and endEffectDate <= '"+wmsAutoStrategyMaster.getEndEffectDate()+"' )"); + } + + getStringBuilderPack(wmsAutoStrategyMaster, result); + + return result; + } + + /** + * 自动化策略明细表 分页查询 + * + * @param wmsAutoStrategyDetail + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyDetail(WmsAutoStrategyDetail wmsAutoStrategyDetail) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getAutoStrategyNo(), "autoStrategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getStrategyItemNo(), "strategyItemNo", result); + + getStringBuilderPack(wmsAutoStrategyDetail, result); + + return result; + } + + /** + * 自动化策略方法 分页查询 + * + * @param WmsAutoStrategyMethod + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMethod(WmsAutoStrategyMethod WmsAutoStrategyMethod) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(WmsAutoStrategyMethod.getStrategyAction(), "strategyAction", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategyMethod(), "strategyMethod", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategySpec(), "strategySpec", result); + + getStringBuilderPack(WmsAutoStrategyMethod, result); + + return result; + } }