From ec3bcc751801dce3078b230db2d624293acb4d2a Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 2 Jul 2021 16:46:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=89=E5=BA=93=E5=AD=98=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 8 ++--- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 35 ---------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 2b8979f..4e7cb39 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -120,16 +120,16 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; + @Column(name="HAS_COMINBED") + @ApiParam(value ="是否组炉") + private Boolean hasCominbed = false; + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") private Date resProduceEnd; - @Transient - @FieldAnnotation(property = false) - private boolean hasCominbed = false; - public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 74dfeaf..4dcf88c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -394,7 +394,6 @@ public class BeanRelation { * @param index * @param */ - @SuppressWarnings("unchecked") private final static void recursionImpl(BaseBean bean, Predicate fun, Enum[] holders, int index) { if (index >= holders.length) { @@ -411,38 +410,4 @@ public class BeanRelation { } } } - - /** - * 判断target是否为bean为起点的以holders路径上的点。 - * @param bean - * @param target - * @param holders - * @return - */ - public static boolean recursionContains(BaseBean bean, BaseBean target, Enum... holders) { - if (holders.length == 0) { - return false; - } - - return recursionContainsImpl(bean, target, holders, 0); - } - - private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target, - Enum[] holders, int index) { - if (index >= holders.length) { - if (target == bean) { - return true; - } - index = 0; - } - - List relaBeans = list(bean, holders[index]); - for (BaseBean relaBean : relaBeans) { - if (recursionContainsImpl(relaBean, target, holders, index + 1)) { - return true; - } - } - - return false; - } } 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 2/5] =?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 3/5] =?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 4/5] =?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 From 6ba94fab3bd65f235f06e4156583de5fedb0bdaf Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 5 Jul 2021 16:03:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?WmsMoveSn=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E6=95=88=E5=A4=9A=E4=BD=99=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.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/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index b194f43..157e3ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -38,8 +38,8 @@ import javax.persistence.Version; @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), - @Index(columnList = "VENDOR_NO"), - @Index(columnList = "PACKAGE_NO"), + //@Index(columnList = "VENDOR_NO"), + //@Index(columnList = "PACKAGE_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单条码信息")