diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 01b1fea..a6fc23c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -97,6 +97,14 @@ public class WmsBom extends BaseBean { @Transient public String routingCode; + @Column(name = "LOCATE_NO") + @ApiParam(value = "线边库位代码") + private String locateNo; + + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位代码") + private String terminalnNo; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 3f08e96..1d2e6b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -191,10 +191,22 @@ public class WmsPart extends BaseBean { @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; + @Column(name = "CYCLE_RQUEST_PERIOD") + @ApiParam(value = "循环补货周期", example = "0") + private Integer cycleRquestPeriod = 0; + + @Column(name = "CYCLE_RQUEST_QTY") + @ApiParam(value = "循环补货数量", example = "0") + private Double cycleRquestQty = 0d; + public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); } + public int getCycleRquestPeriod(){ + return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue(); + } + public WmsPart() { } @@ -210,6 +222,10 @@ public class WmsPart extends BaseBean { return max == null? 0:max; } + public Double getCycleRquestQty() { + return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); + } + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java new file mode 100644 index 0000000..3531e8f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -0,0 +1,44 @@ +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; +import javax.persistence.UniqueConstraint; + +/** + * @Description : 工位表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-12-03 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TERMINAL") +@Api("工位信息") +public class WmsTerminal extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592713L; + @Column(name="TERMINAL_NO") + @ApiParam("工位代码") + private String terminalNo; + + @Column(name="TERMINAL_NAME") + @ApiParam("工位名称") + private String terminalName; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java new file mode 100644 index 0000000..e7deb3e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.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.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; +import org.springframework.stereotype.Repository; + +/** + * @Description :工位信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface WmsTerminalRepository 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 d823254..a3d67fc 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 @@ -2515,4 +2515,21 @@ public class WmsHqlPack { return result; } + + /** + * 打印机管理信息分页查询条件 + * + * @param wmsTerminal + * @return + */ + public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result); + + getStringBuilderPack(wmsTerminal, result); + + return result; + } }