From 32e4bb4ba7112e4c9d86c91dad21385666bff7d2 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:14:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?15872=2020027--PCN=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 41 ++++++++++------------ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 +-- 2 files changed, 20 insertions(+), 25 deletions(-) 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/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; - } + }*/ /** * 按条件分页查询产品条码补打印数据 From 792d4263c50e2ffe74629f6e694422ff71368e46 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:18:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86=EF=BC=8Ckettle?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=B7=A5=E5=85=B7=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 5 +++++ 2 files changed, 10 insertions(+) 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; + } From 17a61b2c2b9176f1aca7bcaca574c56f141d29eb Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 24 May 2021 18:38:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?15607=2020027-PCN=E7=AB=AF=20-=20=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=94=9F=E6=88=90=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E8=AE=A1=E6=95=B0=20-20210429?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = "检测结果") From e8fdaa58be175788a682815f2ea0fcde3ee4b6c5 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 25 May 2021 11:07:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?15872=2020027--PCN=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22=20simon.song=202021/5/2?= =?UTF-8?q?4=20=E4=B8=8B=E5=8D=886:14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java | 32 ++++++++++------------ 1 file changed, 14 insertions(+), 18 deletions(-) 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; + } From 804f9240ccd4166b037cebbdb234d2ceaf23513a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Tue, 25 May 2021 13:53:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9B=B6=E6=98=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E4=BA=BA=EF=BC=88=E5=89=8D3=E4=B8=AA=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=9E=9A=E4=B8=BE=EF=BC=89=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=B7=EF=BC=88=E8=B0=83=E7=94=A8=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=89=20=E9=9B=B6=E6=98=9F=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=20=20=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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; From bddf876ee3ca5b3d6ac93461330fde215c8b3bff Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 25 May 2021 15:18:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=20doFunction=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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", "停止执行监听组件");