diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java new file mode 100644 index 0000000..0f39a62 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.andon.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 : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_CONFIG") +@Api(value="系统配置") +public class AndonConfig extends BaseBean { + + @Column(name="NAME") + @ApiParam(value ="名称") + private String name; + + @Column(name="CONFIG_TYPE") + @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") + private Integer configType; + + @Column(name="CONFIG_CODE") + @ApiParam(value ="参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name="CONFIG_GROUP") + @ApiParam(value ="参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name="CONFIG_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private String configValueType; + + @Column(name="CONFIG_VALUE") + @ApiParam(value ="参数值") + private String configValue; + + @Column(name="CONFIG_DESCRIPTION") + @ApiParam(value ="参数描述") + private String configDescription; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java new file mode 100644 index 0000000..ab8dad8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON系统配置文件） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:05 + * @Modify: + **/ +@Repository +public interface IAndonConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 60667d8..e3d6734 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -184,4 +184,19 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询按灯系统配置信息 + * @param andonConfig + * @return + */ + public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result); + + getStringBuilderPack(andonConfig, result); + + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 0f56525..e5c6ecc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -314,7 +314,7 @@ public class DdlPreparedPack { */ public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); + packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); } } @@ -326,7 +326,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); + packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data); } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index f8f1238..4bb5af7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,9 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * @Description: @@ -79,4 +83,5 @@ public class MesQueueOrder extends BaseBean { public double getSeq() { return this.seq == null ? 0.0d : this.seq; } + } 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 f6d1fe1..14bb9bb 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 @@ -28,7 +28,7 @@ import javax.persistence.Table; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name="ORDER_NO") - @ApiParam("工单号") + @ApiParam("主队列编号") private String orderNo; @Column(name="PART_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 5ed8956..91b5e18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -2,12 +2,13 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesPart; import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import java.util.List; /** - * @Description: + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 * @Reference: * @Author: Crish * @CreateDate:2019-04-29-11:58 @@ -15,11 +16,33 @@ import java.util.List; **/ public class RequestModel { - private List workOrderList; + private List workOrderList; // 工单数据集 - private List partList; + private List partList; // 物料数据集 - private List planOrderList; + private List planOrderList; // 生产计划数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } public RequestModel(List workOrderList, List partList) { this.workOrderList = workOrderList; @@ -52,4 +75,44 @@ public class RequestModel { public void setPlanOrderList(List planOrderList) { this.planOrderList = planOrderList; } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index d7242d7..a9f0602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -170,6 +170,10 @@ public class MesHqlPack { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } + if (StringUtils.isNotEmpty(mesQueueOrder.getOrderNo() + "")) { + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean); + } + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java index 048379c..c9abef2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -7,22 +7,26 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.io.Serializable; import java.util.List; /** -* @Description : 作业流程Model -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2019-04-29 15:39 -* @Modify: -**/ + * @Description : 作业流程Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-04-29 15:39 + * @Modify: + **/ @Data @Api("作业流程Model") public class WmsActionGroupModel implements Serializable { @ApiParam("流程") - public WmsActionGroup wmsActionGroup; - + public String agId; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("GOJS位置") + public String position; @ApiParam("流程明细Model集合") public List wmsActionGroupDetailsModelList; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 80c33a0..47cea81 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -126,4 +126,17 @@ public class SwebHqlPack { DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } + + /** + * 将该供应商下该单号状态全部改为已发布状态 where sql + * @param details + * @return + */ + public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + return buildHql(details, result); + } }