From de08f2005ea24ce967d2ac3cf93c2f8d30a55d4f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 18:48:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=98=E5=8E=9Fhqlpack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 632df5d..91597a2 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 @@ -116,16 +116,16 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartSn + * @param rawPartNo * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); return packBean; } From 672483245c8bff55e5bcb0e3f2a613c9bd208147 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 13 Jun 2020 14:03:50 +0800 Subject: [PATCH 2/4] Fix #Bug 8904 --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 9 +++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 90a96f1..b3e82e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam(value = "动作类型") private Integer actionType; + @Transient @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; + @Transient @ApiParam(value = "动作类型名称") private String actionTypeName; + @Transient @ApiParam("产品条码零件名称") private String partName; + @Transient @ApiParam("原材料零件名称") private String itemPartName; + @Transient @ApiParam("生产队列号") private String orderNo; + @Transient + @ApiParam("产品条码") + private String productSn; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; 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 07ac37c..481a9f1 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 @@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.List; /** * @Description: * @Reference: Mes 条件封装 @@ -2003,11 +2005,14 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) { + public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List serialNumbers) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode); if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) { DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); } + if (!CollectionUtils.isEmpty(serialNumbers)) { + DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean); + } if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); } From 26d7701a49d6eb73a3567ccd73af795246e78c63 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 15 Jun 2020 13:11:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) 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 7158108..73537a0 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 @@ -104,7 +104,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("条码类型") private String snType; - @Column(name = "SHIPPING_FLAG") + @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index f0851f2..129d45e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -54,7 +54,7 @@ public class MesCustomer extends BaseBean implements Serializable { @ApiParam("客户电话") private String telephone; - @Column(name = "SHIPPING_FLAG") + @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index c7d49ea..f4f3037 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -110,13 +110,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; - @Column(name = "SN_TYPE") + @Column(name = "SAMPLE_TYPE") @ApiParam("条码类型") - private String snType; + private String sampleType; @Transient @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; public MesPackage() { } From 6f375edf9a0a4ac5e496a9f312fb61f1dc9acc45 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 15 Jun 2020 13:16:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0=E6=A0=B7=E6=9C=AC=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b603804..b39e8ce 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 @@ -706,7 +706,7 @@ public class MesEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); private String value; private String description;