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 3af6f5c..ab52cf1 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 @@ -2063,7 +2063,8 @@ public class MesEnumUtil { MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), - MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"); + MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), + MES_JISA(640, "jisaExcelService", "JISA导入"); private int value; private String service; @@ -3415,7 +3416,8 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"), + SAMPLE_ORDER(160, "样件工单"); private int value; private String description; @@ -3580,11 +3582,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; @@ -4612,7 +4614,8 @@ public class MesEnumUtil { LANDED(20, "下达"), CANCEL(30, "取消"), OFFLINE(40, "下线"), - SHIPMENT(50, "发运"); + SHIPMENT(50, "发运"), + SPECIAL(60, "特殊标识"); private int value; private String description; @@ -4648,7 +4651,8 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"), - ERR_PERCH(30, "异常占位"); + ERR_PERCH(30, "异常占位"), + PERCH_HANDLE(40, "占位处理"); private int value; private String description; @@ -7771,4 +7775,49 @@ public class MesEnumUtil { } } + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String 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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 99133a8..6007e48 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 @@ -1916,7 +1916,7 @@ public class MesPcnEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -2071,11 +2071,11 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 8d48efd..4120d0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -88,7 +88,7 @@ public class MesHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 991b3a1..30cbe36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java new file mode 100644 index 0000000..8c348e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java @@ -0,0 +1,49 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_ALERT_CFG") +@Api("MES_异常提醒配置") +public class MesExceptionAlertCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895221L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "SRC_MENU_NAME") + @ApiParam("来源模块名称") + private String srcMenuName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "USER_CODE_GROUP") + @ApiParam("提醒人员集合") + private String userCodeGroup; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java new file mode 100644 index 0000000..a904459 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java @@ -0,0 +1,55 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_WINDOW_RECORD") +@Api("MES_弹窗异常提醒记录") +public class MesExceptionWindowRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895345L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "USER_CODE") + @ApiParam("提醒人员") + private String userCode; + + @Column(name = "MESSAGE_TYPE") + @ApiParam("消息类型") + private Integer messageType; + + @Column(name = "MESSAGE_HEAD") + @ApiParam("提示表头") + private String messageHead; + + @Column(name = "MESSAGE_CONTENT") + @ApiParam("提示内容") + private String messageContent; + + @Column(name = "STATUS") + @ApiParam("处理状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 82bfdf1..a885bce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -79,10 +79,18 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + @Column(name = "STOCK_QTY") @ApiParam("排程实时库存") private Integer stockQty; + @Column(name = "MIN_GEN_LOT") + @ApiParam("最小生成批次") + private Integer minGenLot; + @Transient @ApiParam("物料名称") private String partName; 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 5162f3d..20308b4 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 @@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1a8a0d8..ffc36d6 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 @@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { return this.qty == null ? 0.0d : this.qty; } + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index b677ede..cd9ba33 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable { @ApiParam("工序代码名称") private String processCodeName; + @Transient + @ApiParam("正在生产队列数量") + private Integer genningNum; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index e159d8e..6d2a731 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Integer length; @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient @ApiParam("校验内容") private String checkContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 1fdcdda..f1114df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,12 +20,15 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("包装条码") + @ApiParam("工位请求bean") private StationRequestBean stationRequestBean; - @ApiParam("过程条码") + @ApiParam("产品条码表") private MesProduceSn produceSn; + @ApiParam("产品绑定记录表") + private MesProdBindRecord prodBindRecord; + @ApiParam("组织代码") private String organizeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 64e9e70..31edd81 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -4,6 +4,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; +import java.util.Map; + /** * @Description: * @Author: jokelin @@ -71,6 +74,11 @@ public class QueueJitActualModel { @ApiParam("物料号") private String partName; + @ApiParam("mgn标识") + private String mgnFlag; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); public QueueJitActualModel() { 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 70b769e..b737470 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 @@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.queueSeq = queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java new file mode 100644 index 0000000..8f81f87 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionAlertCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_异常提醒配置 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionAlertCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java new file mode 100644 index 0000000..81e3258 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionWindowRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_弹窗异常提醒记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionWindowRecordRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index da7b815..56a6284 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 @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; @@ -3428,4 +3427,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { + DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3e7316f..81613fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; @@ -122,7 +122,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index a805f86..70f38db 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,4 +45,14 @@ public class WmsStockFifoModel { @ApiParam("同批次") private boolean fifoSameBatch; + + @ApiParam("FIFO查询获取方式") + private Integer fifoSnByLood; + + @ApiParam("物料条码信息") + Map> snMap = new HashMap<>(); + + @ApiParam("所有推荐条码信息") + List wmsStockSnAllList = new ArrayList<>(); + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ff6f6bc..a472e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1232,4 +1232,23 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); + + DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); + + DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index dac4976..b21f150 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_TYPE_NAME_RDD") @@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 8ea25cf..73c18c8 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -96,7 +96,7 @@ public class SwebPurchaseOrder extends BaseBean { private String refOrderNo; @Column(name = "EXPECTED_TIME") - @ApiParam(value = "预计到货时间") + @ApiParam(value = "预计交货时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String expectedTime; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 297711e..3466256 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -121,6 +121,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "供应商生产日期") private String venProductTime; + @Column(name = "EXPECTED_TIME") + @ApiParam(value = "预计交货时间") + private String expectedTime; + @Transient @ApiParam(value = "合同号") private String refNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index ec42f52..d0a79d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -68,7 +68,7 @@ public class WmsActionModule extends BaseBean { @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2") @ApiParam(value = "是否脚本组件") - private Integer isScriptModule = FALSE; + private Integer isScriptModule; /** * 是否脚本组件 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 f24ff0c..9570d39 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 @@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; + @Column(name = "REF_ITEM") + @ApiParam("关联行号") + public Integer refItem; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") 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 d97792c..f6cee5e 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 @@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean { this.totalBoxes = totalBoxes.intValue(); this.qty = qty; } + + public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + Double rcQty, Integer itemStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.qty = qty; + this.rcQty = rcQty; + this.itemStatus = itemStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6dafc68..6d1769b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; +import javax.persistence.Version; import java.util.List; /** @@ -119,6 +120,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; + @Version + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") + @ApiParam(value = "乐观锁", defaultValue = "0") + public Integer lockVersion; + @Transient @ApiParam(value = "总数量") private Double totalQty; @@ -220,6 +226,10 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + public Integer getLockVersion() { + return this.lockVersion == null ? 0 : this.lockVersion; + } + public WmsStockQuan() { } 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 8f33aa6..764d333 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 @@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 49ce84f..aecde2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -50,7 +50,8 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=BUSI_SCENE_TYPE_DICTIONARY", listColumnName = "name", explicitColumnName = "dictionaryValue") public Integer busiSceneType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index 97dad56..4d30cc8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository { * @return 配置信息 */ WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); + + /** + * 按照配置代码查询配置信息 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByConfigCode(String configCode); }