From cac0421b997e879a8dbafa200487c02d8818b1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Mon, 9 Aug 2021 17:14:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1629=2019048-=E7=BB=84=E8=A3=85=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=A2=9E=E5=8A=A0=E8=A7=A3?= =?UTF-8?q?=E7=BB=91=E5=8A=9F=E8=83=BD-20210625?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java index e41b5ce..fbd3fb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: * @Reference: @@ -48,6 +51,9 @@ public class MesProdBindRecordModel { private String serialNumber; @ApiParam("关联批次") private String lotNo; + @ApiParam("数据集合") + private List mesProdBindRecords; + public MesProdBindRecordModel() { } @@ -122,4 +128,5 @@ public class MesProdBindRecordModel { this.serialNumber = serialNumber; this.lotNo = lotNo; } + } From 388fc9089c092ad764e8d8e1e9e64c7b52a01d8c Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Aug 2021 18:08:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?16895=2019081-PC-MES-=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8A=80=E8=83=BD-=E7=A6=81=E7=94=A8=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B7=B2=E7=BB=8F=E6=98=BE=E7=A4=BA-20210730?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 147360b..a0bfb4c 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 @@ -2835,7 +2835,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); } @@ -3772,6 +3772,7 @@ public class MesHqlPack { /** * 数据迁移表查询条件封装 + * * @param cfg * @return */ From 6e94cb6c47b1eb1dc9cc8b61403ffa9322cc75d9 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Aug 2021 18:29:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=89=E6=95=88=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a0bfb4c..0a0fe1f 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 @@ -2835,7 +2835,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode, CommonEnumUtil.VALID); if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); }