From 1e13a34883c9e6c977bfa2c54fecd3f1465464a7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 2 Jul 2021 11:28:38 +0800 Subject: [PATCH 01/16] =?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 02/16] =?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 03/16] =?UTF-8?q?=E5=8C=97=E4=BA=ACmgn=20ERP=20FG=20detail?= =?UTF-8?q?s=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 04/16] =?UTF-8?q?=E3=80=90jenkins=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=8A=A5=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 05/16] =?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 06/16] =?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("库存移动单条码信息") From f9eac5d6afc04a125dec6d6b3aa20fc208203a55 Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 5 Jul 2021 17:34:51 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0AccountExportModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java index 740c511..f5a4e92 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; @@ -39,12 +41,13 @@ public class AccountExportModel implements Serializable { @ApiModelProperty(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @ApiParam(value = "登录次数", example = "0") + @ApiModelProperty(value = "登录次数", example = "0") private Integer userLoginNum; - @ApiParam(value = "账号最后登录时间") + @ApiModelProperty(value = "账号最后登录时间") private String userLoginLastDateTime; - @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + @ApiModelProperty(value ="账号状态" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; } From f5dee63b21106556ba2c7003b2afd617fa4e6575 Mon Sep 17 00:00:00 2001 From: gsz Date: Tue, 6 Jul 2021 17:24:19 +0800 Subject: [PATCH 08/16] =?UTF-8?q?3579=2020063-=E7=B2=BE=E5=86=B2=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=9C=8B=E6=9D=BF-202107?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 26 ++++++++++ .../wms/dto/WmsFinePunchWarehouseWarningDto.java | 58 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 14 ++++++ 3 files changed, 98 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 0a500ac..c493171 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -67,6 +67,11 @@ public class WmsLocatePart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; + @Column(name = "WARN", columnDefinition = "decimal(18,8)") + @ApiParam(value = "预警值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double warn; + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @@ -127,6 +132,10 @@ public class WmsLocatePart extends BaseBean { return this.max ==null?0:this.max.doubleValue(); } + public double getWarnValue() { + return this.warn ==null?0:this.warn.doubleValue(); + } + public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } @@ -153,4 +162,21 @@ public class WmsLocatePart extends BaseBean { this.whNo = whNo; this.stockUnit = stockUnit; } + + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double warn, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.warn = warn; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java new file mode 100644 index 0000000..a4f7dfb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WmsFinePunchWarehouseWarningDto + * @Author :gsz + * @Date 2021/7/5 11:03 + * @Modify + **/ +@Data +@Api("中航WMS看板－精冲库存预警看板(出参)") +public class WmsFinePunchWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存地") + private String areaNo; + + @ApiParam(value = "库存数") + private Double qty; + + @ApiParam(value = "最大库存值") + private Double maxqty; + + @ApiParam(value = "预警值") + private Double warnValue; + + @ApiParam(value = "最小库存值") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "颜色") + private String color; + + public WmsFinePunchWarehouseWarningDto(String partNo, String partNameRdd, String areaNo, Double qty, Double maxqty, Double warnValue, Double minqty, String stockStatus, String color) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.areaNo = areaNo; + this.qty = qty; + this.maxqty = maxqty; + this.warnValue = warnValue; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.color = color; + } + + public WmsFinePunchWarehouseWarningDto() { + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index ba061d6..5e1a1cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -44,6 +44,9 @@ public class WmsStockSnDto { @ApiParam(value = "存储区") private String zoneNo; + @ApiParam(value = "库存地代码") + private String areaNo; + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { this.locateNo = locateNo; this.partNo = partNo; @@ -71,6 +74,17 @@ public class WmsStockSnDto { this.zoneNo = zoneNo; } + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo, String areaNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + this.areaNo = areaNo; + } + public WmsStockSnDto() { } } From c75973e6740f17ae8cd90bd70cc5882bbce65169 Mon Sep 17 00:00:00 2001 From: gsz Date: Tue, 6 Jul 2021 17:32:14 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=8D=97=E9=9D=9E=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=20=20=E9=9B=B6=E4=BB=B6=E5=8F=B7*yyMMddsequenceNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java | 74 ++++++++++++++++++++++ .../repository/WmsECartOrderNoBuildRepository.java | 13 ++++ 2 files changed, 87 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java new file mode 100644 index 0000000..acddd7b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : WmsECartOrderNoBuild + * @Author :gsz + * @Date 2021/7/5 19:06 + * @Modify + **/ +@Data +@Entity +@Table(name="WMS_ECARD_ORDERNO_BUILD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api(value="南非看板订单号",description = "南非看板订单号") +public class WmsECartOrderNoBuild extends BaseBean { + + private static final long serialVersionUID = 7332606009041273554L; + @Column(name = "PART_NO") + @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "CREATE_DATE") + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String creatDate; + + @Column(name = "SERIAL_NO") + @ApiParam(value = "序列号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer serialNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目标库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Integer destLocateNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam(value = "源存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Integer srcZoneNo; + + public Integer getUnitPrecisionValue(){ + return this.serialNo == null?0:this.serialNo.intValue(); + } + + public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo) { + this.partNo = partNo; + this.creatDate = creatDate; + this.serialNo = serialNo; + } + + public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo, Integer destLocateNo, Integer srcZoneNo) { + this.partNo = partNo; + this.creatDate = creatDate; + this.serialNo = serialNo; + this.destLocateNo = destLocateNo; + this.srcZoneNo = srcZoneNo; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java new file mode 100644 index 0000000..57742ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; + +/** + * @Description : WmsECartOrderNoBuildRepository + * @Author :gsz + * @Date 2021/7/6 9:56 + * @Modify + **/ +public interface WmsECartOrderNoBuildRepository extends BaseRepository { +} From c3a018dc1f03685b614a4f3049e9093ca429d7ab Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 7 Jul 2021 19:44:41 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=B6=88=E8=80=97?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/mgn/bj/PartConsumeCountModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java new file mode 100644 index 0000000..8a27541 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 零件消耗数量模型 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/7/1 14:40 + * @Modify: + **/ +@Data +public class PartConsumeCountModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("消耗数量") + private Integer consumeQty; + + @ApiParam("需求数量") + private Integer demandQty; +} From e029090e0347a027c5c9eb77183377c4abcea6ea Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 7 Jul 2021 20:13:18 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=8D=97=E9=9D=9E=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=C2=A0=20=E9=9B=B6=E4=BB=B6=E5=8F=B7*yyMMddsequenceNo?= =?UTF-8?q?=20--20210707?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java index acddd7b..e7246eb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java @@ -37,7 +37,7 @@ public class WmsECartOrderNoBuild extends BaseBean { @Column(name = "CREATE_DATE") @ApiParam(value = "创建日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String creatDate; + private String createDate; @Column(name = "SERIAL_NO") @ApiParam(value = "序列号") @@ -47,26 +47,16 @@ public class WmsECartOrderNoBuild extends BaseBean { @Column(name = "DEST_LOCATE_NO") @ApiParam(value = "目标库位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private Integer destLocateNo; + private String destLocateNo; @Column(name = "SRC_ZONE_NO") @ApiParam(value = "源存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private Integer srcZoneNo; + private String srcZoneNo; - public Integer getUnitPrecisionValue(){ - return this.serialNo == null?0:this.serialNo.intValue(); - } - - public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo) { - this.partNo = partNo; - this.creatDate = creatDate; - this.serialNo = serialNo; - } - - public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo, Integer destLocateNo, Integer srcZoneNo) { + public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) { this.partNo = partNo; - this.creatDate = creatDate; + this.createDate = createDate; this.serialNo = serialNo; this.destLocateNo = destLocateNo; this.srcZoneNo = srcZoneNo; From 3136ba43b17e14d152350cc7966cbc6cb4f200d2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 8 Jul 2021 09:32:01 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 f17dccb..a65a085 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 @@ -517,6 +517,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("完成时间") public String complateDateTime; + @Transient + @ApiParam("供应商名称") + public String vendorName; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; + From c4057a64ade369f76735788c988cbdc1be44c8aa Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 8 Jul 2021 10:01:55 +0800 Subject: [PATCH 13/16] WmsECartOrderNoBuildRepository --- .../i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java index 57742ef..28f2be6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; * @Date 2021/7/6 9:56 * @Modify **/ -public interface WmsECartOrderNoBuildRepository extends BaseRepository { +public interface WmsECartOrderNoBuildRepository extends BaseRepository { } From d0d34f9a8f39566410345ec453387064ba35ffa3 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 8 Jul 2021 10:09:13 +0800 Subject: [PATCH 14/16] WmsECartOrderNoBuild --- .../i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java index 28f2be6..bc11275 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsECartOrderNoBuild; /** * @Description : WmsECartOrderNoBuildRepository @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; * @Date 2021/7/6 9:56 * @Modify **/ -public interface WmsECartOrderNoBuildRepository extends BaseRepository { +public interface WmsECartOrderNoBuildRepository extends BaseRepository { } From c8cdc482906608e596eac1f49f017b9c0c99d375 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 8 Jul 2021 10:31:36 +0800 Subject: [PATCH 15/16] WmsECartOrderNoBuild --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java index e7246eb..cd58ed5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +27,7 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api(value="南非看板订单号",description = "南非看板订单号") +@NoArgsConstructor public class WmsECartOrderNoBuild extends BaseBean { private static final long serialVersionUID = 7332606009041273554L; @@ -61,4 +63,5 @@ public class WmsECartOrderNoBuild extends BaseBean { this.destLocateNo = destLocateNo; this.srcZoneNo = srcZoneNo; } + } \ No newline at end of file From 370f4e9a020cb3bd96d4687a6a6e8d29fe9d5fb8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 8 Jul 2021 11:09:17 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=BC=BA=E8=BF=87=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java index 06a43c3..cf5140a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java @@ -70,4 +70,8 @@ public class MesProduceErrorRecord extends BaseBean { @ApiParam("异常内容") private String errorMessage; + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private Integer noticeSign = 10; + }