diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index f664549..2cf1636 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2698,5 +2698,105 @@ public class BlockFormEnumUtil { } } + /** + * 系统参数类型 + * 1.SYSTEM:系统参数 + * 2.BUSI:业务参数 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + + SYSTEM(10, "系统参数", "系统参数"), + BUSI(20, "业务参数", "业务参数"); + + private int value; + private String name; + private String description; + + CONFIG_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + /** + * 系统配置值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_VALUE_TYPE { + CHECKLIST(10, "可选列表"), + NUMBER(20, "数字"), + STRING(30, "字符串"); + + private int value; + private String description; + + CONFIG_VALUE_TYPE(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; + } + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BlockFormConfig.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BlockFormConfig.java new file mode 100644 index 0000000..df29dbd --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BlockFormConfig.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.form.bean; + +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.*; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/10/18 17:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "BLOCK_FORM_CONFIG") +@Api(value = "系统配置", description = "WMS系统配置") +public class BlockFormConfig extends BaseBean { + + @Column(name = "NAME") + @ApiParam(value = "名称") + private String name; + + @Column(name = "CONFIG_TYPE") + @ApiParam(value = "参数类型ID(枚举:1.系统配置...)", example = "-1") + private Integer configType; + + @Column(name = "CONFIG_CODE") + @ApiParam(value = "参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name = "CONFIG_GROUP") + @ApiParam(value = "参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name = "CONFIG_VALUE_TYPE") + @ApiParam(value = "参数值类型") + private String configValueType; + + /** + * SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型,而不要使用 text、ntext 和 image 数据类型。 + */ + @Lob + @Column(name = "CONFIG_VALUE", columnDefinition = "TEXT") + @ApiParam(value = "参数值") + private String configValue; + + @Column(name = "CONFIG_DESCRIPTION") + @ApiParam(value = "参数描述") + private String configDescription; + + +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BlockFormRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BlockFormRepository.java new file mode 100644 index 0000000..55f9c10 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BlockFormRepository.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BlockFormConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/10/18 17:20 + * @Modify: + **/ +@Repository +public interface BlockFormRepository extends BaseRepository { + + /** + * 按照工厂代码和配置代码查询配置信息 + * @param organizeCode 工厂代码 + * @param configCode 配置代码 + * @return 配置信息 + */ + BlockFormConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); + + /** + * 按照配置代码查询配置信息 + * @param configCode 配置代码 + * @return 配置信息 + */ + BlockFormConfig getFirstByConfigCode(String configCode); +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index e22a95e..3c67c4f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -477,4 +477,15 @@ public final class FormHqlPack { return packBean; } + + public static DdlPackBean packHqlConfig(BlockFormConfig blockFormConfig) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(blockFormConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(blockFormConfig.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(blockFormConfig.getConfigType(), "configType", result); + DdlPreparedPack.getStringEqualPack(blockFormConfig.getConfigValue(), "configValue", result); + DdlPreparedPack.getNumEqualPack(blockFormConfig.getConfigValueType(), "configValueType", result); + getStringBuilderPack(blockFormConfig, result); + return result; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/DetailSumDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/DetailSumDto.java new file mode 100644 index 0000000..bdf3545 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/DetailSumDto.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/4/13 21:48 + * @Modify: + **/ +@ApiModel(value = "集中对账单明细汇总Dto") +@Data +public class DetailSumDto { + @ApiModelProperty(value = "物料号") + private String partNo; + @ApiModelProperty(value = "库存地") + private String whArea; + @ApiModelProperty(value = "来源存储区") + private String srcStoreArea; + @ApiModelProperty(value = "目标存储区") + private String targetStoreArea; + @ApiModelProperty(value = "业务类型") + private String transType; + @ApiModelProperty(value = "单据状态") + private String orderStatus; + @ApiModelProperty(value = "需求数量") + private Double needNum; + @ApiModelProperty(value = "处理数量") + private Double dealNum; + @ApiModelProperty(value = "创建时间") + private String createTime; + @ApiModelProperty(value = "操作时间") + private String operationTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DetailSumModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DetailSumModel.java new file mode 100644 index 0000000..906b2fe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DetailSumModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/4/13 21:24 + * @Modify: + **/ +@Data +@ApiModel(value = "对账单明细汇总页面入参") +public class DetailSumModel { + @ApiModelProperty(value = "物料号") + public String partNo; + @ApiModelProperty(value = "仓库号") + public String whNo; + @ApiModelProperty(value = "库存地") + public String whArea; + @ApiModelProperty(value = "差异值") + public Double differenceCount; + @ApiModelProperty(value = "业务类型代码") + public String transTypeCode; + @ApiModelProperty(value = "单号") + public String oderNo; + @ApiModelProperty(value = "单据状态") + public String orderStatus; + @ApiModelProperty(value = "来源存储区") + public String srcStoreArea; + @ApiModelProperty(value = "目标存储区") + public String targetStoreArea; + @ApiModelProperty(value = "开始操作时间") + public String startOperationTime; + @ApiModelProperty(value = "结束操作时间") + public String endOperationTime; + @ApiModelProperty(value = "开始创建时间") + public String startCreateTime; + @ApiModelProperty(value = "结束创建时间") + public String endCreateTime; +}