diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6506c66..249411a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,8 +82,7 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -95,8 +94,7 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") 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 686e6eb..e126301 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 @@ -1796,58 +1796,58 @@ public class MesEnumUtil { * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"), - MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"), - MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"), - MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"), - MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"), - MES_PART(60, "partExcelImportService", "物料表，支持编辑"), - MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"), - MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"), - MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"), - MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"), - MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"), - MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"), - MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"), - MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"), - MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"), - MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"), - MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"), - MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"), - MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"), - MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"), - MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"), - MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"), - MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"), - MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"), - MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"), - MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"), - MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"), - MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"), - MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"), - MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"), - MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"), - MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"), - MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"), - MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"), - MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"), - MES_PROCESS(400, "processExcelImportService", "工序信息"), - MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"), - MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制"); + public enum MES_EXCEL { + + MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"), + MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"), + MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"), + MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"), + MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"), + MES_PART(60, "partExcelService", "物料表，支持编辑"), + MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"), + MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"), + MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"), + MES_BOM(110, "bomExcelService", "物料清单，支持编辑"), + MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"), + MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"), + MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"), + MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"), + MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"), + MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"), + MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), + MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), + MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), + MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), + MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), + MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"), + MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"), + MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"), + MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"), + MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"), + MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"), + MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"), + MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"), + MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"), + MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"), + MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"), + MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"), + MES_PROCESS(400, "processExcelService", "工序信息"), + MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), + MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"); private int value; private String service; private String description; - MES_INSERT_EXCEL(int value, String service, String description) { + MES_EXCEL(int value, String service, String description) { this.value = value; this.service = service; this.description = description; @@ -1865,10 +1865,10 @@ public class MesEnumUtil { return description; } - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; + public static MES_EXCEL getByValue(int value) { + for (MES_EXCEL excel : values()) { + if (excel.getValue() == value) { + return excel; } } return null; @@ -5139,5 +5139,39 @@ public class MesEnumUtil { } } + /** + * 界面类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WINDOW_TYPE { + BUTTON_CFG(10, "按钮组件"), + BOARD_BASE_WINDOW(20, "看板基础页面"); + + private int value; + private String description; + + WINDOW_TYPE(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; + } + } } 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 ce953ae..7345005 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 @@ -6507,6 +6507,53 @@ public class WmsEnumUtil { } /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FG_INSTOCK_SN_TYPE { + NORMAL(10, "NORMAL", "实物条码(正常)"), + FIRST_PIECE(20, "FIRST_PIECE", "首件"), + MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), + TAIL_PIECE(40, "TAIL_PIECE", "末件"); + + private int value; + private String code; + private String description; + + FG_INSTOCK_SN_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) @@ -6562,4 +6609,5 @@ public class WmsEnumUtil { return valueOf(val); } } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 8dcd494..16462e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +12,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 +51,38 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @Column(name = "Y_AXES") @ApiParam(value = "纵坐标") private Double yAxes = 0d; + + @Transient + @ApiParam("设备状态") + private Integer equStatus; + + @Transient + @ApiParam("颜色") + private String color; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java index 9efed7a..a4f9a61 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -34,10 +34,6 @@ public class MesBoardEquStatus extends BaseBean implements Serializable { @ApiParam("看板代码") private String boardCode; - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - @Column(name = "EQU_STATUS_CODE") @ApiParam("状态代码") private Integer equStatusCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java new file mode 100644 index 0000000..68b7ee0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java @@ -0,0 +1,53 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/26 11:43 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW") +@Api("MES_看板界面") +public class MesWindow extends BaseBean implements Serializable { + + private static final long serialVersionUID = -55209393692924780L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "WINDOW_NAME") + @ApiParam("界面名称") + private String windowName; + + @Column(name = "WINDOW_TYPE") + @ApiParam("界面类型") + private Integer windowType; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam("顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 617cbd0..6a70107 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -162,11 +162,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { private String reserved2; @Column(name = "RESERVED3") - @ApiParam("预留字段13") + @ApiParam("预留字段3") private String reserved3; @Column(name = "RESERVED4") - @ApiParam("预留字段14") + @ApiParam("预留字段4") private String reserved4; @Column(name = "RESERVED5") @@ -178,18 +178,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; - @Column(name = "CATEGORY_CODE1") - @ApiParam("类型1") - private String categoryCode1; - - @Column(name = "CATEGORY_CODE2") - @ApiParam("类型2") - private String categoryCode2; - - @Column(name = "CATEGORY_CODE3") - @ApiParam("类型3") - private String categoryCode3; - /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6366551..ac78dd7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -151,6 +151,26 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Column(name = "RESERVED1") + @ApiParam("预留字段1") + private String reserved1; + + @Column(name = "RESERVED2") + @ApiParam("预留字段2") + private String reserved2; + + @Column(name = "RESERVED3") + @ApiParam("预留字段3") + private String reserved3; + + @Column(name = "RESERVED4") + @ApiParam("预留字段4") + private String reserved4; + + @Column(name = "RESERVED5") + @ApiParam("预留字段5") + private String reserved5; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java new file mode 100644 index 0000000..f16fc84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 生产计划批量编制明细model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileDetailModel { + + @ApiParam("日期") + private String date; + + @ApiParam("日期对应到数量") + private Double qty; + + @ApiParam("是否只读") + private Boolean readonly; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("完成数量的颜色") + private String color; + + @ApiParam("工单号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java new file mode 100644 index 0000000..f82a656 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 生产计划批量编制model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("预留字段1") + private String reserved1; + + @ApiParam("预留字段2") + private String reserved2; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @ApiParam(value = "班次名称") + public String shiftName; + + @ApiParam("班组") + private String shiftGroup; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("客户名称") + private String custCodeName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户订单号") + private String custOrderNo; + + @ApiParam("预留字段3") + private String reserved3; + + @ApiParam("预留字段4") + private String reserved4; + + @ApiParam("单位") + private String unit; + + @ApiParam("日期数量集合") + private List detailList; + + @ApiParam("合计") + private Double amount; + + @ApiParam("完成合计") + private Double completeAmount; + + @ApiParam("计划类型") + private Integer planType; + + @ApiParam("计划类型名称") + private String planTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java new file mode 100644 index 0000000..6ac1635 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.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.MesWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/26 11:48 上午 + * @Modify: + */ +@Repository +public interface MesWindowRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 23a5718..3a9d9e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -19,4 +19,8 @@ public class ExportDataModel { private String exportCol; + private String title; + + private Integer module; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index e61c8f7..66d6249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -71,7 +71,7 @@ public class WmsFGInStock extends BaseBean { public String remark; /** - * 来源：MNU=手工,MES=MES接口 + * 来源：BH:BatchHold,MNU=手工,MES=MES接口 */ @Column(name = "SRC") @ApiParam("单据来源") @@ -100,4 +100,19 @@ public class WmsFGInStock extends BaseBean { @Column(name = "MFG_LOG_NO") @ApiParam("生产批次") public String mfgLogNo; + + @Column(name = "BATCH_NO") + @ApiParam("batch号") + private String batchNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("箱条码") + private String packageNo; + + /** + * 条码类型：10=实物条码(正常),20=首件,30=中件,40=末件 + */ + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private Integer snType; } 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 cbe0f2c..792a479 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 @@ -2878,6 +2878,39 @@ public class WmsHqlPack { } /** + * 库区物料信息分页查询条件 + * + * @param itemCheck + * @return + */ + public static DdlPackBean packHqlWmsPartItemCheck(WmsPartItemCheck itemCheck) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(itemCheck.getPartNo(), "partNo", result); + + getStringBuilderPack(itemCheck, result); + + return result; + } + + /** + * BH子检测项分页查询条件 + * + * @param item + * @return + */ + public static DdlPackBean packHqlWmsBhChildDetectionItem(WmsBhChildDetectionItem item) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result); + DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result); + + getStringBuilderPack(item, result); + + return result; + } + + /** * 根据条件查询dataAuth * * @param wmsSnOperateRecord