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 7072531..be8a0ec 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 @@ -3693,6 +3693,7 @@ public class MesPcnEnumUtil { WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"), WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"), WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"), + WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"), WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"), WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件"); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 7a56fa4..64587ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -122,4 +122,9 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; + + //枚举:MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index daa66a8..f96c3b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -107,4 +107,9 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("客户发运地") private String custDelieryLocation; + //枚举:MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index 3ad988c..71152d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { private static final long serialVersionUID = 6727925715356900171L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - //DB复核项:10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 - @Column(name = "DB_CHECK_ITEM") - @ApiParam("DB复核项") - private String dbCheckItem; - @Column(name = "ERROR_FILED_CODE") @ApiParam("异常取值字段") private String errorFiledCode; - @Column(name = "ERROR_DESC") - @ApiParam("异常描述") - private String errorDesc; + @Column(name = "ERROR_FILED_DESC") + @ApiParam("异常取值字段描述") + private String errorFiledDesc; + + //10数字、20字符串 + @Column(name = "ERROR_FILED_TYPE") + @ApiParam("异常取值字段类型") + private String errorFiledType; + + @Column(name = "ERROR_FILED_VALUE") + @ApiParam("异常取值字段值") + private String errorFiledValue; - @Column(name = "PRODUCT_DATA_ID") - @ApiParam("生产记录表主键ID") - private Long productDataId; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码(第三方库表名)") + private String objectCode; - //是否停线:1=是,2=否 - @Column(name = "IS_STOP_LINE") - @ApiParam("是否停线") - private Integer isStopLine; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; - //审批状态:10=待审批,20=已审批 - @Column(name = "STATUS") - @ApiParam("审批状态") - private Integer status; @Transient @ApiParam("按钮名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java index be378c2..fe10ed1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -40,33 +40,29 @@ public class MesDbDataCheck extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - //DB复核项:10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 - @Column(name = "DB_CHECK_ITEM") - @ApiParam("DB复核项") - private Integer dbCheckItem; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") + @ApiParam("对象代码(第三方库表名)") private String objectCode; - //是否停线:1=是,2=否 - @Column(name = "IS_STOP_LINE") - @ApiParam("是否停线") - private Integer isStopLine; - - @Column(name = "KEY_DATA_FILED") - @ApiParam("质量关键字段") - private String keyDataFiled; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; @Column(name = "QC_FILED_CODE") - @ApiParam("缺陷类型字段") + @ApiParam("质检取值字段") private String qcFiledCode; + @Column(name = "QC_FILED_DESC") + @ApiParam("质检取值字段描述") + private String qcFiledDesc; + + @Column(name = "QC_FILED_TYPE") + @ApiParam("质检取值字段类型") + private String qcFiledType; + @Column(name = "QC_FILED_VALUE") @ApiParam("缺陷类型合格值") private String qcFiledValue; - @Column(name = "QC_FAIL_MAX_COUNT") - @ApiParam("缺陷连续不合格预警次数") - private String qcFailMaxCount; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 78c3128..113c25f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -125,7 +125,7 @@ public class MesQcOrder extends BaseBean implements Serializable { @Column(name = "ON_SITE_FREQUENCY") @ApiParam("巡检次数") - private Integer onSiteFrequency = 0; + private Integer onSiteFrequency = 1; @Deprecated @ApiParam(value = "检测结果") 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 15049c3..139b5f0 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 @@ -341,7 +341,7 @@ public class MesPcnHqlPack { return packBean; } - public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { + /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean); @@ -362,7 +362,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean); } return packBean; - } + }*/ /** * 按条件分页查询产品条码补打印数据 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 8af332a..de0b0aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REASON") + @ApiParam("原因") + public String reason; + + @Column(name = "DEPARTMENT") + @ApiParam(value = "部门") + private String department; + + @Column(name = "RECEIVER") + @ApiParam("领用人") + private String receiver; + + @Column(name = "PROD_DFG_TYPE_CODE") + @ApiParam("项目号") + private String prodCfgTypeCode; @Transient private List movementDetailsList;