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 74e9354..2f70a65 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 @@ -1702,7 +1702,8 @@ public class WmsEnumUtil { STEP_SEQ("STEP_SEQ", "步骤调用序号"), MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), - CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"); + CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"), + INITIALIZE_SN("INITIALIZE_SN", "库存初始化"); private String code; private String description; @@ -3153,4 +3154,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库存初始化 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_INITIALIZE_STATUS { + CREATE(10, "创建"), + FINISH(20, "完成"); + + private int value; + private String description; + + STOCK_INITIALIZE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 9be97bc..e871a03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -65,4 +65,13 @@ public class SessionUser implements Serializable { this.languageCode = languageCode; this.userType = userTypeId; } + + /** + * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法 + * @return + */ + @Deprecated + public String getDeviceId() { + return deviceId; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java new file mode 100644 index 0000000..a26d449 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 : jimmy.zeng + * @CreateDate : 2019-08-01 11:44 + * @Modify: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_STOCK_INITIALIZE") +@Api("库存初始化信息") +public class WmsStockInitialize extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + @AnnoOutputColumn + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区代码") + @AnnoOutputColumn + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + @AnnoOutputColumn + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + @AnnoOutputColumn + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @AnnoOutputColumn + private String partNameRdd; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + @AnnoOutputColumn + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + @AnnoOutputColumn + private Double qty = 0d; + + @Column(name = "SNP") + @ApiParam(value = "标准包装", example = "1") + @AnnoOutputColumn + private Double snp; + + @Column(name = "STATUS") + @ApiParam(value = "状态", example = "0") + private Integer status; + + @ApiParam(value ="工厂代码") + @AnnoOutputColumn + private String currentOrganizeCode; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java new file mode 100644 index 0000000..d17aa9b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.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.WmsStockInitialize; + +/** + * @Description : 库存初始化信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-08-01 14:38 + * @Modify: + **/ +public interface WmsStockInitializeRepository 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 49b6da4..d2d47f2 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 @@ -2310,4 +2310,23 @@ public class WmsHqlPack { /******************************************作业记录日志HQLPACK结束************************************************/ + + /** + * 单位换算 分页查询 + * @return + */ + public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(wmsStockInitialize.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsStockInitialize, result); + + return result; + } }