From e2e48f31bd6c4cc1fd2a121dc4e031e6881e89e5 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 May 2020 22:16:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bh=E5=AD=90=E6=A3=80=E6=B5=8B=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E6=B5=8B=E5=A4=A7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index cc4a269..649bea3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -42,6 +42,11 @@ public class WmsBhChildDetectionItem extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckName; + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + public String checkTypeCode; + @Column(name = "VALUE_TYPE") @ApiParam("值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") From 9a38c5d359b3d58673b40c216f22bf339718ec6b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 May 2020 10:53:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 043e71649a0ddbbc3cec72e050b29fb81af61cd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 May 2020 11:44:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?bh=E5=AD=90=E6=A3=80=E6=B5=8B=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E6=B5=8B=E5=A4=A7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 379c7cb..ae13463 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 @@ -2923,6 +2923,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result); DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result); + DdlPreparedPack.getStringEqualPack(item.getCheckTypeCode(), "checkTypeCode", result); getStringBuilderPack(item, result); From f6cd0b6b0b513bdc570149e7102104fc2d8db315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 2 Jun 2020 10:49:30 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=908685=C2=A005=202.3.3.6=20=E9=98=9F?= =?UTF-8?q?=E5=88=97=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0-=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF-=E6=9F=A5=E3=80=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index e1155c2..3f192ac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -83,4 +83,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam(value = "已完成数量") @Transient private Integer finishQty; + + @ApiParam(value = "检测项类型名称") + @Transient + private String businessTypeName; } From a4ba058ee328e3ca9def6712262445af5695fbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 2 Jun 2020 14:25:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20Rest=E6=98=AF=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=20requestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 7ade95c..c220ed2 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -403,8 +403,8 @@ public final class FormHqlPack { public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 5fcea3e..eb8b13c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,6 +46,12 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + //CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_REQUEST_BODY") + @ApiParam(value = "是否使用requestBody") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isRequestBody; + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; From d3f2434aa02558cd460119fa6b1cade4388ded01 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 2 Jun 2020 18:55:30 +0800 Subject: [PATCH 6/7] Fix bug#8752,8753 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 253c121..ea17689 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 @@ -663,7 +663,7 @@ public class WmsStockSn extends BaseBean { String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; - this.batchNo = partNo; + this.batchNo = batchNo; this.sn = sn; this.workCenterCode = workCenterCode; this.partNo = partNo; From 570be85b8da3d9f4f7da2211e1e852a87d37506b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 2 Jun 2020 20:21:59 +0800 Subject: [PATCH 7/7] Fix Bug #8744 --- .../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 534547d..c34d351 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 @@ -2555,6 +2555,7 @@ public class MesPcnEnumUtil { CUSTOM_DIALOG("custom_dialog", "定制弹窗"), FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), + IMAGE_LIST("image_list", "图片列表"), SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); private String value;