From 980f98bf26ef83faa246a382e86decdfd58fc15b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 1 Jul 2021 11:17:37 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E5=85=B7=E4=BD=93=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a3ab756..f286942 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -86,6 +86,9 @@ public class AndonBoardModel implements Serializable { @ApiParam(value = "事件原因描述") public String ecNameRdd; + @ApiParam(value = "具体事件原因描述") + public String ecDesc; + @ApiParam(value = "小时") public String hour; From e711e9f051bb76430c2d42ab30d4b5a2c80c71f3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 1 Jul 2021 16:34:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Excel=E7=9A=84=E5=AF=BC=E5=87=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=B3=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java | 8 ++++++-- .../i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 4b5934f..6385abe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -72,6 +72,10 @@ public class BasImportTemplate extends BaseBean{ @ApiParam(value = "起始行", example = "0") private Integer startRow; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + @Transient @ApiParam("模板明细列表") private List templateDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index 21c1237..a7da14f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -122,4 +122,8 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name = "IS_EXPORT_TITLE") @ApiParam("是否导出表头") private Integer isExportTitle; + + @Column(name = "ANNOTATE_COMMENT") + @ApiParam("批注") + private String annotateComment; } \ No newline at end of file From 1e13a34883c9e6c977bfa2c54fecd3f1465464a7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 2 Jul 2021 11:28:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?BOM=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 1acf77d..03aedd3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -100,6 +100,14 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "是否虚阶物料") private String category; + @Column(name = "PURCHASE_TYPE") + @ApiParam(value = "采购类型") + private Integer purchaseType; + + @Column(name = "SPECIAL_PURCHASE_TYPE") + @ApiParam(value = "特殊采购类型") + private Integer specialPurchaseType; + /** * 是否包含子阶 * @return From 94a6f616e7fab384011490c40f4b32b34ab897ba Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 2 Jul 2021 14:19:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?BOM=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 03aedd3..e2fd57e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -102,11 +102,11 @@ public class WmsBomTotal extends BaseBean { @Column(name = "PURCHASE_TYPE") @ApiParam(value = "采购类型") - private Integer purchaseType; + private String purchaseType; @Column(name = "SPECIAL_PURCHASE_TYPE") @ApiParam(value = "特殊采购类型") - private Integer specialPurchaseType; + private String specialPurchaseType; /** * 是否包含子阶 From 79608e26e7485c3f22c2a1f17f4e5f3a1a3a923c Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 5 Jul 2021 09:39:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8C=97=E4=BA=ACmgn=20ERP=20FG=20details?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/snapshot/erp/WmsErpFgDetailsSnapshot.java | 67 ++++++++++++++++++++++ .../wms/repository/IWmsErpFgDetailsRepository.java | 17 ++++++ 2 files changed, 84 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java new file mode 100644 index 0000000..14eeefb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +/** + * @Description : ERP fgDetail表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2021/7/5 9:31 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_ERP_FG_DETAILS_SNAPSHOT", indexes = {@Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SNAPSHOT_TIME")}) +public class WmsErpFgDetailsSnapshot extends BaseBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name = "SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件号") + private String itemPartNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin号") + private String vinCode; + + @Column(name = "ITEM_PART_QTY") + @ApiParam("子零件数量") + private Double itemPartQty; + + @ApiParam("存储区") + private String zoneNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java new file mode 100644 index 0000000..f3d4a4e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpFgDetailsSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 库存信息快照 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsErpFgDetailsRepository extends BaseRepository { +} From 95cee813c0b59088ec1fdc911e7c794727f54922 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 5 Jul 2021 10:39:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90jenkins=E6=89=93=E5=8C=85=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-screen/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..e2e883f 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -6,6 +6,7 @@ i3plus-pojo i3plus.pojo 1.0-TEST-SNAPSHOT + ../../pom.xml 4.0.0 From 3ac0d2d6dc12b5de501a924b03995e9f371c8ec9 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 5 Jul 2021 13:21:57 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=A0=E9=99=A4wmsStockSn=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=B4=A2=E5=BC=95=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 6ee40bf..6060bdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -36,17 +36,17 @@ import java.util.List; @Table(name = "WMS_STOCK_SN", indexes = { @Index(columnList = "PACKAGE_NO"), @Index(columnList = "PART_NO"), - @Index(columnList = "REF_SRC"), + //@Index(columnList = "REF_SRC"), @Index(columnList = "SN"), - @Index(columnList = "SN_2D"), - @Index(columnList = "WH_NO"), + //@Index(columnList = "SN_2D"), + //@Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), @Index(columnList = "LOCATE_NO"), - @Index(columnList = "LOT_NO"), - @Index(columnList = "FIX_LOT_NO"), - @Index(columnList = "DATE_CODE"), - @Index(columnList = "VENDOR_NO"), - @Index(columnList = "ORGANIZE_CODE") + //@Index(columnList = "LOT_NO"), + //@Index(columnList = "FIX_LOT_NO"), + //@Index(columnList = "DATE_CODE"), + //@Index(columnList = "VENDOR_NO"), + //@Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate