From a4bc17b0a60a2ad23ab757d359182f9ad85e2ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 19 Oct 2020 21:28:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat(form):sap=5Fhana=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index d2c673a..f401265 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1816,7 +1816,8 @@ public class CommonEnumUtil { SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"), + SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null); private int value; private String code; @@ -1908,6 +1909,13 @@ public class CommonEnumUtil { return tmp; } + public String getSchemaPattern(String schema) { + if(this.equals(SOURCE_SAP_HANA)){ + return schema; + } + return defaultSchemaPattern; + } + public String getJDBCUrl(String database,String host,Integer port){ if(this.getValue() == SOURCE_MARIA_DB.getValue()){ return getJDBCUrlMySQL(database,host,port); @@ -1917,6 +1925,8 @@ public class CommonEnumUtil { return getJDBCUrlPostgreSQL(database,host,port); }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ return getJDBCUrlSQLServer(database,host,port); + }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){ + return getJDBCUrlSapHana(database,host,port); } return null; } @@ -1944,6 +1954,8 @@ public class CommonEnumUtil { return SOURCE_POSTGRE_SQL; }else if(databaseProductName.indexOf(":sqlserver:") != -1){ return SOURCE_SQL_SERVER; + }else if(databaseProductName.indexOf(":sap:") != -1){ + return SOURCE_SAP_HANA; } } return null; @@ -1965,6 +1977,10 @@ public class CommonEnumUtil { return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + private String getJDBCUrlSapHana(String database,String host,Integer port){ + return "jdbc:sap://" + host + ":" + port + "?reconnect=true"; + } + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ StringBuffer sb = new StringBuffer(); sb.append("jdbc:sqlserver://").append(host); From bf416281140f177eb7bc658a5e023e4d3a91647b Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 20 Oct 2020 10:32:15 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E8=B4=A8=E6=A3=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=B5=AE=E7=82=B9=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index acce643..15d26d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -221,10 +221,10 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; - @Column(name = "STD_CHECK_TIME") + @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)") @ApiParam(value = "标准质检时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Integer stdCheckTime; + private Double stdCheckTime; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") From e268ed86a999d89a604973f73189fbf7e0465cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 20 Oct 2020 15:30:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=9011934=2019081-=E5=B7=A5=E4=BD=8DBO?= =?UTF-8?q?M=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E5=92=8C=E5=B7=A5=E4=BD=8D=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6-20201020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 ++ 2 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 4cd5e8a..c14092e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -217,6 +217,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient + @ApiParam("缺陷名称") + private String defectName; + + @Transient + @ApiParam("维修状态") + private Integer repairStatus; + public MesProduceSn() { } 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 9b7067b..5e60a3c 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 @@ -783,6 +783,8 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); return packBean; } From 627e8ac215c899f1017aeda7fd0432c73a070fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 20 Oct 2020 16:04:39 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF=E7=9B=B8=E5=85=B3=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesBoardMafactAssessment.java | 118 +++++++++++++++++++++ .../MesBoardMafactAssessmentRepository.java | 14 +++ 2 files changed, 132 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java new file mode 100644 index 0000000..f909fde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -0,0 +1,118 @@ +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 : MES_看板麦格纳评定项 + * @Reference : + * @Author : adair + * @CreateDate : 2020-10-19 17:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOARD_MAFACT_ASSESSMENT") +@Api("MES_看板麦格纳评定项") +public class MesBoardMafactAssessment extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7260899228359202210L; + + @Column(name="BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name="ENG_ADV_QUALITY") + @ApiParam("ENG_ADV_QUALITY") + private String engAdvQuality; + + @Column(name="MANAGEMENT") + @ApiParam("MANAGEMENT") + private String manageMent; + + @Column(name="MAT_LOG_SUP") + @ApiParam("MAT_LOG_SUP") + private String matLogSup; + + @Column(name="MFG_EXC") + @ApiParam("MFG_EXC") + private String mfgExc; + + @Column(name="QUALITY") + @ApiParam("QUALITY") + private String quality; + + @Column(name = "EHS") + @ApiParam("EHS") + private String ehs; + + @Column(name = "COST") + @ApiParam("COST") + private String cost; + + @Column(name = "HR") + @ApiParam("HR") + private String hr; + + @Column(name = "JAN") + @ApiParam("JAN") + private String jan; + + @Column(name = "FEB") + @ApiParam("FEB") + private String feb; + + @Column(name = "MAR") + @ApiParam("MAR") + private String mar; + + @Column(name = "APR") + @ApiParam("APR") + private String apr; + + @Column(name = "MAY") + @ApiParam("MAY") + private String may; + + @Column(name = "JUN") + @ApiParam("JUN") + private String jun; + + @Column(name = "JUL") + @ApiParam("JUL") + private String jul; + + @Column(name = "AUG") + @ApiParam("AUG") + private String aug; + + @Column(name = "SEP") + @ApiParam("SEP") + private String sep; + + @Column(name = "OCT") + @ApiParam("OCT") + private String oct; + + @Column(name = "NOV") + @ApiParam("NOV") + private String nov; + + @Column(name = "DEC") + @ApiParam("DEC") + private String dec; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java new file mode 100644 index 0000000..511a124 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.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.MesBoardMafactAssessment; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesBoardMafactAssessmentRepository extends BaseRepository { +} From 66c55386eeffc65b130877011b387b2c48a70cdd Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 20 Oct 2020 18:41:38 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsweb=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e18520b..90a1736 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; import java.util.List; /** @@ -66,6 +67,32 @@ public class SwebHqlPack { return buildHql(purchaseOrder, result); } + public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + } else { + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + } + if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { + DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), + purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); + } + + List poStatus = new ArrayList<>(); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); + //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); + DdlPreparedPack.getInPackList(poStatus, "poStatus", result); + + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(purchaseOrder, result); + } + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); From 4ca43f81cca72f4e273efe7ed7368c0d03984100 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 21 Oct 2020 09:24:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3JIS=E5=8F=91=E8=BF=90=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 5 +++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 12 +++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 9 ++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 2ea88ea..bf65f0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -70,4 +70,9 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "传真") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; + + @Column(name = "SAFETY_STOCK") + @ApiParam(value = "safetyStock") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private Double safetyStock; } 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 398154c..935bcc4 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 @@ -197,6 +197,20 @@ public class WmsDocFgDetail extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") private Integer productStatus; + @Column(name = "CURRENT_SEQ") + @ApiParam(value = "当前序号") + private Integer currentSeq; + + @Column(name = "MAX_SEQ") + @ApiParam(value = "最大序号") + private Integer maxSeq; + + @Column(name = "RC_TIME") + @ApiParam(value = "接收时间") + private String rcTime; + + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; @@ -205,6 +219,18 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) { + this.jisNo = jisNo; + this.queueGroupNo = queueGroupNo; + this.processTime = processTime; + } + + public WmsDocFgDetail(String jisNo, String sn) { + this.jisNo = jisNo; + this.sn = sn; + } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { this.sn = sn; this.mfgLocNo = mfgLocNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index c3f8106..d82174b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -177,6 +177,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Column(name = "REF_SN") + @ApiParam("关联条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSn; + @Column(name = "GROUP_NO") @ApiParam("分组号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 7f47f40..7d51f82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,7 +10,12 @@ import lombok.EqualsAndHashCode; 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.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -187,8 +192,13 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("交易类型集合") + private List filterTransTypeCodeList; + + @Transient + @ApiParam("交易类型集合") private List transTypeCodeList; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") 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 e9b0b82..8772b84 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 @@ -268,6 +268,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("委外收货时间") public String rcDatetime; + @Transient + @ApiParam("条码数量") + public Integer snCount; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -409,4 +413,9 @@ public class WmsMoveSn extends BaseBean { this.transTypeName = transTypeName; this.itemStatus = itemStatus; } + + public WmsMoveSn(Integer snCount, String createDatetime) { + this.snCount = snCount; + this.createDatetime = createDatetime; + } } From ceb882cef4dfcb26daeaa5844ac16f3b8be6c097 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 21 Oct 2020 12:31:33 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index bf65f0b..344757d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -72,7 +72,7 @@ public class BasCustomer extends BaseBean { private String custFax; @Column(name = "SAFETY_STOCK") - @ApiParam(value = "safetyStock") + @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f65a06b..bc69da7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -198,6 +198,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -274,9 +278,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; this.partNo = partNo; this.qty = qty; this.rcQty = rcQty; From 525cda27684f0f59315f3362cbcbb836353243d8 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 21 Oct 2020 14:12:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 34c8f2b..d350c54 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 @@ -170,6 +170,18 @@ public class MesPackage extends BaseBean implements Serializable { public MesPackage() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getQty2Val() { + return this.qty2 == null ? 0.0d : this.qty2; + } + + public double getPackSpecQtyVal() { + return this.packSpecQty == null ? 0.0d : this.packSpecQty; + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo;