From 080aa0b3e32fd3cf2384a2b95147a1590d03fce1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 13 Apr 2020 21:44:29 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9sonar=20pom=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=B8=BAdev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 331fb73d28627baa9237b2681a6ed05d6b12580a Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Apr 2020 11:04:59 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=BB=B4=E6=8A=A4=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsCustomerPartShipping.java | 46 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 159 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 55 +++++++ .../i3plus/pojo/wms/bean/WmsVendorPlanner.java | 42 ++++++ .../i3plus/pojo/wms/bean/WmsVendorRelation.java | 46 ++++++ .../i3plus/pojo/wms/bean/WmsVendorWindow.java | 50 +++++++ .../WmsCustomerPartShippingRepository.java | 16 +++ .../wms/repository/WmsPartExtendRepository.java | 16 +++ .../pojo/wms/repository/WmsSubPartRepository.java | 16 +++ .../wms/repository/WmsVendorPlannerRepository.java | 16 +++ .../repository/WmsVendorRelationRepository.java | 16 +++ .../wms/repository/WmsVendorWindowRepository.java | 16 +++ 12 files changed, 494 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java new file mode 100644 index 0000000..711858f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -0,0 +1,46 @@ +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 : 客户物料发往地 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUSTOMER_PART_SHIPPING") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户物料发往地",description = "客户物料发往地") +public class WmsCustomerPartShipping extends BaseBean { + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java new file mode 100644 index 0000000..8076e5a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -0,0 +1,159 @@ +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.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.Index; +import javax.persistence.Table; + +/** + * @Description :物料扩展属性 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-07 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_EXTEND", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("物料扩展属性表") +public class WmsPartExtend extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "IS_SETTLE") + @ApiParam(value = "是否内部交易") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isSettle; + + @Column(name = "SETTLE_FACTORY_CODE") + @ApiParam(value = "结算工厂") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String settleFactoryCode; + + @Column(name = "SETTLE_REC_ERP_WH") + @ApiParam(value = "结算物料收货库存") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String settleRecErpWh; + + @Column(name = "VALUATION_CLASS") + @ApiParam(value = "评估类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String valuationClass; + + @Column(name = "VALUATION_CLASS_NAME") + @ApiParam(value = "评估类描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String valuationClassName; + + @Column(name = "MC_CODE") + @ApiParam(value = "MRP控制者") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String mcCode; + + @Column(name = "MC_NAME") + @ApiParam(value = "MRP控制者名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String mcName; + + @Column(name = "IS_STEEL") + @ApiParam(value = "是否为钢卷料") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE") + private Integer isSteel; + + @Column(name = "IS_PACKAGE_MATERIAL") + @ApiParam(value = "是否为包材") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isPackageMaterial; + + @Column(name = "RECEIVING_TYPE") + @ApiParam(value = "收货类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String receivingType; + + @Column(name = "LOT_CONTROL") + @ApiParam(value = "批次控制") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String lotControl; + + @Column(name = "RANGE_LOT") + @ApiParam(value = "批次容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeLot; + + @Column(name = "QUALITY_RATE") + @ApiParam(value = "质检率") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Double qualityRate; + + @Column(name = "ROUTING") + @ApiParam(value = "工艺") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String routing; + + @Column(name = "PO_PART_MULTIPLE") + @ApiParam(value = "乘倍包装") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String poPartMultiple; + + @Column(name = "RANGE_QTY_RATE") + @ApiParam(value = "数量容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeQtyRate; + + @Column(name = "RANGE_INVENTORY") + @ApiParam(value = "盘点容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeInventory; + + @Column(name = "PROD_LINE") + @ApiParam(value = "产品类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String prodLine; + + @Column(name = "SUPPLY_TYPE") + @ApiParam(value = "供货类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE") + private Integer supplyType; + + @Column(name = "RECEIVING_MODE") + @ApiParam(value = "收货方式") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_TYPE") + private Integer receivingMode; + + @Column(name = "PRE_RECEIVING_DAY") + @ApiParam(value = "预收货天数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer preReceivingDay; + + @Column(name = "IS_WAY_CALCULATION") + @ApiParam(value = "是否计算在途库存") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isWayCalculation; + + @Column(name = "IS_AUTO_PURCHASE") + @ApiParam(value = "是否自动采购") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isAutoPurchase; + + @Column(name = "AUTO_PURCHASE_QTY") + @ApiParam(value = "自动采购数量") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer autoPurchaseQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java new file mode 100644 index 0000000..9120e8d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -0,0 +1,55 @@ +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.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.Index; +import javax.persistence.Table; + +/** + * @Description :替代料 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SUB_PART", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("替代料") +public class WmsSubPart extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam(value = "替代物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String subPartNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "SUB_PART_NAME") + @ApiParam(value = "替代物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String subPartName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java new file mode 100644 index 0000000..7b1e347 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.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 : 供应商计划员 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_PLANNER") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商计划员",description = "供应商计划员") +public class WmsVendorPlanner extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "PLANNER_NAME") + @ApiParam(value = "计划员") + private String plannerName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java new file mode 100644 index 0000000..485f57a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -0,0 +1,46 @@ +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 : 供应商父子关系 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_RELATION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商父子关系",description = "供应商父子关系") +public class WmsVendorRelation extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "SUB_VENDOR_CODE") + @ApiParam(value = "子供应商编号") + private String subVendorCode; + + @Column(name = "SUB_VENDOR_NAME") + @ApiParam(value = "子供应商名称") + private String subVendorName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java new file mode 100644 index 0000000..bc65739 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -0,0 +1,50 @@ +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 : 供应商窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商窗口时间",description = "供应商窗口时间") +public class WmsVendorWindow extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String windowTime; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; + + @Column(name = "WEEK_DAY") + @ApiParam(value = "星期") + private String weekDay; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java new file mode 100644 index 0000000..c930217 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.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.WmsCustomerPartShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户物料发往地 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsCustomerPartShippingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java new file mode 100644 index 0000000..9a00bb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.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.WmsPartExtend; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-09 + * @Modify: + **/ +@Repository +public interface WmsPartExtendRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java new file mode 100644 index 0000000..73da0eb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.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.WmsSubPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : 替代料 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java new file mode 100644 index 0000000..55676e3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.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.WmsVendorPlanner; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商计划员 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorPlannerRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java new file mode 100644 index 0000000..a0c3c6b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.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.WmsVendorRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商父子关系 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java new file mode 100644 index 0000000..1329841 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.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.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorWindowRepository extends BaseRepository { +} From dd9ae231c878dc123be106aa721fddc165a00ac8 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Apr 2020 15:11:06 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=B8=8E=E7=95=8C=E9=9D=A2=E8=81=94?= =?UTF-8?q?=E8=B0=83=E7=89=A9=E6=96=99=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 136 +++++++++++++++++++++ 1 file changed, 136 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 383366a..48058dc 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 @@ -5951,4 +5951,140 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 钢卷料类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_STEEL_TYPE { + NONE(10, "非钢卷料"), + NORMAL(20, "普通钢卷料"), + FINE(30, "精钢卷料"); + + private int value; + private String description; + + PART_STEEL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_STEEL_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 供货类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_SUPPLY_TYPE { + JIT(10, "JIT"), + NOT_JIT(20, "非JIT"); + + private int value; + private String description; + + PART_SUPPLY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_SUPPLY_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 收货方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_RECEIVING_TYPE { + STAND(10, "标准收货"), + PREPARE(20, "预收货"); + + private int value; + private String description; + + PART_RECEIVING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_RECEIVING_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file From 16f6861ecd3c401793f1cbb1b3212b78754742a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Apr 2020 20:43:09 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 43 +++++++++++++ .../i3plus/pojo/wms/bean/WmsVendorRelation.java | 2 +- .../wms/repository/WmsCustWindowRepository.java | 16 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 75 ++++++++++++++++++++++ 4 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java new file mode 100644 index 0000000..5b53055 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -0,0 +1,43 @@ +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 : 客户窗口时间 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUST_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户窗口时间",description = "客户窗口时间") +public class WmsCustWindow extends BaseBean { + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "CUST_WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java index 485f57a..3b3bc84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -38,7 +38,7 @@ public class WmsVendorRelation extends BaseBean { @Column(name = "SUB_VENDOR_CODE") @ApiParam(value = "子供应商编号") - private String subVendorCode; + private String subVendorNo; @Column(name = "SUB_VENDOR_NAME") @ApiParam(value = "子供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java new file mode 100644 index 0000000..986645f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.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.WmsCustWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户窗口时间 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsCustWindowRepository extends BaseRepository { +} 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 17793d9..fb7dc06 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 @@ -2243,6 +2243,81 @@ public class WmsHqlPack { } /** + * 物料扩展属性 + * + * @param partExtend + * @return + */ + public static DdlPackBean packHqlWmsPartExtendByPart(WmsPartExtend partExtend) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(partExtend.getPartNo(), "partNo", packBean); + getStringBuilderPack(partExtend, packBean); + + return packBean; + } + + /** + * 替代料 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsSubPartByPart(WmsSubPart subPart) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(subPart.getPartNo(), "partNo", packBean); + getStringBuilderPack(subPart, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorWindow.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorWindow, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorPlanner + * @return + */ + public static DdlPackBean packHqlWmsVendorPlanner(WmsVendorPlanner vendorPlanner) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorPlanner.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorPlanner, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorRelation + * @return + */ + public static DdlPackBean packHqlWmsVendorRelation(WmsVendorRelation vendorRelation) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorRelation.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorRelation, packBean); + + return packBean; + } + + /** * 单位定义 * * @param wmsUnit From 01d3eeea51821307e8cdb6a3216ac326f52130f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Apr 2020 10:58:52 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=91=E5=BE=80=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 5 ++++ .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 4 +-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 +++++++++++++++++++++- 4 files changed, 41 insertions(+), 6 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 48058dc..ecb1651 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 @@ -6048,14 +6048,14 @@ public class WmsEnumUtil { * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PART_RECEIVING_TYPE { + public enum PART_RECEIVING_METHOD { STAND(10, "标准收货"), PREPARE(20, "预收货"); private int value; private String description; - PART_RECEIVING_TYPE(int value, String description) { + PART_RECEIVING_METHOD(int value, String description) { this.value = value; this.description = description; } @@ -6068,7 +6068,7 @@ public class WmsEnumUtil { return description; } - public static PART_RECEIVING_TYPE codeOf(int value) { + public static PART_RECEIVING_METHOD codeOf(int value) { for (int i = 0; i < values().length; i++) { if (values()[i].value == value) { return values()[i]; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..a33715f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -112,6 +112,11 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + @Column(name = "NEW_BOM_VERSION") + @ApiParam(value = "新版本号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String newBomVersion; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index 8076e5a..e01c45c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -134,8 +134,8 @@ public class WmsPartExtend extends BaseBean { @Column(name = "RECEIVING_MODE") @ApiParam(value = "收货方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_TYPE") - private Integer receivingMode; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD") + private Integer receivingMethod; @Column(name = "PRE_RECEIVING_DAY") @ApiParam(value = "预收货天数") 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 fb7dc06..131c0f9 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 @@ -2275,7 +2275,7 @@ public class WmsHqlPack { /** * 供应商窗口时间 条件封装 * - * @param subPart + * @param vendorWindow * @return */ public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) { @@ -2288,6 +2288,36 @@ public class WmsHqlPack { } /** + * 供应商窗口时间 条件封装 + * + * @param custWindow + * @return + */ + public static DdlPackBean packHqlWmsCustWindow(WmsCustWindow custWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(custWindow.getCustNo(), "custNo", packBean); + getStringBuilderPack(custWindow, packBean); + + return packBean; + } + + /** + * 客户物料发往地 条件封装 + * + * @param shipping + * @return + */ + public static DdlPackBean packHqlWmsCustomerPartShipping(WmsCustomerPartShipping shipping) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(shipping.getCustomerCode(), "customerCode", packBean); + getStringBuilderPack(shipping, packBean); + + return packBean; + } + + /** * 供应商父子关系 条件封装 * * @param vendorPlanner From a2f7c3426e6c59d99a0796562a4b20bfacfae09f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Apr 2020 14:41:59 +0800 Subject: [PATCH 06/15] =?UTF-8?q?bug7994=E3=80=907994=20=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=94=B6=E8=B4=A7=E9=9C=80=E6=B1=82=E5=B7=AE=E5=BC=82?= =?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/model/wms/TransSnModle.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index dae7847..f371330 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,4 +46,10 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "物料信息") public WmsPart wmsPart; + + @ApiParam(value = "条码") + public WmsStockSn wmsStockSn; + + @ApiParam(value = "新条码") + public WmsStockSn NewWmsStockSn; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 6c78826..f835cef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -70,6 +70,7 @@ public class WmsPoSn extends BaseBean { /** * 质量:10-合格 20-不合格 30-隔离 40-报废 */ + @Column(name="QC_STATUS") @ApiParam(value = "质量状态", example = "10") public Integer qcStatus; @@ -150,6 +151,11 @@ public class WmsPoSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + @Transient + @ApiParam(value = "生产批次") + private String leftCode = ""; + + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ From 0e934f9af6531b5db21d0459eafde480dd124141 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 15 Apr 2020 15:47:55 +0800 Subject: [PATCH 07/15] =?UTF-8?q?task=20`1565`=20=E5=8F=91=E8=BF=90enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 178f794..23b4120 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2460,6 +2460,7 @@ public class MesPcnEnumUtil { public enum STATION_BUSI_TYPE { MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), + STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), @@ -3495,4 +3496,37 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } From 00fce0bded8c96989fd446d8db89e448b54033eb Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Apr 2020 16:01:20 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=91=E5=BE=80=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 50 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 5 --- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 4 ++ 3 files changed, 54 insertions(+), 5 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 ecb1651..5a5ff71 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 @@ -6087,4 +6087,54 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 星期 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WEEK_TYPE { + MONDAY(10, "星期一"), + TUESDAY(20, "星期二"), + WEDNESDAY(30, "星期三"), + THURSDAY(40, "星期四"), + FRIDAY(50, "星期五"), + SATURDAY(60, "星期六"), + SUNDAY(70, "星期七"); + + private int value; + private String description; + + WEEK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static WEEK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index a33715f..c87d03b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -112,11 +112,6 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; - @Column(name = "NEW_BOM_VERSION") - @ApiParam(value = "新版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String newBomVersion; - @ApiParam(value = "目标存储区") @Transient public String destZoneNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 5b53055..65a6608 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -37,6 +37,10 @@ public class WmsCustWindow extends BaseBean { @ApiParam(value = "窗口时间") private String custWindowTime; + @Column(name = "WEEKS") + @ApiParam(value = "星期") + private String weeks; + @Column(name = "DELAY_HOUR") @ApiParam(value = "容差") private Integer delayHour; From e64134a82144d1359ecd6b1590b8f762ec7c3c38 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Apr 2020 17:17:57 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 96 +--------------------- 1 file changed, 1 insertion(+), 95 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 869cab6..c879e97 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 @@ -7,101 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; -import cn.estsh.i3plus.pojo.wms.bean.BasCustomer; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; -import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; -import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; -import cn.estsh.i3plus.pojo.wms.bean.SwebProcurementPlanOrder; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; -import cn.estsh.i3plus.pojo.wms.bean.WmsAreaOwner; -import cn.estsh.i3plus.pojo.wms.bean.WmsBom; -import cn.estsh.i3plus.pojo.wms.bean.WmsBusiType; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSFactTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSLocate; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSZone; -import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord; -import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; -import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth; -import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsFGInStock; -import cn.estsh.i3plus.pojo.wms.bean.WmsFix; -import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; -import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; -import cn.estsh.i3plus.pojo.wms.bean.WmsLocatePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMasterDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; -import cn.estsh.i3plus.pojo.wms.bean.WmsPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation; -import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; -import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; -import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsRouting; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingAssign; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingDetail; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsShift; -import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest; -import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; -import cn.estsh.i3plus.pojo.wms.bean.WmsShippingFlag; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockInitialize; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuan; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc; -import cn.estsh.i3plus.pojo.wms.bean.WmsTempOrderLock; -import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsUnit; -import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; -import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsWaveRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; From 255aefbcef266471b681d617d2f04c48bbf6428a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 15 Apr 2020 18:19:49 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E3=80=901585=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=B4=E6=8A=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 ++++++++++++++++- .../i3plus/pojo/mes/model/MesWorkOrderModel.java | 39 ++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 4 ++ .../i3plus/pojo/wms/bean/WmsDocSoDetails.java | 70 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java | 68 +++++++++++++++++++++ .../wms/repository/WmsDocSoDetailsRepository.java | 14 +++++ .../wms/repository/WmsDocSoMasterRepository.java | 16 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 38 ++++++++++++ 8 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.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 383366a..15cc31e 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 @@ -240,7 +240,7 @@ public class WmsEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 单据主表状态(ASN,PO,MOVE,QC,SO) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { @@ -5951,4 +5951,58 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SO_ORDER_TYPE { + SALES(10, "SALES", "销售"); + + private int value; + private String code; + private String description; + + SO_ORDER_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 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 String valueOfDescription(int val) { + return valueOf(val); + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java new file mode 100644 index 0000000..921c69f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产工单导入 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单导入",description = "生产工单导入") +public class MesWorkOrderModel { + + @ApiParam("工单号") + @AnnoOutputColumn(required = false) + private String orderNo; + + @ApiParam("物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam("客户产线代码") + @AnnoOutputColumn + private String custProdLineCode; + + @ApiParam("数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam("开始时间") + @AnnoOutputColumn + private String startTime; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 88f3576..0b173cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -169,6 +169,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "指定生产日期") private String assignDateCode; + @Column(name = "SO_ORDER_NO") + @ApiParam(value = "销售单据号") + private String soOrderNo; + @Transient @ApiParam("实际批次") private String actualLot; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java new file mode 100644 index 0000000..20e8f31 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -0,0 +1,70 @@ +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 lombok.ToString; +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.Table; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 13:30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_DETAILS") +@Api("销售订单明细表") +@ToString +public class WmsDocSoDetails extends BaseBean { + private static final long serialVersionUID = -8900949569711082994L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "SNP_QTY") + @ApiParam(value = "标准包装", example = "1") + private Double snpQty; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java new file mode 100644 index 0000000..863ea9c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -0,0 +1,68 @@ +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 lombok.ToString; +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-04-13 13:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_MASTER") +@Api("销售订单主表") +@ToString +public class WmsDocSoMaster extends BaseBean { + + private static final long serialVersionUID = 8250843929041855006L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ORDER_TYPE") + @ApiParam("订单类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SO_ORDER_TYPE.class, refForeignKey = "value", value = "description") + public Integer orderType; + + @Column(name = "ORDER_STATUS") + @ApiParam(value = "订单状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + + @Column(name = "CUST_CODE") + @ApiParam(value = "客户编号") + private String custCode; + + @Column(name = "CUST_DESC") + @ApiParam(value = "客户全称") + private String custDesc; + + @Column(name = "CUST_DELIVERY_CODE") + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; + + @Column(name = "FLAG_NAME") + @ApiParam(value = "客户发往地名称") + private String flagName; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java new file mode 100644 index 0000000..6d47563 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.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.WmsDocSoDetails; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:53 + * @Modify: + **/ +public interface WmsDocSoDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java new file mode 100644 index 0000000..e09b4d7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.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.WmsDocSoMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 销售订单主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:52 + * @Modify: + **/ +@Repository +public interface WmsDocSoMasterRepository extends BaseRepository { +} 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 17793d9..8654efa 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 @@ -2921,4 +2921,42 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransportRule, result); return result; } + + /** + * SO订单主表信息 分页查询 + * + * @param wmsDocSoMaster + * @return + */ + public static DdlPackBean packHqlWmsDocSoMaster(WmsDocSoMaster wmsDocSoMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsDocSoMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustCode(), "custCode", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustDeliveryCode(), "custDeliveryCode", result); + DdlPreparedPack.getNumEqualPack(wmsDocSoMaster.getOrderStatus(), "orderStatus", result); + getStringBuilderPack(wmsDocSoMaster, result); + + return result; + } + + /** + * SO订单明细表 分页查询 + * + * @param wmsDocSoDetails + * @return + */ + public static DdlPackBean packHqlWmsDocSoDetails(WmsDocSoDetails wmsDocSoDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsDocSoDetails, result); + + return result; + } } From 88279f9b8bd2c69ee397dbb37189962882e31f1c Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Apr 2020 19:16:11 +0800 Subject: [PATCH 11/15] =?UTF-8?q?sonar=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++-- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 10 ++++ .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 27 +++++++++++ 4 files changed, 96 insertions(+), 4 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 fb0ec0d..d12bf90 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 @@ -1283,8 +1283,8 @@ public class WmsEnumUtil { public enum CS_STRATEGY_TYPE { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -1328,7 +1328,8 @@ public class WmsEnumUtil { AJUST_INVENTORY(50, "库存调整盘点"), PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -6191,4 +6192,4 @@ public class WmsEnumUtil { return valueOf(val); } } -} \ No newline at end of file +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 3561345..a6845a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -100,4 +100,14 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘物料") + @Column(name="INVENTORY_MATERIAL") + private String inventoryMaterial; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘库位") + @Column(name="INVENTORY_LOCATION") + private String inventoryLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index c1013d5..bc5e86b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -301,4 +301,58 @@ public class WmsTmsShippingExtDetail extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { + this.moveNo = moveNo; + this.partNo = docMovementDetails.getPartNo(); + this.partNameRdd = docMovementDetails.getPartNameRdd(); + this.item = docMovementDetails.getItem(); + this.qty =docMovementDetails.getQty(); + this.unit = docMovementDetails.getUnit(); + this.orderNo = docMovementDetails.getOrderNo(); + this.srcWhNo = docMovementDetails.getSrcWhNo(); + this.srcZoneNo = docMovementDetails.getSrcZoneNo(); + this.srcLocateNo = docMovementDetails.getSrcLocateNo(); + this.destWhNo = docMovementDetails.getDestWhNo(); + this.destZoneNo = docMovementDetails.getDestZoneNo(); + this.destLocateNo = docMovementDetails.getDestLocateNo(); + this.printQty = docMovementDetails.getPrintQty(); + this.planDate = docMovementDetails.getPlanDate(); + this.planTime = docMovementDetails.getPlanTime(); + this.srcNo = docMovementDetails.getSrcNo(); + this.itemStatus = docMovementDetails.getItemStatus(); + this.isFree = docMovementDetails.getIsFree(); + this.remark = docMovementDetails.getRemark(); + this.pickQty = docMovementDetails.getPickQty(); + this.outQty = docMovementDetails.getOutQty(); + this.recQty = docMovementDetails.getRecQty(); + this.moveQty = docMovementDetails.getMoveQty(); + this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); + this.srcAreaNo = docMovementDetails.getSrcAreaNo(); + this.destAreaNo = docMovementDetails.getDestAreaNo(); + this.lotNo = docMovementDetails.getLotNo(); + this.srcItem = docMovementDetails.getSrcItem(); + this.custOrderNo = docMovementDetails.getCustOrderNo(); + this.assignDateCode = docMovementDetails.getAssignDateCode(); + this.actualLot = docMovementDetails.getActualLot(); + this.actualQty = docMovementDetails.getActualQty(); + this.recommondLot = docMovementDetails.getRecommondLot(); + this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); + this.isSet = docMovementDetails.getIsSet(); + this.dateCode = docMovementDetails.getDateCode(); + this.inputMoveQty = docMovementDetails.getInputMoveQty(); + this.snp = docMovementDetails.getSnp(); + this.detailsSnCount = docMovementDetails.getDetailsSnCount(); + this.restQty = docMovementDetails.getRestQty(); + this.isTask = docMovementDetails.getIsTask(); + this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); + this.printStatus = docMovementDetails.getPrintStatus(); + this.priority = docMovementDetails.getPriority(); + this.sumQty = docMovementDetails.getSumQty(); + this.sumPickQty = docMovementDetails.getSumPickQty(); + this.executeStatus = docMovementDetails.getExecuteStatus(); + this.lockVersion = docMovementDetails.getLockVersion(); + this.moveType = docMovementDetails.getMoveType(); + this.busiType = docMovementDetails.getBusiType(); + this.isSn = docMovementDetails.getIsSn(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java index 8c415bd..5c40810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -145,4 +145,31 @@ public class WmsTmsShippingExtSn extends BaseBean { this.countBox = countBox; this.partNo = partNo; } + + public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { + this.moveNo = moveNo; + this.orderNo = docMovementSn.getOrderNo(); + this.item = docMovementSn.getItem(); + this.partNo = docMovementSn.getPartNo(); + this.partNameRdd = docMovementSn.getPartNameRdd(); + this.qty = docMovementSn.getQty(); + this.unit = docMovementSn.getUnit(); + this.snStatus = docMovementSn.getSnStatus(); + this.sn = docMovementSn.getSn(); + this.vendorNo = docMovementSn.getVendorNo(); + this.snType = docMovementSn.getSnType(); + this.isSet = docMovementSn.getIsSet(); + this.destLocateNo = docMovementSn.getDestLocateNo(); + this.srcLocateNo = docMovementSn.getSrcLocateNo(); + this.dateCode = docMovementSn.getDateCode(); + this.inputMoveQty = docMovementSn.getInputMoveQty(); + this.planDate = docMovementSn.getPlanDate(); + this.planTime = docMovementSn.getPlanTime(); + this.erpWhNo = docMovementSn.getErpWhNo(); + this.itemStatus = docMovementSn.getItemStatus(); + this.customerPartNo = docMovementSn.getCustomerPartNo(); + this.parentReturnPart = docMovementSn.getParentReturnPart(); + this.templateNo = docMovementSn.getTemplateNo(); + this.countBox = docMovementSn.getCountBox(); + } } From cba7ee3d0d09f6a4dbdf283d66f810a98e371208 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 15 Apr 2020 19:54:32 +0800 Subject: [PATCH 12/15] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1522=EF=BC=8C?= =?UTF-8?q?ptl=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 113 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 17 ++-- .../i3plus/pojo/ptl/bean/PtlRouteModuleParam.java | 57 +++++++++++ .../pojo/ptl/model/ActionModuleGroupModel.java | 36 +++++++ .../pojo/ptl/model/BussinessProcessModel.java | 35 +++++++ .../i3plus/pojo/ptl/model/ProcessDetailModel.java | 51 ++++++++++ .../repository/PtlActionModuleParamRepository.java | 15 +++ .../repository/PtlRouteModuleParamRepository.java | 15 +++ 8 files changed, 325 insertions(+), 14 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 4bf2e60..2c5fcb1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,98 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 触发事件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUNT_STATUS_TRIGGER_EVENT { + SUCCESS("SUCCESS", "是"), + FAILURE("FAILURE", "否"); + + private String value; + private String description; + + ROUNT_STATUS_TRIGGER_EVENT(String value, String description) { + this.value = value; + this.description = description; + } + + public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) { + for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) { + if (triggerEvent.getValue().equals(value)) { + return triggerEvent; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** * 作业流程类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -46,21 +138,30 @@ public class PtlEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public static ROUTE_EVENT getByValue(String value) { + for (ROUTE_EVENT routeEvent : values()) { + if (routeEvent.getValue().equals(value)) { + return routeEvent; + } + } + return null; + } + + public String getValue() { return value; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index cab76d0..43cd127 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -554,21 +554,21 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -933,8 +933,9 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); private int value; private String code; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java new file mode 100644 index 0000000..56fdace --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_流程组件调用参数") +public class PtlRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3036415977457877114L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java new file mode 100644 index 0000000..f08d7da --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ActionModuleGroupModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("组件代码") + private String amCode; + + @ApiParam("执行顺序") + private Integer seq; + + @ApiParam("流程组件参数集合") + private List routeModuleParamList; + + @ApiParam("区域流程组件参数集合") + private List areaRouteModuleParamList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java new file mode 100644 index 0000000..e533406 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 作业流程Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("作业流程Model") +public class BussinessProcessModel implements Serializable { + + private static final long serialVersionUID = 148029163662900001L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("GOJS位置") + private String position; + + @ApiParam("流程明细Model集合") + private List processDetailModelList; + + @ApiParam("区域代码") + private String areaNo; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java new file mode 100644 index 0000000..3f42664 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ProcessDetailModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("组件集MAP") + private Map> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java new file mode 100644 index 0000000..227c5ef --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleParam; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java new file mode 100644 index 0000000..81c64ba --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteModuleParamRepository extends BaseRepository { + +} From bd810c1c8c0b234cb3c907af004545c3db4c4511 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Apr 2020 09:24:51 +0800 Subject: [PATCH 13/15] task:1591 --- .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 157 +++++++++++++++++++++ .../wms/repository/WmsBomHistoryRepository.java | 9 ++ 2 files changed, 166 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java new file mode 100644 index 0000000..6475e26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -0,0 +1,157 @@ +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.WmsEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +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.Table; +import javax.persistence.Transient; + +/** + * @Description : bom历史记录 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_BOM_HISTORY") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "bom历史记录", description = "bom历史记录") +public class WmsBomHistory extends BaseBean { + @Column(name = "PART_NO") + @ApiParam(value = "父物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "父物料描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "计量单位") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String unit; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "数量") + @ColumnDefault("0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam(value = "子物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNo; + + @Column(name = "ITEM_PART_NAM") + @ApiParam(value = "子料物料描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNam; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子计量单位") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemUnit; + + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "子用量") + @ColumnDefault("0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double itemQty; + + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_START_TIME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effStartTime; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_END_TIME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effEndTime; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "线边库位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String locateNo; + + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String terminalNo; + + @Column(name = "NEW_BOM_VERSION") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String newBomVersion; + + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + + public Double getQty() { + return this.qty == null ? 0 : this.qty.doubleValue(); + } + + public Double getItemQty() { + return this.itemQty == null ? 0 : this.itemQty.doubleValue(); + } + + public WmsBomHistory() { + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java new file mode 100644 index 0000000..48e9727 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.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.WmsBomHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsBomHistoryRepository extends BaseRepository { +} From 89a9946432da740db9a2c100b0460c69b6d767a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Apr 2020 11:32:49 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 146 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesEquFaultCause.java | 44 +++++++ .../i3plus/pojo/mes/bean/MesEquFaultMethod.java | 44 +++++++ .../pojo/mes/bean/MesEquFaultPhenomenon.java | 44 +++++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 + .../estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 9 +- .../estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 9 +- .../i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 15 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesLocate.java | 44 +++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 42 +++--- .../i3plus/pojo/mes/bean/MesSpActionRecord.java | 52 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesSparePart.java | 52 ++++++++ .../i3plus/pojo/mes/bean/MesSparePartDetail.java | 69 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesZones.java | 40 ++++++ .../mes/repository/MesEquFaultCauseRepository.java | 14 ++ .../repository/MesEquFaultMethodRepository.java | 14 ++ .../MesEquFaultPhenomenonRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 75 ++++++++++- 18 files changed, 687 insertions(+), 44 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java 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 66938b2..85c0088 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 @@ -4847,4 +4847,150 @@ public class MesEnumUtil { } } + /** + * 作业校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_MODEL { + NO_CHECK(10, "不校验"), + CHECK(20, "校验设备就绪信号"); + + private int value; + private String description; + + CHECK_MODEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * PLC类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_OPERATION_SIGNLE(20, "设备作业信号"); + + private int value; + private String description; + + PLC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 备件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SP_TYPE { + + VULNERABLE_PART("10", "易损件"), + KEY_PART("20", "关键件"), + STANDARD_PART("30", "标准件"); + + private String value; + private String description; + + SP_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 备件明细状态 + */ + /** + * 备件操作记录-操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPARE_PART_DETAIL_STATUS{ + IN_LIBRARY(10, "在库"), + USE(20, "领用"), + SCRAPED(30, "报废"); + + private int value; + private String description; + + SPARE_PART_DETAIL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java new file mode 100644 index 0000000..d631542 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_CAUSE") +@Api("MES_设备故障原因") +public class MesEquFaultCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825283741375978L; + @Column(name = "FC_CODE") + @ApiParam("故障原因代码") + private String fcCode; + + @Column(name = "FC_NAME") + @ApiParam("故障原因描述") + private String fcName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java new file mode 100644 index 0000000..2d65481 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_METHOD") +@Api("MES_设备故障处理措施") +public class MesEquFaultMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1366849727309967125L; + @Column(name = "FM_CODE") + @ApiParam("故障方法代码") + private String fmCode; + + @Column(name = "FM_NAME") + @ApiParam("故障方法描述") + private String fmName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java new file mode 100644 index 0000000..44fcf64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_PHENOMENON") +@Api("MES_设备故障现象") +public class MesEquFaultPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4373435091738791300L; + @Column(name = "FP_CODE") + @ApiParam("故障现象代码") + private String fpCode; + + @Column(name = "FP_NAME") + @ApiParam("故障现象描述") + private String fpName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 15f8628..b33ac9b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("连接类型") private Integer connectType; + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 213bebc..a78fc9f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("mes设备故障原因表") +@Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { private static final long serialVersionUID = 1229825197241375978L; @@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable { @ApiParam("故障原因描述") private String fcName; - @Column(name = "PARENT_FC_CODE") - @ApiParam("父阶原因代码") - private String parentFcCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FC_TYPE") + @ApiParam("故障原因类型编码") + private String fcType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 7cdfd96..4a0e758 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("mes设备故障方法表") +@Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -1366849757709967125L; @@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable { @ApiParam("故障方法描述") private String fmName; - @Column(name = "PARENT_FM_CODE") - @ApiParam("父阶故障代码") - private String parentFmCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FM_TYPE") + @ApiParam("故障措施类型编码") + private String fmType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index 9c36828..d66b12b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("mes设备故障现象表") +@Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { private static final long serialVersionUID = 4373435095236791300L; @@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @ApiParam("故障现象描述") private String fpName; - @Column(name = "PARENT_FP_CODE") - @ApiParam("父阶现象代码") - private String parentFpCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 @Column(name = "FP_TYPE") - @ApiParam("故障现象类型") - private Integer fpType; + @ApiParam("故障现象类型编码") + private String fpType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java new file mode 100644 index 0000000..52d1380 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LOCATE") +@Api("MES_库位") +public class MesLocate extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825295729375298L; + @Column(name = "LOCATE_NO") + @ApiParam("库位编号") + private String locateNo; + + @Column(name = "LOCATE_NAME") + @ApiParam("库位名称") + private String locateName; + + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index dc419c2..4d2fc73 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -54,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("通道") private String channel; + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + @Column(name = "TAG_NAME") @ApiParam("标签名称") private String tagName; @@ -70,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("分组名称") private String groupName; - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "PLC_CFG") + @ApiParam("PLC配置") + private String plcCfg; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; + @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -86,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - @Column(name = "FEED_VALUE") @ApiParam("反馈值") private String feedValue; @@ -114,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("空间索引") private Integer nameSpaceIndex = 2; + @Column(name = "PLC_TYPE") + @ApiParam("PLC类型") + private Integer plcType; + @Column(name = "USER_NAME") @ApiParam("用户名") private String userName; @@ -130,10 +138,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("OPC值") private List opcValue; - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; - @Transient @ApiParam("标签数据") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java new file mode 100644 index 0000000..e331486 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SP_ACTION_RECORD") +@Api("MES_备件操作记录") +public class MesSpActionRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222647293041375978L; + @Column(name = "SP_NO") + @ApiParam("备件编号") + private String spNo; + + @Column(name = "ACTION_TYPE") + @ApiParam("操作类型") + private Integer actionType; + + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java new file mode 100644 index 0000000..793e49e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPARE_PART") +@Api("MES_备件表") +public class MesSparePart extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825293041375978L; + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "SP_TYPE") + @ApiParam("备件类型") + private String spType; + + @Column(name = "SP_CATEGORY") + @ApiParam("备件类别") + private String spCategory; + + @Column(name = "USEFUL_LIFE") + @ApiParam("有效期") + private Integer usefulLife; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java new file mode 100644 index 0000000..aefb4cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SPARE_PART_DETAIL") +@Api("MES_备件明细") +public class MesSparePartDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825292839375978L; + @Column(name = "SP_NO") + @ApiParam("备件编号") + private String spNo; + + @Column(name = "SP_CODE") + @ApiParam("备件代码") + private String spCode; + + @Column(name = "SP_NAME") + @ApiParam("备件名称") + private String spName; + + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam("库位编号") + private String locateNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name="RECEIVE_DATE") + @ApiParam(value ="接收日期") + private Date receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam(value ="启用日期") + private Date enableDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java new file mode 100644 index 0000000..845061d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ZONES") +@Api("MES_存储区") +public class MesZones extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825293041375298L; + @Column(name = "ZONE_NO") + @ApiParam("存储区代码") + private String zoneNo; + + @Column(name = "ZONE_NAME") + @ApiParam("存储区名称") + private String zoneName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java new file mode 100644 index 0000000..550230a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:08 + * @Modify: + **/ +public interface MesEquFaultCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java new file mode 100644 index 0000000..9c61d73 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultMethod; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:07 + * @Modify: + **/ +public interface MesEquFaultMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java new file mode 100644 index 0000000..dd0473e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquFaultPhenomenon; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:05 + * @Modify: + **/ +public interface MesEquFaultPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 2872139..a66acb5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1324,8 +1324,50 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } - if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) { + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean); + } + return packBean; + } + + /** + * MES 设备故障处理措施查询条件封装 + * + * @param mesEquFaultMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障原因查询条件封装 + * + * @param mesEquFaultCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } @@ -1345,8 +1387,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } - if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + if (!StringUtils.isEmpty(mesFaultCause.getFcType())) { + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean); } return packBean; } @@ -1366,8 +1408,29 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) { + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean); + } + return packBean; + } + + /** + * MES 设备故障现象查询条件封装 + * + * @param mesEquFaultPhenomenon + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } From e464b4d6991d0cdb3ccc9cc52e6ea30feb6297ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Apr 2020 13:41:10 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 76 ---------------------- .../cn/estsh/i3plus/pojo/mes/bean/MesLocate.java | 44 ------------- .../i3plus/pojo/mes/bean/MesSpActionRecord.java | 52 --------------- .../estsh/i3plus/pojo/mes/bean/MesSparePart.java | 52 --------------- .../i3plus/pojo/mes/bean/MesSparePartDetail.java | 69 -------------------- .../cn/estsh/i3plus/pojo/mes/bean/MesZones.java | 40 ------------ 6 files changed, 333 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java 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 85c0088..003c779 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 @@ -4917,80 +4917,4 @@ public class MesEnumUtil { } } - /** - * 备件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SP_TYPE { - - VULNERABLE_PART("10", "易损件"), - KEY_PART("20", "关键件"), - STANDARD_PART("30", "标准件"); - - private String value; - private String description; - - SP_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 备件明细状态 - */ - /** - * 备件操作记录-操作类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPARE_PART_DETAIL_STATUS{ - IN_LIBRARY(10, "在库"), - USE(20, "领用"), - SCRAPED(30, "报废"); - - private int value; - private String description; - - SPARE_PART_DETAIL_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java deleted file mode 100644 index 52d1380..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LOCATE") -@Api("MES_库位") -public class MesLocate extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825295729375298L; - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "LOCATE_NAME") - @ApiParam("库位名称") - private String locateName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java deleted file mode 100644 index e331486..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SP_ACTION_RECORD") -@Api("MES_备件操作记录") -public class MesSpActionRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1222647293041375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "ACTION_TYPE") - @ApiParam("操作类型") - private Integer actionType; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java deleted file mode 100644 index 793e49e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART") -@Api("MES_备件表") -public class MesSparePart extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375978L; - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "SP_TYPE") - @ApiParam("备件类型") - private String spType; - - @Column(name = "SP_CATEGORY") - @ApiParam("备件类别") - private String spCategory; - - @Column(name = "USEFUL_LIFE") - @ApiParam("有效期") - private Integer usefulLife; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java deleted file mode 100644 index aefb4cf..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART_DETAIL") -@Api("MES_备件明细") -public class MesSparePartDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825292839375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "QTY") - @ApiParam("数量") - private Integer qty; - - @Column(name="RECEIVE_DATE") - @ApiParam(value ="接收日期") - private Date receiveDate; - - @Column(name="ENABLE_DATE") - @ApiParam(value ="启用日期") - private Date enableDate; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java deleted file mode 100644 index 845061d..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ZONES") -@Api("MES_存储区") -public class MesZones extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375298L; - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "ZONE_NAME") - @ApiParam("存储区名称") - private String zoneName; -}