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; } 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/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/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("库存移动单条码信息") 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() { } } 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 { +}