diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java index cf38b1c5..328e973b 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java @@ -39,4 +39,8 @@ public class InStorehouseListing extends BaseEntity { private String locationNumber ;//varchar 10 货位号 private String mainSid ;//varchar 50 申请单的sid private String purchaseSid;//采购申请单的sid + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java index 46d079c1..0f8381c5 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java @@ -27,4 +27,8 @@ public class ProdStock extends BaseEntity { private String custerSid;// varchar 64 客户Sid（企业） private String storeHouseSid;// varchar 64 仓库Sid private String storeHouseName;// varchar 100 仓库名称 + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java index ac15ea32..c9b830fd 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java @@ -22,4 +22,8 @@ public class ProdStockDto extends BaseEntity { private String custerSid;// varchar 64 客户Sid（企业） private String storeHouseSid;// varchar 64 仓库Sid private String storeHouseName;// varchar 100 仓库名称 + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java index 97ad803b..a6ddf266 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java @@ -20,4 +20,8 @@ public class ProdStockQuery implements Query { private String custerSid;// varchar 64 客户Sid（企业） private String storeHouseSid;// varchar 64 仓库Sid private String storeHouseName;// varchar 100 仓库名称 + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java new file mode 100644 index 00000000..ab7b5bb0 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.brandinfo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfo.java
+ * Class: com.supervise.api.brandinfo.BrandInfo
+ * Description: 品牌信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌信息", description = "品牌信息") +@TableName("brand_info") +public class BrandInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("代码") + private String code; // 代码 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java new file mode 100644 index 00000000..d91b98fa --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.brandinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoVo.java
+ * Class: com.supervise.api.brandinfo.BrandInfoVo
+ * Description: 品牌信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌信息 视图数据详情", description = "品牌信息 视图数据详情") +public class BrandInfoDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("记录版本，锁") + private String lock_version; // 记录版本，锁 + @ApiModelProperty("创建者") + private String create_sid; // 创建者 + @ApiModelProperty("更新者") + private String modify_sid; // 更新者 + @ApiModelProperty("记录是否可用，1:可用，0:不可用") + private String is_enable; // 记录是否可用，1:可用，0:不可用 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录创建时间") + private Date create_timeStart; // 记录创建时间 + private Date create_timeEnd; // 记录创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录最后修改时间") + private Date modify_timeStart; // 记录最后修改时间 + private Date modify_timeEnd; // 记录最后修改时间 + @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除") + private String is_delete; // 记录是否被删除，0:未删除，1:已经删除 + @ApiModelProperty("代码") + private String code; // 代码 + @ApiModelProperty("名称") + private String name; // 名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java new file mode 100644 index 00000000..82ae6127 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.brandinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoDto.java
+ * Class: com.supervise.api.brandinfo.BrandInfoDto
+ * Description: 品牌信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌信息 数据传输对象", description = "品牌信息 数据传输对象") +public class BrandInfoDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("记录版本，锁") + private String lock_version; // 记录版本，锁 + @ApiModelProperty("创建者") + private String create_sid; // 创建者 + @ApiModelProperty("更新者") + private String modify_sid; // 更新者 + @ApiModelProperty("记录是否可用，1:可用，0:不可用") + private String is_enable; // 记录是否可用，1:可用，0:不可用 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录创建时间") + private Date create_timeStart; // 记录创建时间 + private Date create_timeEnd; // 记录创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录最后修改时间") + private Date modify_timeStart; // 记录最后修改时间 + private Date modify_timeEnd; // 记录最后修改时间 + @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除") + private String is_delete; // 记录是否被删除，0:未删除，1:已经删除 + @ApiModelProperty("代码") + private String code; // 代码 + @ApiModelProperty("名称") + private String name; // 名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java new file mode 100644 index 00000000..c137dcde --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.brandinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoQuery.java
+ * Class: com.supervise.api.brandinfo.BrandInfoQuery
+ * Description: 品牌信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌信息 查询条件", description = "品牌信息 查询条件") +public class BrandInfoQuery implements Query { + + @ApiModelProperty("记录版本，锁") + private String lock_version; // 记录版本，锁 + @ApiModelProperty("创建者") + private String create_sid; // 创建者 + @ApiModelProperty("更新者") + private String modify_sid; // 更新者 + @ApiModelProperty("记录是否可用，1:可用，0:不可用") + private String is_enable; // 记录是否可用，1:可用，0:不可用 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录创建时间") + private Date create_timeStart; // 记录创建时间 + private Date create_timeEnd; // 记录创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录最后修改时间") + private Date modify_timeStart; // 记录最后修改时间 + private Date modify_timeEnd; // 记录最后修改时间 + @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除") + private String is_delete; // 记录是否被删除，0:未删除，1:已经删除 + @ApiModelProperty("代码") + private String code; // 代码 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java new file mode 100644 index 00000000..37ecab4d --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.brandinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoVo.java
+ * Class: com.supervise.api.brandinfo.BrandInfoVo
+ * Description: 品牌信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌信息 视图数据对象", description = "品牌信息 视图数据对象") +public class BrandInfoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("记录版本，锁") + private String lock_version; // 记录版本，锁 + @ApiModelProperty("创建者") + private String create_sid; // 创建者 + @ApiModelProperty("更新者") + private String modify_sid; // 更新者 + @ApiModelProperty("记录是否可用，1:可用，0:不可用") + private String is_enable; // 记录是否可用，1:可用，0:不可用 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录创建时间") + private Date create_timeStart; // 记录创建时间 + private Date create_timeEnd; // 记录创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("记录最后修改时间") + private Date modify_timeStart; // 记录最后修改时间 + private Date modify_timeEnd; // 记录最后修改时间 + @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除") + private String is_delete; // 记录是否被删除，0:未删除，1:已经删除 + @ApiModelProperty("代码") + private String code; // 代码 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommon.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommon.java new file mode 100644 index 00000000..5d6822e7 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommon.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dictcommon; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommon.java
+ * Class: com.supervise.api.dictcommon.DictCommon
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项") +@TableName("dict_common") +public class DictCommon extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("类型code") + private String dictType; // 类型code + @ApiModelProperty("key值") + private String dictKey; // key值 + @ApiModelProperty("value值") + private String dictValue; // value值 + @ApiModelProperty("路径") + private String sidPath; // 路径 + @ApiModelProperty("父级sid") + private String parentSid; // 父级sid + @ApiModelProperty("分组名称") + private String groupName; // 分组名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java new file mode 100644 index 00000000..abc45429 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dictcommon; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情") +public class DictCommonDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("类型code") + private String dictType; // 类型code + @ApiModelProperty("key值") + private String dictKey; // key值 + @ApiModelProperty("value值") + private String dictValue; // value值 + @ApiModelProperty("路径") + private String sidPath; // 路径 + @ApiModelProperty("父级sid") + private String parentSid; // 父级sid + @ApiModelProperty("分组名称") + private String groupName; // 分组名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java new file mode 100644 index 00000000..c43e224c --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dictcommon; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonDto.java
+ * Class: com.supervise.api.dictcommon.DictCommonDto
+ * Description: 数据字典——数据项 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象") +public class DictCommonDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("类型code") + private String dictType; // 类型code + @ApiModelProperty("key值") + private String dictKey; // key值 + @ApiModelProperty("value值") + private String dictValue; // value值 + @ApiModelProperty("路径") + private String sidPath; // 路径 + @ApiModelProperty("父级sid") + private String parentSid; // 父级sid + @ApiModelProperty("分组名称") + private String groupName; // 分组名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java new file mode 100644 index 00000000..bb2148ec --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dictcommon; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonQuery.java
+ * Class: com.supervise.api.dictcommon.DictCommonQuery
+ * Description: 数据字典——数据项 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据项 查询条件", description = "数据字典——数据项 查询条件") +public class DictCommonQuery implements Query { + + @ApiModelProperty("类型code") + private String dictType; // 类型code + @ApiModelProperty("key值") + private String dictKey; // key值 + @ApiModelProperty("value值") + private String dictValue; // value值 + @ApiModelProperty("路径") + private String sidPath; // 路径 + @ApiModelProperty("父级sid") + private String parentSid; // 父级sid + @ApiModelProperty("分组名称") + private String groupName; // 分组名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java new file mode 100644 index 00000000..33c79913 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dictcommon; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据项 视图数据对象", description = "数据字典——数据项 视图数据对象") +public class DictCommonVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("类型code") + private String dictType; // 类型code + @ApiModelProperty("key值") + private String dictKey; // key值 + @ApiModelProperty("value值") + private String dictValue; // value值 + @ApiModelProperty("路径") + private String sidPath; // 路径 + @ApiModelProperty("父级sid") + private String parentSid; // 父级sid + @ApiModelProperty("分组名称") + private String groupName; // 分组名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictType.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictType.java new file mode 100644 index 00000000..1f91d856 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictType.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dicttype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictType.java
+ * Class: com.supervise.api.dicttype.DictType
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据类型", description = "数据字典——数据类型") +@TableName("dict_type") +public class DictType extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("类型代码") + private String dictTypeCode; // 类型代码 + @ApiModelProperty("类型名称") + private String dictTypeName; // 类型名称 + @ApiModelProperty("级别") + private String dictTypeLevel; // 级别 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java new file mode 100644 index 00000000..618239de --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dicttype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据类型 视图数据详情", description = "数据字典——数据类型 视图数据详情") +public class DictTypeDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("类型代码") + private String dictTypeCode; // 类型代码 + @ApiModelProperty("类型名称") + private String dictTypeName; // 类型名称 + @ApiModelProperty("级别") + private String dictTypeLevel; // 级别 + @ApiModelProperty("名称") + private String name; // 名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java new file mode 100644 index 00000000..baefbf6b --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dicttype; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeDto.java
+ * Class: com.supervise.api.dicttype.DictTypeDto
+ * Description: 数据字典——数据类型 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象") +public class DictTypeDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("类型代码") + private String dictTypeCode; // 类型代码 + @ApiModelProperty("类型名称") + private String dictTypeName; // 类型名称 + @ApiModelProperty("级别") + private String dictTypeLevel; // 级别 + @ApiModelProperty("名称") + private String name; // 名称 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java new file mode 100644 index 00000000..ce7531e9 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dicttype; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeQuery.java
+ * Class: com.supervise.api.dicttype.DictTypeQuery
+ * Description: 数据字典——数据类型 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件") +public class DictTypeQuery implements Query { + + @ApiModelProperty("类型代码") + private String dictTypeCode; // 类型代码 + @ApiModelProperty("类型名称") + private String dictTypeName; // 类型名称 + @ApiModelProperty("级别") + private String dictTypeLevel; // 级别 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java new file mode 100644 index 00000000..158339f5 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.dicttype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象") +public class DictTypeVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("类型代码") + private String dictTypeCode; // 类型代码 + @ApiModelProperty("类型名称") + private String dictTypeName; // 类型名称 + @ApiModelProperty("级别") + private String dictTypeLevel; // 级别 + @ApiModelProperty("名称") + private String name; // 名称 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java index 2fd693f4..5ffabd5c 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java @@ -93,5 +93,8 @@ public class PurchasenewProduct extends BaseEntity { private String mainSid; // 申请单的sid @ApiModelProperty("质物id") private String proId; // 质物id - + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java index 336a7ff3..419893cb 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java @@ -91,5 +91,8 @@ public class PurchasenewProductDetailsVo implements Vo { private String mainSid; // 申请单的sid @ApiModelProperty("质物id") private String proId; // 质物id - + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java index e3cbe984..bd82dee6 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java @@ -91,5 +91,8 @@ public class PurchasenewProductDto implements Dto { private String mainSid; // 申请单的sid @ApiModelProperty("质物id") private String proId; // 质物id - + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java index e062d085..606b0db6 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java @@ -91,5 +91,8 @@ public class PurchasenewProductVo implements Vo { private String mainSid; // 申请单的sid @ApiModelProperty("质物id") private String proId; // 质物id - + private String brandInfoName;//品牌名称 + private String brandInfoKey;//品牌名称 + private String productTypeName;//分类名称 + private String productTypeKey;//分类key } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/brandinfo/BrandInfoRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/brandinfo/BrandInfoRest.java new file mode 100644 index 00000000..93779144 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/brandinfo/BrandInfoRest.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.controller.brandinfo; + +import com.wh.pojo.brandinfo.BrandInfoDetailsVo; +import com.wh.pojo.brandinfo.BrandInfoDto; +import com.wh.pojo.brandinfo.BrandInfoQuery; +import com.wh.pojo.brandinfo.BrandInfoVo; +import com.wh.service.brandinfo.BrandInfoService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoFeignFallback.java
+ * Class: com.supervise.biz.brandinfo.BrandInfoRest
+ * Description: 品牌信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "品牌信息") +@RestController("com.supervise.biz.brandinfo.BrandInfoRest") +@RequestMapping("v1/brandinfo") +public class BrandInfoRest { + + @Autowired + private BrandInfoService brandInfoService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = brandInfoService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BrandInfoDto dto){ + ResultBean rb = ResultBean.fireFail(); + brandInfoService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + brandInfoService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BrandInfoDetailsVo vo = brandInfoService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dictcommon/DictCommonRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dictcommon/DictCommonRest.java new file mode 100644 index 00000000..87692da9 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dictcommon/DictCommonRest.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.controller.dictcommon; + + +import com.wh.pojo.dictcommon.*; +import com.wh.service.dictcommon.DictCommonService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonFeignFallback.java
+ * Class: com.supervise.biz.dictcommon.DictCommonRest
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "数据字典——数据项") +@RestController("com.wh.controller.dictcommon.DictCommonRest") +@RequestMapping("v1/dictcommon") +public class DictCommonRest { + + @Autowired + private DictCommonService dictCommonService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dictCommonService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody DictCommonDto dto){ + ResultBean rb = ResultBean.fireFail(); + dictCommonService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + dictCommonService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + DictCommonDetailsVo vo = dictCommonService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dicttype/DictTypeRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dicttype/DictTypeRest.java new file mode 100644 index 00000000..ec745a99 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/dicttype/DictTypeRest.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.controller.dicttype; + +import com.wh.pojo.dicttype.DictTypeDetailsVo; +import com.wh.pojo.dicttype.DictTypeDto; +import com.wh.pojo.dicttype.DictTypeQuery; +import com.wh.pojo.dicttype.DictTypeVo; +import com.wh.service.dicttype.DictTypeService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeFeignFallback.java
+ * Class: com.supervise.biz.dicttype.DictTypeRest
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "数据字典——数据类型") +@RestController("com.wh.controller.dicttype.DictTypeRest") +@RequestMapping("v1/dicttype") +public class DictTypeRest { + + @Autowired + private DictTypeService dictTypeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dictTypeService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody DictTypeDto dto){ + ResultBean rb = ResultBean.fireFail(); + dictTypeService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + dictTypeService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + DictTypeDetailsVo vo = dictTypeService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/brandinfo/BrandInfoMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/brandinfo/BrandInfoMapper.java new file mode 100644 index 00000000..b81b3699 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/brandinfo/BrandInfoMapper.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.mapper.brandinfo; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.brandinfo.BrandInfo; +import com.wh.pojo.brandinfo.BrandInfoVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoMapper.java
+ * Class: com.supervise.biz.brandinfo.BrandInfoMapper
+ * Description: 品牌信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BrandInfoMapper extends BaseMapper { + + //@Update("update brand_info set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from brand_info") + List selectListVo(); + @Select("select * from brand_info where code=#{code}") + BrandInfoVo selectByCode(String code); + @Select("select name,code from restricted_brand where code=#{code} group by name") + BrandInfo fetchByCodeForLimit(String brandSid); +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dictcommon/DictCommonMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dictcommon/DictCommonMapper.java new file mode 100644 index 00000000..6bf25ee0 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dictcommon/DictCommonMapper.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.mapper.dictcommon; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.dictcommon.DictCommon; +import com.wh.pojo.dictcommon.DictCommonDetailsVo; +import com.wh.pojo.dictcommon.DictCommonVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonMapper.java
+ * Class: com.supervise.biz.dictcommon.DictCommonMapper
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface DictCommonMapper extends BaseMapper { + + //@Update("update dict_common set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from dict_common") + List selectListVo(); + @Select("select * from dict_common where dictkey=#{key}") + DictCommonDetailsVo fetchByKey(@Param("key")String key); + @Select("select * from dict_common where dictkey=#{key} and dictType=#{type}") + DictCommonDetailsVo fetchByKeyAndType(@Param("key")String key, @Param("type")String type); + @Select("select * from restricted_category where dictkey=#{key} and dictType=#{type}") + DictCommonDetailsVo fetchByKeyAndTypeForLimit(@Param("type")String category, @Param("key")String categoryKey); +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dicttype/DictTypeMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dicttype/DictTypeMapper.java new file mode 100644 index 00000000..11070e76 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/dicttype/DictTypeMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.mapper.dicttype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.dicttype.DictType; +import com.wh.pojo.dicttype.DictTypeVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeMapper.java
+ * Class: com.supervise.biz.dicttype.DictTypeMapper
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface DictTypeMapper extends BaseMapper { + + //@Update("update dict_type set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from dict_type") + List selectListVo(); +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java index fa883c76..1b260914 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java @@ -178,6 +178,10 @@ public class InStorehouseMainService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.service.brandinfo; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wh.mapper.brandinfo.BrandInfoMapper; +import com.wh.pojo.brandinfo.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoService.java
+ * Class: com.supervise.biz.brandinfo.BrandInfoService
+ * Description: 品牌信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Service +public class BrandInfoService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BrandInfoQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BrandInfoQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BrandInfoDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BrandInfoDto dto){ + BrandInfo entity = new BrandInfo(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BrandInfoDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BrandInfo entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BrandInfoDetailsVo fetchDetailsVoBySid(String sid){ + BrandInfo entity = fetchBySid(sid); + BrandInfoDetailsVo vo = new BrandInfoDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public BrandInfoVo selectByCode(String key) { + BrandInfoVo vo = baseMapper.selectByCode(key); + return vo; + } + + public BrandInfo fetchByCodeForLimit(String brandSid) { + BrandInfo vo = baseMapper.fetchByCodeForLimit(brandSid); + return vo; + } +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dictcommon/DictCommonService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dictcommon/DictCommonService.java new file mode 100644 index 00000000..6d0ac0af --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dictcommon/DictCommonService.java @@ -0,0 +1,117 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.service.dictcommon; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wh.mapper.dictcommon.DictCommonMapper; +import com.wh.pojo.dictcommon.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonService.java
+ * Class: com.supervise.biz.dictcommon.DictCommonService
+ * Description: 数据字典——数据项 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Service +public class DictCommonService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(DictCommonQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + DictCommonQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(DictCommonDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(DictCommonDto dto){ + DictCommon entity = new DictCommon(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(DictCommonDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + DictCommon entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public DictCommonDetailsVo fetchDetailsVoBySid(String sid){ + DictCommon entity = fetchBySid(sid); + DictCommonDetailsVo vo = new DictCommonDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public DictCommonDetailsVo fetchByKey(String value) { + DictCommonDetailsVo vo = baseMapper.fetchByKey(value); + return vo; + } + + public DictCommonDetailsVo fetchByKeyAndType(String value, String type) { + DictCommonDetailsVo vo = baseMapper.fetchByKeyAndType(value,type); + return vo; + } + + public DictCommonDetailsVo fetchByKeyAndTypeForLimit(String category, String categoryKey) { + DictCommonDetailsVo vo = baseMapper.fetchByKeyAndTypeForLimit(category,categoryKey); + return vo; + } +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dicttype/DictTypeService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dicttype/DictTypeService.java new file mode 100644 index 00000000..4e2e6a65 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/dicttype/DictTypeService.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.service.dicttype; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wh.mapper.dicttype.DictTypeMapper; +import com.wh.pojo.dicttype.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +/** + * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeService.java
+ * Class: com.supervise.biz.dicttype.DictTypeService
+ * Description: 数据字典——数据类型 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ * + * @author dongjianzhao + * @version 1.0 + * @since 1.0 + */ +@Service +public class DictTypeService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(DictTypeQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + DictTypeQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(DictTypeDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(DictTypeDto dto){ + DictType entity = new DictType(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(DictTypeDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + DictType entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public DictTypeDetailsVo fetchDetailsVoBySid(String sid){ + DictType entity = fetchBySid(sid); + DictTypeDetailsVo vo = new DictTypeDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/BrandInfoMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/BrandInfoMapper.xml new file mode 100644 index 00000000..a49f7ae2 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/BrandInfoMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/DictCommonMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/DictCommonMapper.xml new file mode 100644 index 00000000..93305695 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/DictCommonMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/DictTypeMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/DictTypeMapper.xml new file mode 100644 index 00000000..91389617 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/DictTypeMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file