From cb4fd979e153e717e044fba80dd11ef426c73e63 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 11 Jun 2020 17:31:11 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 10 +++++----- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 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..9f80bcc 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 @@ -100,11 +100,11 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; - @Column(name = "SN_TYPE") - @ApiParam("条码类型") - private String snType; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private String sampleType; - @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..f8312be 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") - @ApiParam("条码类型") - private String snType; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private String sampleType; @Transient @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; public MesPackage() { } From de08f2005ea24ce967d2ac3cf93c2f8d30a55d4f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 18:48:22 +0800 Subject: [PATCH 02/24] =?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 27cb1dddfe584c12205289a859a949c017aec41d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 12 Jun 2020 17:21:04 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E3=80=901603=20=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9F=A5=E8=AF=A2-=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=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/wms/bean/WmsMoveSn.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/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 6c182e1..1a11e38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -340,7 +340,7 @@ public class WmsMoveSn extends BaseBean { } public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn, - String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, + String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) { this.id = id; this.organizeCode = organizeCode; From 7a60d37ddc7cff729f7a708a970f4349b523738d Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 12 Jun 2020 17:29:57 +0800 Subject: [PATCH 04/24] Finish Task #2080 Cost:8h --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 077e388..b6385a9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7550,13 +7550,13 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCAN_CATEGORY { - ASN(10, "wmsDoMovementMasterRepository", "ASN"), - PO(20, "wmsDoMovementMasterRepository", "PO"), - SO(30, "wmsDoMovementMasterRepository", "SO"), - MOVE(40, "wmsDoMovementMasterRepository", "移库单"), - IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"), - SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"), - QC(70, "wmsDoMovementMasterRepository", "质检单"), + ASN(10, "wmsDocMovementMasterRepository", "ASN"), + PO(20, "wmsDocMovementMasterRepository", "PO"), + SO(30, "wmsDocMovementMasterRepository", "SO"), + MOVE(40, "wmsDocMovementMasterRepository", "移库单"), + IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"), + SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"), + QC(70, "wmsQCMasterRepository", "质检单"), CS(80, "wmsCSOrderMasterRepository", "盘点单"), SN(90, "wmsStockSnRepository", "条码"), PO_SN(100, "wmsPoSnRepository", "收货条码"); From 672483245c8bff55e5bcb0e3f2a613c9bd208147 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 13 Jun 2020 14:03:50 +0800 Subject: [PATCH 05/24] 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 53298f6b88b4f9b6cf436a6c8e52c85fbbd877e4 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 15 Jun 2020 09:15:18 +0800 Subject: [PATCH 06/24] Finish Task #2080 Cost:8h --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b6385a9..adf2ba9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7559,7 +7559,7 @@ public class WmsEnumUtil { QC(70, "wmsQCMasterRepository", "质检单"), CS(80, "wmsCSOrderMasterRepository", "盘点单"), SN(90, "wmsStockSnRepository", "条码"), - PO_SN(100, "wmsPoSnRepository", "收货条码"); + PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码"); private int value; private String code; From 26d7701a49d6eb73a3567ccd73af795246e78c63 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 15 Jun 2020 13:11:13 +0800 Subject: [PATCH 07/24] =?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 08/24] =?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; From e457b50145c71371e6fae2156d56d630d49cb1bf Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 15 Jun 2020 18:11:30 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= 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 667156b..169c59d 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 @@ -224,6 +224,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); From b0b07437d6b8323d0fb1ba6dbc0b7acaa965266a Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 15 Jun 2020 20:01:55 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 3fe454da39e029a87069908ea7ed66419983b532 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 15 Jun 2020 21:14:00 +0800 Subject: [PATCH 11/24] Fix bug#8909 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 3b790fb..5ad3da6 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 @@ -745,7 +745,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd) { + String prodCfgTypeName, String custNameRdd, String workOrderCode) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -791,7 +791,7 @@ public class WmsStockSn extends BaseBean { this.partTypeDesc = partTypeDesc; this.prodCfgTypeName = prodCfgTypeName; this.custNameRdd = custNameRdd; - this.vendorNameRdd = vendorNameRdd; + this.workOrderCode = workOrderCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index a20ea25..2c5f6e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description") private Integer orderBackType; + @Column(name = "TM_NAME") + @ApiParam(value = "交易处理组件名称") + private String tmName; + @Transient @ApiParam("菜单URL") private String menuUrl; From 67a7904024610b1fe3134429f446ba3ec76f7e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 17 Jun 2020 10:02:02 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index bb6d667..2acb63c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -141,6 +141,9 @@ public class StationRequestBean implements Serializable { @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); + @ApiParam("物料名称") + private String partName; + @Override public String toString() { return "StationRequestBean{" + From cb69f62c63133f0b4cd1c7bf8b4df49aceb77d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 17 Jun 2020 18:24:13 +0800 Subject: [PATCH 13/24] =?UTF-8?q?Fix=20Bug=20#8886=20=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E4=B8=8A=E7=BA=BF=E6=89=AB=E6=8F=8F=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=9C=8B=E5=88=B0=E5=8E=9F=E6=9D=90=E6=96=99=E5=B7=B2?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=95=B0=E9=87=8F=E5=92=8C=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ++++++++++++++++++++++ .../repository/MesCellFeedRecordRepository.java | 14 ++++ .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 74 ++++++++++++++++++++++ .../repository/MesCellFeedRecordRepository.java | 14 ++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 16 +++++ 5 files changed, 192 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..6464445 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工位投料履历信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971379489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..6153d23 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..9386832 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工位投料履历信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..5cb4185 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} 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 91597a2..9d81d04 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 @@ -111,6 +111,22 @@ public class MesPcnHqlPack { return packBean; } + /** + * 获取工作中心下所有的投料履历数据 + * + * @param mesCellFeedRecord + * @param org + * @return + */ + public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + return packBean; + } + /** * 获取原材料扫描信息的对应工序BOM From c066820b185d1cca2eadcfe8afc3d991d2987808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 18 Jun 2020 11:31:13 +0800 Subject: [PATCH 14/24] =?UTF-8?q?Fix=20Bug=20#9001=20=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.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/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index b3e82e2..66ba978 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 @@ -112,7 +112,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("产品条码零件名称") private String partName; - @Transient + @Column(name = "ITEM_PART_NAME") @ApiParam("原材料零件名称") private String itemPartName; From 878acb869ffc9269ea000f2527f7fd29b9f62e2b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 18 Jun 2020 14:50:54 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4zh=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 3 ++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 33 ++++++++------- .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesPartSample.java | 44 +++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 2 +- .../i3plus/pojo/mes/model/ButtonDynamicModel.java | 13 ++++-- .../i3plus/pojo/mes/model/PackageSampleModel.java | 49 ++++++++++++++++++++++ .../mes/repository/MesPartSampleRepository.java | 17 ++++++++ 9 files changed, 144 insertions(+), 23 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 9d06adc..e2e0255 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -243,6 +243,9 @@ public interface BaseRepository extends JpaReposito T getByProperty(String[] propertyNames, Object[] values); + @Deprecated + T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager); + int listCount(); int findByPropertyCount(String propertyName, Object value); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 2e3d875..c0874d6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -46,6 +46,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; + /* 默认查询数据条数 */ + private static final Pager DEFAULT_PAGER = new Pager(10,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -506,10 +508,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - try { - List list = findByHqlWhere(packBean); - return list.size() != 0 ? list.get(0) : null; + List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); return null; @@ -521,21 +522,18 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; - try { - List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); - return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); - throw new RuntimeException("存在多条记录：" + ex.getMessage()); - } + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { + return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + } + + @Override + public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { + pager = pager == null ? DEFAULT_PAGER: pager; + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -561,7 +559,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } try{ - List list = queryObject.getResultList(); + List list = queryObject + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); return list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在",ne); @@ -602,7 +603,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep try { if(!StringUtil.isEmpty(vendorNoStr)){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo"; - list=entityManager.createQuery(queryString) + list=entityManager.createQuery(queryString) .setParameter("vendorNo", vendorNoStr) .getResultList(); } 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 73537a0..2708fcf 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 @@ -100,9 +100,9 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; - @Column(name = "SN_TYPE") + @Column(name = "SAMPLE_TYPE") @ApiParam("条码类型") - private String snType; + private String sampleType; @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") 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 f4f3037..4b81afd 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 @@ -112,7 +112,7 @@ public class MesPackage extends BaseBean implements Serializable { @Column(name = "SAMPLE_TYPE") @ApiParam("条码类型") - private String sampleType; + private String sampleType = "10"; @Transient @ApiParam("客户发往地") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java new file mode 100644 index 0000000..4b756ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_SAMPLE") +@Api("产品样本配置") +public class MesPartSample extends BaseBean implements Serializable { + private static final long serialVersionUID = -9190123981329081945L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index e0a1558..05466cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -24,7 +24,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SUB_PART") -@Api("数据同步死信") +@Api("替代料") public class MesSubPart extends BaseBean implements Serializable { private static final long serialVersionUID = 4636507477301700549L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index a4b29ec..16d16db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -37,20 +37,27 @@ public class ButtonDynamicModel { private String paramValue; - public ButtonDynamicModel(Long id, String buttonCode, String buttonName){ + public ButtonDynamicModel(Long id, String buttonCode, String buttonName) { this.id = id; this.buttonCode = buttonCode; this.buttonName = buttonName; } - public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){ + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode) { this.buttonCode = buttonCode; this.buttonName = buttonName; this.paramCode = paramCode; } - public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) { + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + this.paramValue = paramValue; + } + + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) { this.id = id; this.buttonCode = buttonCode; this.windowNo = windowNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java new file mode 100644 index 0000000..33fd2aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/6/16 14:21 + * @desc 打包样本 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("打包样本") +public class PackageSampleModel { + + @ApiParam(name = "已打包数量") + private Double alreadyPackageCount; + + @ApiParam(name = "标准打包数量") + private Double standardPackageCount; + + @ApiParam(name = "样本类型") + private Map sampleTypeMap; + + @ApiParam(name = "样本类型代码") + private String lastSampleTypeCode; + + @ApiParam(name = "选择的样本类型") + private String chooseSampleTypeCode; + + @ApiParam(name = "强制执行工步") + private String forceStepCode; + + @ApiParam(name = "强制打包密码") + private String password; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工单号") + private String workOrderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java new file mode 100644 index 0000000..881d274 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartSample; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartSampleRepository extends BaseRepository { + +} From b65d9e0f3d01849ece4cd7471b5dc10d1c9063fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 18 Jun 2020 17:03:36 +0800 Subject: [PATCH 16/24] =?UTF-8?q?2171=20=E9=A6=96=E6=A3=80=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index e3982b1..3bbe40e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @Column(name = "FI_QTY") @ApiParam("首检数量") private Double fiQty; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; } 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 9e98310..7a27711 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 @@ -104,6 +104,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("客户发运地") private String custDelieryLocation; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; @@ -112,10 +116,6 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String serialNumber; - @ApiParam(value = "产线") - @Transient - private String workCenterCode; - @ApiParam(value = "工单号") @Transient private String mesWorkNo; From 64b00d6717bb243efca5268f1fed87cca8fa930b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 18 Jun 2020 22:57:00 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2708fcf..e02f6cf 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 @@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable { private String partName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PACKAGE_NO") @ApiParam("包装条码") private String packageNo; From edae2b00f68bf7cfb417e6719849735c364ac786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 19 Jun 2020 19:31:54 +0800 Subject: [PATCH 18/24] =?UTF-8?q?Fix=20Bug=20#8996,#9033=201.PCN=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8F=8A=E5=90=8C=E6=AD=A5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA-0617=202.=E5=8E=9F?= =?UTF-8?q?=E6=9D=90=E6=96=99=E4=B8=8A=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index d97a57a..6913759 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,4 +30,6 @@ public class CellFeedModel { private String scanQty; + private String LineRemainQty; + } From 77e6ee3b985201fce912e30a2a2a997e608ec045 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 20 Jun 2020 13:08:40 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 84f4742..5892134 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3361,6 +3361,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), + TGMES("TGMES", "泰国MES"), AMP("AMP", "AMP系统"), DR("DR", "直送拉动"); @@ -3379,6 +3380,16 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String descriptionOfValue(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].value; + } + } + return tmp; + } } public static Map getEnumByName(String enumName) throws Exception { From 68c3f087dc676603bbed48d791f38e2ab19ccfa2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 20 Jun 2020 13:09:29 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 08e50e1..47406c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -153,4 +153,12 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; } From 78fa4f3a3716acb00e4e11a946a6fb2f8fe5aadd Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Jun 2020 18:03:06 +0800 Subject: [PATCH 21/24] =?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 3428e74..932bdd9 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 49f9d06d5fbc7ecc32948fefa0acde2035c8dc71 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 20 Jun 2020 20:51:56 +0800 Subject: [PATCH 22/24] =?UTF-8?q?Fix=20bug#9062=20=E6=97=A0=E9=94=A1?= =?UTF-8?q?=E5=96=9C=E5=BE=B7-=E7=94=9F=E4=BA=A7=E6=B1=87=E6=8A=A5?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E6=9D=90=E6=96=99/=E6=88=90=E5=93=81?= =?UTF-8?q?=EF=BC=89=E7=94=A8=20=E5=87=BD=E6=95=B0=E5=8F=96=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E7=88=B6=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=AD=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8F=B7=E5=8F=AF=E8=83=BD=E4=BC=9A=E6=9C=89?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA-0620?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 13 ++++++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index c13b717..b816bfe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "产品报工orderNo") private String fGOrderNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + private String itemSeqNo; + public SapDocFgSum(){} public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, - String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) { + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) { this.wdfdId = wdfdId; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean { this.effStartTime = effStartTime; this.bomVersion = bomVersion; this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; } public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 08e50e1..672dc3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -153,4 +155,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; } From c2a6fb1684dec8edbb8c9923a020116e6a9481e2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 22 Jun 2020 09:44:01 +0800 Subject: [PATCH 23/24] =?UTF-8?q?[=E4=BB=BB=E5=8A=A12186=20=E6=B6=82?= =?UTF-8?q?=E8=A3=85=E5=AF=BC=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d2b83c3..27ad0ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; @@ -270,7 +272,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "扩展数据MAP") public Map extendMap; - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -314,4 +315,16 @@ public class MesWorkOrder extends BaseBean implements Serializable { public int getApprovalStatusVal() { return this.approvalStatus == null ? 0 : this.approvalStatus; } + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(this.extend)) { + return JSONObject.parseObject(this.extend, Map.class); + } else { + return null; + } + } catch (Exception e) { + return null; + } + } } From 98b0110ff38e566d578840d6978335b809cc6787 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 22 Jun 2020 10:17:46 +0800 Subject: [PATCH 24/24] Finish Task #2080 Cost:8h --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 12 +++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index be8dd7d..99716c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -9,8 +9,13 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.math.BigDecimal; +import java.util.List; /** * @Description : 作业任务明细信息 @@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Transient + @ApiParam("工厂代码集合") + private List organizeCodeList; + + public Double getQty() { return this.qty == null ? 0 : this.qty; } 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 169c59d..bc80d7b 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 @@ -1913,6 +1913,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getInPackList(taskDetails.getOrganizeCodeList(), "organizeCode", result); getStringBuilderPack(taskDetails, result); return result; }