From 27c62aa7d1f19d4e006c0ff3cc5db549543d8416 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 May 2020 11:34:34 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index f6df34c..4704193 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; +import javax.persistence.Entity; /** * @Description : 零件自动采购单信息 @@ -14,6 +14,7 @@ import javax.persistence.Column; * @Modify: **/ @Data +@Entity @Api("收货追踪地图信息") public class WmsAutoPurchasePartModel { @ApiParam("合同号") From a5a032debe771252a4b656ff519ef909a55ffd9b Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 May 2020 16:18:01 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E8=A7=A3=E5=86=B3model=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 3 --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java | 3 --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java | 3 --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 3 --- 4 files changed, 12 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java index 62e107f..cfbb3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 报工事务明细表model * @Reference : @@ -15,7 +13,6 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("报工事务明细表model") public class WmsReportTransDetailModel extends BaseBean { private static final long serialVersionUID = 1547988564672291041L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java index fb58af7..1d7b583 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 报工事务汇总表model * @Reference : @@ -15,7 +13,6 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("报工事务汇总表model") public class WmsReportTransMasterModel extends BaseBean { private static final long serialVersionUID = 5696795930973637987L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java index 8757863..0d424ac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 供应商延迟到货明细表model * @Reference : @@ -15,7 +13,6 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("供应商延迟到货明细表model") public class WmsVendorDelayDetailModel extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index 4b6314c..a3fd7c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 供应商延迟到货汇总表model * @Reference : @@ -15,7 +13,6 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("供应商延迟到货汇总表model") public class WmsVendorDelayMasterModel extends BaseBean { From 911236ef8e7c82164f90b7a6815dbe725e49bcd7 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 May 2020 17:54:39 +0800 Subject: [PATCH 03/31] =?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 55e4e84..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-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From dd179a6d89bd8ca71c7efe81d85a24b23f4c640f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 22 May 2020 17:35:02 +0800 Subject: [PATCH 04/31] Fix Bug #8636 --- .DS_Store | Bin 0 -> 6148 bytes .../java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Sat, 23 May 2020 11:11:24 +0800 Subject: [PATCH 05/31] =?UTF-8?q?1,=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java | 82 ++++++++++++++++++++++ .../wms/repository/WmsSerialTransRepository.java | 15 ++++ 2 files changed, 97 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java new file mode 100644 index 0000000..6fa1259 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-05-23 10:44 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_SERIAL_TRANS") +@Api("产品条码事务") +public class WmsSerialTrans extends BaseBean { + private static final long serialVersionUID = -5026295121251346312L; + + @Column(name = "BATCH_NO") + @ApiParam(value = "父物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String batchNo; + + + @Column(name = "SERIAL_SN") + @ApiParam(value = "产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialSn; + + @Column(name = "BH_TYPE") + @ApiParam(value = "BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_TYPE") + private Integer bhType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNameRdd; + + @Column(name = "SRC_STOCK_SN") + @ApiParam(value = "原库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcStockSn; + + @Column(name = "DEST_STOCK_SN") + @ApiParam(value = "目的库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destStockSn; + + @Column(name = "TRANS_TYPE") + @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BACTH_TRANS_TYPE") + private Integer transType; + + @Column(name = "IS_OK") + @ApiParam(value = "是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isOk; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java new file mode 100644 index 0000000..305bb13 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialTrans; + +/** + * @Description : 产品条码事务 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-05-21 15:53 + * @Modify: + **/ +public interface WmsSerialTransRepository extends BaseRepository { + +} From f4c4b4a1f6601e8aebcaaa9e5623726ec99a25fb Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 23 May 2020 11:12:12 +0800 Subject: [PATCH 06/31] =?UTF-8?q?1,=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 123 +++++++++++++++++++++ 1 file changed, 123 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 bb07db9..dfe5dff 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 @@ -7038,4 +7038,127 @@ public class WmsEnumUtil { return null; } } + + /** + * 产品条码事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BACTH_TRANS_TYPE { + REPORT(10, "REPORT", "报工"), + UNTYING(20, "UNTYING", "解绑"), + CHECK(30, "CHECK", "检测"), + REPAIR(40, "REPAIR", "挑选返修"), + BIND(50, "BIND", "绑定"), + OUTSTOCK(60, "OUTSTOCK", "出库"); + private int value; + private String code; + private String description; + + BACTH_TRANS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BACTH_TRANS_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 业务表：BH类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TYPE { + HOLD_LOCATE(10, "hold库位"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"); + + private int value; + private String description; + + BH_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From 443486a8cf3e66559b14f3f41748ded3479f4aa8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 23 May 2020 11:19:41 +0800 Subject: [PATCH 07/31] =?UTF-8?q?BH=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?-=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java | 91 ++++++++++++++++++++++ .../pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 +- .../pojo/wms/repository/WmsSerialSnRepository.java | 16 ++++ 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java new file mode 100644 index 0000000..b1b60f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : 产品条码信息 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-05-23 11:00 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_SERIAL_SN", indexes = { + @Index(columnList = "BATCH_NO"), + @Index(columnList = "STOCK_SN"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SERIAL_SN") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "产品条码信息", description = "产品条码信息") +public class WmsSerialSn extends BaseBean { + + private static final long serialVersionUID = -2540413299274882785L; + + @Column(name = "BATCH_NO") + @ApiParam(value = "BATCH号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String batchNo; + + @Column(name = "STOCK_SN") + @ApiParam(value = "库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String stockSn; + + @Column(name = "SERIAL_SN") + @ApiParam(value = "产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialSn; + + @Column(name = "SRC_STOCK_SN") + @ApiParam(value = "源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcStockSn; + + @Column(name = "BH_TYPE") + @ApiParam(value = "BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") + private String bhType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") + private String partNameRdd; + + + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 43fe989..bb25c21 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"); private int value; private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java new file mode 100644 index 0000000..682a78e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : 产品条码信息dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-05-23 11:00 + * @Modify: + **/ +@Repository +public interface WmsSerialSnRepository extends BaseRepository { +} From 99955a70fff4684f54e668fb4f14ed694d836b86 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 23 May 2020 11:25:26 +0800 Subject: [PATCH 08/31] =?UTF-8?q?bug7940=E3=80=907940=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=9C=AA=E6=8C=89=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E6=8E=A8=E8=8D=90=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/WmsSerialSn.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/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index b1b60f7..82917a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -66,7 +66,7 @@ public class WmsSerialSn extends BaseBean { @ApiParam(value = "BH类型") @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") - private String bhType; + private Integer bhType; @Column(name = "PART_NO") @ApiParam(value = "物料编号") From ad79c9fd7b8af1282a80ed9ce39b07ccb31df7a5 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 23 May 2020 12:44:08 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9BH=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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/QmsCheckType.java | 49 ++++++++++++++ .../pojo/wms/bean/WmsBhChildDetectionItem.java | 4 -- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 7 +- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 4 +- .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 4 +- .../wms/repository/QmsCheckTypeRepository.java | 9 +++ 7 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java 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 dfe5dff..df02291 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 @@ -7161,4 +7161,78 @@ public class WmsEnumUtil { return tmp; } } + + /** + * BH库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_LOCATE_TYPE { + HOLD(10, "HOLD", "HOLD库位"), + WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"), + WAIT_OUT(30, "WAIT_OUT", "待出库库位"); + + private int value; + private String code; + private String description; + + BH_LOCATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_LOCATE_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java new file mode 100644 index 0000000..5a96543 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -0,0 +1,49 @@ +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 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; + +/** + * @Description : BH检测大类表 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "QMS_CHECK_TYPE") +@Api("物料子检测项") +public class QmsCheckType extends BaseBean { + + private static final long serialVersionUID = -4867744538301370899L; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkTypeCode; + + @Column(name = "CHECK_TYPE_NAME") + @ApiParam("检测大类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkTypeName; + + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String remark; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 6a4eee3..cc4a269 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -31,10 +31,6 @@ import javax.persistence.Table; public class WmsBhChildDetectionItem extends BaseBean { private static final long serialVersionUID = -8005468634643773682L; - @Column(name = "CHECK_TYPE") - @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; @Column(name = "ITEM_CHECK_CODE") @ApiParam("子检测项代码") 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 bf21ffc..aefb531 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 @@ -272,13 +272,18 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; - @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否回收", example = "2") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isRecycle; + @Column(name = "BH_LOCATE_TYPE") + @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer bhLocateType; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 2747b2b..6787076 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -48,8 +48,8 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkType; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 35dfe84..1873af3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -43,8 +43,8 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkType; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java new file mode 100644 index 0000000..c12772b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType; +import org.springframework.stereotype.Repository; + +@Repository +public interface QmsCheckTypeRepository extends BaseRepository { +} From 6d1c0bb46da9bb532249df591e333f949ac225ef Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 23 May 2020 13:02:38 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9BH=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index dc5f9e6..cb8f16f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -156,6 +156,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "三维位置") private String position; + @Column(name = "BH_LOCATE_TYPE") + @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") + private Integer bhLocateType; + // 导入用 @ApiParam(value = "工厂") @Transient 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 aefb531..235fd54 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 @@ -278,12 +278,6 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isRecycle; - @Column(name = "BH_LOCATE_TYPE") - @ApiParam(value = "BH库位类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) - private Integer bhLocateType; - public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); From 72817fca4ac5470e96551180fac2ee722ec82ab3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 23 May 2020 13:08:37 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/QmsCheckType.java | 42 ++++++++++++++ .../i3plus/pojo/wms/bean/QmsStockSnExtBh.java | 46 +++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java | 66 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 61 ++++++++++++++++++++ .../wms/repository/QmsCheckTypeRepository.java | 16 ++++++ .../wms/repository/QmsStockSnExtBhRepository.java | 14 +++++ .../pojo/wms/repository/WmsSerialSnRepository.java | 16 ++++++ .../wms/repository/WmsSerialSnTransRepository.java | 16 ++++++ 8 files changed, 277 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java new file mode 100644 index 0000000..11e12c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : BH检测大类表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 11:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="QMS_CHECK_TYPE") +@Api("BH检测大类表") +public class QmsCheckType extends BaseBean { + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类代码") + private String checkTypeCode; + + @Column(name = "CHECK_TYPE_NAME") + @ApiParam("检测大类名称") + private String checkTypeName; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java new file mode 100644 index 0000000..ba0e85d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : BH库存条码扩展表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 13:22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="QMS_STOCK_SN_EXT_BH") +@Api("BH检测大类表") +public class QmsStockSnExtBh extends BaseBean { + + @Column(name="sn") + @ApiParam("条码") + private String sn; + + @Column(name="BATCH_NO") + @ApiParam("BATCH号") + private String batchNo; + + @Column(name="BH_TYPE") + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + private Integer bhType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java new file mode 100644 index 0000000..5e546c0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : 产品条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_SERIAL_SN") +@Api("产品条码表") +public class WmsSerialSn extends BaseBean { + + @Column(name="BATCH_NO") + @ApiParam("BATCH号") + private String batchNo; + + @Column(name="STOCK_SN") + @ApiParam("库存条码") + private String stockSn; + + @Column(name="SERIAL_SN") + @ApiParam("产品条码") + private String serialSn; + + @Column(name="SRC_STOCK_SN") + @ApiParam("源库存条码") + private String srcStockSn; + + @Column(name="BH_TYPE") + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + private Integer bhType; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="qty") + @ApiParam("数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java new file mode 100644 index 0000000..7a8dd9a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_SERIAL_SN_TRANS") +@Api("班次信息") +public class WmsSerialSnTrans extends BaseBean { + + @Column(name="SERIAL_SN") + @ApiParam("产品条码") + private String serialSn; + + @Column(name="BH_TYPE") + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + private Integer bhType; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="SRC_STOCK_SN") + @ApiParam("源库存条码") + private String srcStockSn; + + @Column(name="DEST_STOCK_SN") + @ApiParam("目标库存条码") + private String destStockSn; + + @Column(name="TRANS_TYPE") + @ApiParam("操作类型") + private Integer transType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java new file mode 100644 index 0000000..b276887 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType; +import org.springframework.stereotype.Repository; + +/** + * @Description : BH检测大类表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 11:17 + * @Modify: + **/ +@Repository +public interface QmsCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java new file mode 100644 index 0000000..8276f93 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QmsStockSnExtBh; + +/** + * @Description : BH库存条码扩展表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 13:24 + * @Modify: + **/ +public interface QmsStockSnExtBhRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java new file mode 100644 index 0000000..ea92c06 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : 产品条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:44 + * @Modify: + **/ +@Repository +public interface WmsSerialSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java new file mode 100644 index 0000000..9430b0f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSnTrans; +import org.springframework.stereotype.Repository; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:43 + * @Modify: + **/ +@Repository +public interface WmsSerialSnTransRepository extends BaseRepository { +} From a4fdf07b4be4e59723083c0aed8d0859869e2270 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 23 May 2020 13:17:33 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 ++++- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 5 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 22 +++++++++++++--------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index cb8f16f..4cafb44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -156,9 +156,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "三维位置") private String position; + /** + * BH库位类型:10:HOLD库位；20：待检测库位；30:待出库库位 + */ @Column(name = "BH_LOCATE_TYPE") @ApiParam(value = "BH库位类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description") private Integer bhLocateType; // 导入用 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 6787076..2056d58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -46,10 +46,9 @@ public class WmsPartCheckType extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partName; - @Column(name = "CHECK_TYPE") + @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String checkType; + public String checkTypeCode; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") 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 2698900..4d80ed3 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 @@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("大检测项类型") - public Integer checkType; + public String checkTypeCode; @Transient @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index a181556..eff8e6c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -48,21 +48,25 @@ public class WmsTestResultDetails extends BaseBean { @ApiParam("物料名称") public String partName; - @Column(name = "CHECK_TYPE") - @ApiParam("大检测项类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description") - public Integer checkType; + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + public String checkTypeCode; - @Column(name = "qr_code") + @Column(name = "QR_CODE") @ApiParam("二维码") public String qrCode; - @Column(name = "is_qualified") + @Column(name = "IS_QUALIFIED") @ApiParam("是否合格") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isQualified; - @Column(name = "check_value") + @Column(name = "IS_FINISH") + @ApiParam("是否完成") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isFinish; + + @Column(name = "CHECK_VALUE") @ApiParam("检测值") public String checkValue; @@ -73,9 +77,9 @@ public class WmsTestResultDetails extends BaseBean { public WmsTestResultDetails() { } - public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) { + public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) { this.partNo = partNo; - this.checkType = checkType; + this.checkTypeCode = checkTypeCode; this.bhCode = bhCode; this.checkSize = checkSize; } From 33c0ab40158c92a59134881bde6cabed044f437a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 23 May 2020 13:19:32 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=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/WmsPartItemCheck.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 1873af3..e40f481 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -41,10 +41,9 @@ public class WmsPartItemCheck extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; - @Column(name = "CHECK_TYPE") + @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String checkType; + public String checkTypeCode; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") From 17b27da539a2968a415db291afe1e27125caaa85 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 23 May 2020 18:36:31 +0800 Subject: [PATCH 14/31] =?UTF-8?q?BH-CODE=20=E5=87=BA=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 10 +++ .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 18 +++++ .../estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java | 82 ---------------------- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 24 +++++++ .../estsh/i3plus/pojo/wms/dto/AssignmentDto.java | 3 +- .../i3plus/pojo/wms/dto/WmsCustWindowDto.java | 2 - .../wms/dto/WmsMoveMovementEffectivenessDto.java | 2 - .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 2 - .../pojo/wms/modelbean/WmsStaticCsModel.java | 3 - .../wms/repository/WmsSerialTransRepository.java | 15 ---- 10 files changed, 53 insertions(+), 108 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3009cfa..198bfde 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -300,6 +300,16 @@ public class DdlPreparedPack { } /** + * 判断字段为空 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNullPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and ( model." + columnName + + " is null or model." + columnName + " ='')", null); + } + /** * 封装String对象成equal语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index 7a8dd9a..3823d2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -30,6 +30,10 @@ import javax.persistence.Table; @Api("班次信息") public class WmsSerialSnTrans extends BaseBean { + @Column(name = "BATCH_NO") + @ApiParam("batch号") + private String batchNo; + @Column(name="SERIAL_SN") @ApiParam("产品条码") private String serialSn; @@ -58,4 +62,18 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") private Integer transType; + + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { + this.organizeCode = wmsSerialSn.getOrganizeCode(); + this.batchNo = wmsSerialSn.getBatchNo(); + this.serialSn = wmsSerialSn.getSerialSn(); + this.bhType = wmsSerialSn.getBhType(); + this.partNo = wmsSerialSn.getPartNo(); + this.partNameRdd = wmsSerialSn.getPartNameRdd(); + this.destStockSn = wmsSerialSn.getStockSn(); + this.transType = transType; + } + + public WmsSerialSnTrans() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java deleted file mode 100644 index 6fa1259..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : 产品条码事务表 - * @Reference : - * @Author :QianHuaSheng - * @CreateDate : 2020-05-23 10:44 上午 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "WMS_SERIAL_TRANS") -@Api("产品条码事务") -public class WmsSerialTrans extends BaseBean { - private static final long serialVersionUID = -5026295121251346312L; - - @Column(name = "BATCH_NO") - @ApiParam(value = "父物料号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String batchNo; - - - @Column(name = "SERIAL_SN") - @ApiParam(value = "产品条码") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String serialSn; - - @Column(name = "BH_TYPE") - @ApiParam(value = "BH类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TYPE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_TYPE") - private Integer bhType; - - @Column(name = "PART_NO") - @ApiParam(value = "物料号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam(value = "物料名称") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String partNameRdd; - - @Column(name = "SRC_STOCK_SN") - @ApiParam(value = "原库存条码") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String srcStockSn; - - @Column(name = "DEST_STOCK_SN") - @ApiParam(value = "目的库存条码") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String destStockSn; - - @Column(name = "TRANS_TYPE") - @ApiParam(value = "操作类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BACTH_TRANS_TYPE") - private Integer transType; - - @Column(name = "IS_OK") - @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") - private Integer isOk; -} 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 4d80ed3..3ba3899 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 @@ -592,4 +592,28 @@ public class WmsStockSn extends BaseBean { this.modifyDatetime = modifyDatetime; } + + public WmsStockSn(WmsStockSn stockSn, String batchCode) { + this.organizeCode = stockSn.getOrganizeCode(); + this.refSrc = stockSn.getRefSrc(); + this.partNo = stockSn.getPartNo(); + this.partNameRdd = stockSn.getPartNameRdd(); + this.snType = stockSn.getSnType(); + this.locateNo = stockSn.getLocateNo(); + this.workCenterCode = stockSn.getWorkCenterCode(); + this.packageNo = stockSn.getPackageNo(); + this.shippingFlag = stockSn.getShippingFlag(); + this.lotNo = stockSn.getLotNo(); + this.dateCode = stockSn.getDateCode(); + this.fixLotNo = stockSn.getFixLotNo(); + this.leftCode = stockSn.getLeftCode(); + this.qty = stockSn.getQty(); + this.sn = stockSn.getSn(); + this.createUser = stockSn.getCreateUser(); + this.createDatetime = stockSn.getCreateDatetime(); + this.modifyUser = stockSn.getModifyUser(); + this.modifyDatetime = stockSn.getModifyDatetime(); + this.refSrc = batchCode; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java index 45776dc..178a0ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -18,7 +17,6 @@ import javax.persistence.Id; * @Modify: **/ @Data -@Entity public class AssignmentDto { @Id @@ -69,4 +67,5 @@ public class AssignmentDto { public AssignmentDto() { } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java index f26fe08..6458aab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -6,7 +6,6 @@ import lombok.Data; import org.hibernate.annotations.GenericGenerator; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -17,7 +16,6 @@ import javax.persistence.Id; * @CreateDate : 2020-04-21 2:37 下午 * @Modify: **/ -@Entity @Data @Api("窗口输出类") public class WmsCustWindowDto { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java index 479bc1f..46b0a13 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -6,7 +6,6 @@ import lombok.Data; import org.hibernate.annotations.GenericGenerator; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -18,7 +17,6 @@ import javax.persistence.Id; * @Modify: **/ @Data -@Entity @Api("移动单效率(出参)") public class WmsMoveMovementEffectivenessDto { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index 9f03900..ba061d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -6,7 +6,6 @@ import lombok.Data; import org.hibernate.annotations.GenericGenerator; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -18,7 +17,6 @@ import javax.persistence.Id; * @Modify: **/ @Data -@Entity @Api("静态盘点查询输出实体类") public class WmsStockSnDto { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index dfae656..82f88b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 静态盘点输出model * @Reference : @@ -15,7 +13,6 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("静态盘点查询输出model") public class WmsStaticCsModel extends BaseBean { private static final long serialVersionUID = 9039981061448266666L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java deleted file mode 100644 index 305bb13..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsSerialTrans; - -/** - * @Description : 产品条码事务 - * @Reference : - * @Author : qianhuasheng - * @CreateDate : 2020-05-21 15:53 - * @Modify: - **/ -public interface WmsSerialTransRepository extends BaseRepository { - -} From c06fee639df76f1f2b32093aefe817ae7ce0044d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 23 May 2020 19:10:12 +0800 Subject: [PATCH 15/31] =?UTF-8?q?BH=20=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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 7 +-- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 2 +- .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 38 +++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 4 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 10 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 51 ++++++++++++++++++++-- 7 files changed, 97 insertions(+), 17 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 df02291..291b0be 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 @@ -7047,9 +7047,10 @@ public class WmsEnumUtil { REPORT(10, "REPORT", "报工"), UNTYING(20, "UNTYING", "解绑"), CHECK(30, "CHECK", "检测"), - REPAIR(40, "REPAIR", "挑选返修"), - BIND(50, "BIND", "绑定"), - OUTSTOCK(60, "OUTSTOCK", "出库"); + PICK(40, "REPAIR", "挑选"), + REPAIR(50, "REPAIR", "返修"), + BIND(60, "BIND", "绑定"), + OUTSTOCK(70, "OUTSTOCK", "出库"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 2056d58..a31a564 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -48,7 +48,7 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - public String checkTypeCode; + public Integer checkTypeCode; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index 3823d2b..aaec61f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -13,6 +15,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 产品条码事务表 @@ -27,11 +31,12 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_SERIAL_SN_TRANS") -@Api("班次信息") +@Api("产品条码事务表") public class WmsSerialSnTrans extends BaseBean { @Column(name = "BATCH_NO") - @ApiParam("batch号") + @ApiParam(value = "BATCH号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String batchNo; @Column(name="SERIAL_SN") @@ -40,15 +45,22 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="BH_TYPE") @ApiParam("BH类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") private Integer bhType; - @Column(name="PART_NO") - @ApiParam("物料号") + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="SRC_STOCK_SN") @@ -61,8 +73,20 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") private Integer transType; + @Column(name = "IS_OK") + @ApiParam(value = "是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isOk; + + @Transient + @ApiParam("操作类型") + private List transTypeLst; + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { this.organizeCode = wmsSerialSn.getOrganizeCode(); this.batchNo = wmsSerialSn.getBatchNo(); 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 3ba3899..2a1bff0 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 @@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("大检测项类型") - public String checkTypeCode; + public Integer checkTypeCode; @Transient @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index eff8e6c..7ddd599 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -50,7 +50,7 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - public String checkTypeCode; + public Integer checkTypeCode; @Column(name = "QR_CODE") @ApiParam("二维码") @@ -77,7 +77,7 @@ public class WmsTestResultDetails extends BaseBean { public WmsTestResultDetails() { } - public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) { + public WmsTestResultDetails(String partNo, Integer checkTypeCode, String bhCode, Long checkSize) { this.partNo = partNo; this.checkTypeCode = checkTypeCode; this.bhCode = bhCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 3ff22dd..618a4c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :检测结果汇总表 @@ -78,4 +80,12 @@ public class WmsTestResultSummary extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") public Integer pickResult; + + @Transient + @ApiParam("BH类型") + private Integer bhType; + + @Transient + @ApiParam("BH号") + private List bhCodeLts; } 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 b6e03ad..d2e106f 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 @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -3174,11 +3175,23 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result); + if (wmsTestResultSummary.getIsQualified() != null) { + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result); + } + List qmsBH = wmsTestResultSummary.getBhCodeLts(); + if (CollectionUtils.isEmpty(qmsBH)) { + qmsBH = new ArrayList<>(); + } + if (!StringUtils.isNotBlank(wmsTestResultSummary.getBhCode())) { + qmsBH.add(wmsTestResultSummary.getBhCode()); + } + if (CollectionUtils.isNotEmpty(qmsBH)) { + DdlPreparedPack.getInPackList(qmsBH, "bhCode", result); + } DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), @@ -3206,7 +3219,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result); + //DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { @@ -3235,7 +3248,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + //DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); getStringBuilderPack(checkType, result); return result; } @@ -3316,4 +3329,36 @@ public class WmsHqlPack { getStringBuilderPack(healthVariableResult, result); return result; } + + + /** + * 产品条码事务查询条件 + * + * @param wmsSerialSnTrans + * @return + */ + public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean); + DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean); + getStringBuilderPack(wmsSerialSnTrans, packBean); + return packBean; + } + + + /** + * BH检测大类表查询条件 + * + * @param qmsStockSnExtBh + * @return + */ + public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) { + + DdlPackBean packBean = new DdlPackBean(); +/* DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean); + DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean); + getStringBuilderPack(wmsSerialSnTrans, packBean);*/ + return packBean; + } } From 8c3f81292c3ea2c9d6768168a8c1c29d57ea4a07 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 23 May 2020 19:16:00 +0800 Subject: [PATCH 16/31] =?UTF-8?q?BH=20=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d2e106f..a28c500 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 @@ -3219,7 +3219,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); - //DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { @@ -3248,7 +3248,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); - //DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + DdlPreparedPack.getNumEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result); getStringBuilderPack(checkType, result); return result; } From 303e08b4cf708b9098d21b5c18529c8b259937d2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 24 May 2020 00:59:29 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b6e03ad..de520cd 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 @@ -3206,7 +3206,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { @@ -3235,7 +3235,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + DdlPreparedPack.getNumEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result); getStringBuilderPack(checkType, result); return result; } From 765e0619cabc9f4bda27b42324f7db6d5e53fb17 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 24 May 2020 01:15:50 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2a1bff0..3ba3899 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 @@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("大检测项类型") - public Integer checkTypeCode; + public String checkTypeCode; @Transient @ApiParam("样本数") From 627b41725687192a577be26db3f81c835a0fcada Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 24 May 2020 01:16:46 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index a31a564..2056d58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -48,7 +48,7 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - public Integer checkTypeCode; + public String checkTypeCode; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index 7ddd599..eff8e6c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -50,7 +50,7 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - public Integer checkTypeCode; + public String checkTypeCode; @Column(name = "QR_CODE") @ApiParam("二维码") @@ -77,7 +77,7 @@ public class WmsTestResultDetails extends BaseBean { public WmsTestResultDetails() { } - public WmsTestResultDetails(String partNo, Integer checkTypeCode, String bhCode, Long checkSize) { + public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) { this.partNo = partNo; this.checkTypeCode = checkTypeCode; this.bhCode = bhCode; From efc30f713fc90604b1da91dec66dcf6b6cbdae55 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 24 May 2020 16:17:55 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9BH=E5=90=8C=E6=AD=A5JOB?= =?UTF-8?q?=E9=80=BB=E8=BE=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/WmsPartCheckType.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index a31a564..57acbe8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -48,7 +48,8 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") - public Integer checkTypeCode; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + public String checkTypeCode; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index e40f481..b6099d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -43,6 +43,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String checkTypeCode; @Column(name = "CHECK_ITEM_CODE") From 1dc9276e9ad7da31417466e6ff7a8963349996b0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 May 2020 09:09:05 +0800 Subject: [PATCH 21/31] =?UTF-8?q?BH=20=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 --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 4 ---- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++----------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 198bfde..9a6e187 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -678,6 +678,28 @@ public class DdlPreparedPack { } /** + * 为空查询 + * + * @param columnName + * @param packBean + */ + public static void getIsNull(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null); + + } + + /** + * 不为空查询 + * + * @param columnName + * @param packBean + */ + public static void getIsNotNull(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null); + + } + + /** * 转换排序列 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 618a4c1..1a664de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -14,7 +14,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; /** * @Description :检测结果汇总表 @@ -85,7 +84,4 @@ public class WmsTestResultSummary extends BaseBean { @ApiParam("BH类型") private Integer bhType; - @Transient - @ApiParam("BH号") - private List bhCodeLts; } 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 a28c500..e3caec6 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 @@ -17,7 +17,6 @@ import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -3182,16 +3181,8 @@ public class WmsHqlPack { if (wmsTestResultSummary.getIsQualified() != null) { DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result); } - List qmsBH = wmsTestResultSummary.getBhCodeLts(); - if (CollectionUtils.isEmpty(qmsBH)) { - qmsBH = new ArrayList<>(); - } - if (!StringUtils.isNotBlank(wmsTestResultSummary.getBhCode())) { - qmsBH.add(wmsTestResultSummary.getBhCode()); - } - if (CollectionUtils.isNotEmpty(qmsBH)) { - DdlPreparedPack.getInPackList(qmsBH, "bhCode", result); - } + + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getBhCode(), "bhCode", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), From 75308c89895c5ff9fb1e679a81054629022b60ba Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 May 2020 09:26:13 +0800 Subject: [PATCH 22/31] =?UTF-8?q?BH=20=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 --- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 1a664de..edecd99 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -84,4 +84,27 @@ public class WmsTestResultSummary extends BaseBean { @ApiParam("BH类型") private Integer bhType; + public WmsTestResultSummary(String organizeCode, String bhCode, + String workCenterCode, String partNo, + String partName, String flagNo, Integer isQualified, + Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) { + this.organizeCode = organizeCode; + this.bhCode = bhCode; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.flagNo = flagNo; + this.isQualified = isQualified; + this.reworkStatus = reworkStatus; + this.reworkResult = reworkResult; + this.pickStatus = pickStatus; + this.pickResult = pickResult; + this.bhType = bhType; + + } + + public WmsTestResultSummary() { + + } + } From b060ba97aa0fe8773eb7773294171461cb3895bb Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 25 May 2020 09:26:15 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9BH=E5=90=8C=E6=AD=A5JOB?= =?UTF-8?q?=E9=80=BB=E8=BE=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/WmsLocate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 4cafb44..b9bb342 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -161,6 +161,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", */ @Column(name = "BH_LOCATE_TYPE") @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_LOCATE_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description") private Integer bhLocateType; From 583c750055685a189fec8b8a73ad03e150b000d3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 May 2020 12:26:36 +0800 Subject: [PATCH 24/31] =?UTF-8?q?BH=20=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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 70 ---------------------- .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 2 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 4 +- 3 files changed, 3 insertions(+), 73 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 291b0be..7b4d582 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 @@ -6836,76 +6836,6 @@ public class WmsEnumUtil { } - /** - * BH检测结果 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum BH_TEST_RESULT_STATUS { - NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"); - private int value; - private String code; - private String description; - - BH_TEST_RESULT_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); - } - - public static int descriptionOfValue(String desc) { - return descOf(desc); - } - - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static BH_TEST_RESULT_STATUS codeOf(Integer value) { - if (value == null) { - return null; - } else { - for (int i = 0; i < values().length; i++) { - if (values()[i].value == value) { - return values()[i]; - } - } - } - return null; - } - } /** * 仓库健康指标等级 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index aaec61f..9adf080 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -79,7 +79,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isOk; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index edecd99..a13a31f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -66,7 +66,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "REWORK_RESULT") @ApiParam("返修结果") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer reworkResult; @Column(name = "PICK_STATUS") @@ -76,7 +76,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_RESULT") @ApiParam("挑选结果") - @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer pickResult; From c2942b8a0df1a87f93ca0d9a2af523061580575c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 May 2020 12:27:36 +0800 Subject: [PATCH 25/31] =?UTF-8?q?BH=20=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 --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index bb25c21..43fe989 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), - MES2WMS(30, "MES2WMS-2", "MES --> WMS"), - WMS2MES(40, "WMS2MES-2", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); private int value; private String name; From 6fc4641033aece1cf0a91c05f86a18688e1edad8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 25 May 2020 14:01:31 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=80=BC-=E9=9C=80=E8=A6=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e3caec6..379c7cb 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 @@ -3239,7 +3239,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result); + DdlPreparedPack.getStringEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result); getStringBuilderPack(checkType, result); return result; } From b2384619d469614d501724081e8277a123f6bd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 25 May 2020 18:05:49 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E3=80=901891=09=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 73 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 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 8bf23fb..7dd74eb 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 @@ -3118,7 +3118,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"); + HNC_ISSUED(30,"队列自动下达"), + LABEL_PROPERTIES(40,"标签属性查询方法"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 2a23858..793f30f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 184df4f..dc2d752 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -108,6 +108,58 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Transient + @ApiParam("Vin") + private String vinCode; + + @Transient + @ApiParam("条码状态") + private Integer snStatus; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + @Transient + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Transient + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Transient + @ApiParam("等级代码") + private String gradeCode; + + @Transient + @ApiParam("标志值集合") + private String flagValueList; + + @Transient + @ApiParam("质量标志值") + private String qcFlagValue; + + @Transient + @ApiParam("3C认证编码") + private String cccCode; + + @Transient + @ApiParam("条码标签描述") + private String labelDesc; + + @Transient + @ApiParam("打印时间") + private String printTime; + + @Transient + @ApiParam("年度型") + private String modelYear; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -132,4 +184,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.seq = seq; this.serialNumber = serialNumber; } + + public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, + Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + this.orderNo = orderNo; + this.vinCode = vinCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.status = status; + this.serialNumber = serialNumber; + this.seq = seq; + this.isGroupPrinted = isGroupPrinted; + this.createDatetime = createDatetime; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.optionCode = optionCode; + this.produceColor = produceColor; + this.gradeCode = gradeCode; + this.assyNo = assyNo; + } } From 0636daed5127a5be3e3e5703d252323acc68e6d3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 25 May 2020 18:46:12 +0800 Subject: [PATCH 28/31] Finish Task:1896 Cost:8h --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index e1599ec..d2e6a0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -126,6 +126,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("半成品条码") private String halfProductSn; + @Transient + @ApiParam("主任务编号") + private String orderNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 23754d3f18fb8fe133b81298e20f5ef2a6cef00f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 25 May 2020 19:04:31 +0800 Subject: [PATCH 29/31] =?UTF-8?q?mes=E6=8F=90=E6=B5=8B=20=20=E8=BF=98?= =?UTF-8?q?=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 8955fd2f4ded1f2b9e3522785aec0873f131ef10 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 25 May 2020 19:06:39 +0800 Subject: [PATCH 30/31] =?UTF-8?q?mes=E6=8F=90=E6=B5=8B=20=E8=BF=98?= =?UTF-8?q?=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 bc7071b..004fb69 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..a9e288f 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 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-TEST-SNAPSHOT + 1.0-DEV-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 bf96e57..d800ecf 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..a785f21 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..d6d2f8e 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..0368700 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..b2eedd4 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..5fcd08a 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From c344f017a912487d6f6ee037c07a15151671b5ac Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 25 May 2020 21:31:57 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsonar=E4=B8=8A=E7=9A=84?= =?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/andon/sqlpack/AndonHqlPack.java | 62 +++++++++++++++++++--- .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 5 -- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 4 +- .../pojo/aps/converter/CustomDateDeserializer.java | 2 +- .../pojo/aps/converter/CustomDateSerializer.java | 2 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 14 +++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 7 files changed, 72 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 3240a9a..c8eddfd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1,6 +1,46 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.*; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonActor; +import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; +import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; +import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord; +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; +import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; +import cn.estsh.i3plus.pojo.andon.bean.MesShift; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -788,7 +828,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + if (mesArea != null) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -805,7 +847,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + if (mesWorkCenter != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -822,7 +866,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + if (mesWorkCell != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -839,7 +885,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + if (mesEquipment != null) { + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -857,7 +905,9 @@ public class AndonHqlPack { DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); } - DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + if (mesShift != null) { + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 26e9d6c..96ba229 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -43,9 +43,4 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } - - @Override - public boolean equals(Object obj) { - return this == obj; - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 2fa0ef7..0e529ea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -77,7 +77,7 @@ public class DateDuration { * @return */ public long getTimeInMillis() { - return this.time * 1000; + return this.time * 1000l; } @Override @@ -153,7 +153,7 @@ public class DateDuration { * @return */ public long getTimeInMillis(double amount) { - return this.getTime(amount) * 1000; + return this.getTime(amount) * 1000l; } private void parse() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 35cc4ba..027f459 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateDeserializer extends JsonDeserializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java index 8b8780d..6bfd17f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java @@ -9,7 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateSerializer extends JsonSerializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { 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 f1d9061..2e3d875 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 @@ -20,7 +20,13 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.UUID; /** * @Description : 自定义持久化接口实现 @@ -1579,8 +1585,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } Query query = entityManager.createQuery(queryString.toString()); - for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + if (packBean != null) { + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + } } return query.getResultList(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 379c7cb..c7611a7 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 @@ -2216,8 +2216,8 @@ public class WmsHqlPack { if (wmsProdCfgType != null) { DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); } - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result;