Browse Source

客户中心商品档案部分代码

master
dimengzhe 2 years ago
parent
commit
23e52f0905
  1. 91
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java
  2. 91
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java
  3. 2
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java
  4. 119
      yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationQuery.java
  5. 8
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java
  6. 50
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java

91
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java

@ -53,31 +53,10 @@ public class ProductInformationDetailsVo implements Vo {
private static final long serialVersionUID = -7305436694722608899L;
private String sid;
@ApiModelProperty("记录版本,锁")
private String lock_version;
@ApiModelProperty("创建者")
private String create_sid;
@ApiModelProperty("更新者")
private String modify_sid;
@ApiModelProperty("记录是否可用,1:可用,0:不可用")
private String is_enable;
@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;
@ApiModelProperty("代码")
private String code;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("含量")
private String content;
@ApiModelProperty("类别")
private String category;
@ApiModelProperty("类别key")
@ -92,84 +71,14 @@ public class ProductInformationDetailsVo implements Vo {
private String brand;
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("产地")
private String placeOfOrigin;
@ApiModelProperty("等级")
private String grade;
@ApiModelProperty("等级key")
private String gradeKey;
@ApiModelProperty("保质期")
private String qualityGuaranteePeriod;
@ApiModelProperty("部门")
private String deptartment;
@ApiModelProperty("货架")
private String goodsShelves;
@ApiModelProperty("货架code")
private String goodsShelvesCode;
@ApiModelProperty("第二代码")
private String secondCode;
@ApiModelProperty("毛利率")
private String grossProfitMargin;
@ApiModelProperty("采购员")
private String buyer;
@ApiModelProperty("核算售价")
private String accountingSalesPrice;
@ApiModelProperty("最新进价")
private String latestPurchasePrice;
@ApiModelProperty("库存价")
private String inventoryPrice;
@ApiModelProperty("合同进价")
private String contractPurchasePrice;
@ApiModelProperty("会员价")
private String membershipPrice;
@ApiModelProperty("进项税率")
private String inputTaxRate;
@ApiModelProperty("销项税率")
private String outputTaxRate;
@ApiModelProperty("仓位")
private String position;
@ApiModelProperty("仓位code")
private String positionCode;
@ApiModelProperty("结算供应商")
private String supplier;
@ApiModelProperty("结算供应商Sid")
private String supplierSid;
@ApiModelProperty("配货方式")
private String distributionMethod;
@ApiModelProperty("配货方式Key")
private String distributionMethodKey;
@ApiModelProperty("来源单位")
private String sourceUnit;
@ApiModelProperty("管理到效期")
private String managementExpirationDate;
@ApiModelProperty("配货价")
private String rationingPrice;
@ApiModelProperty("最低售价")
private String lowestSellingPrice;
@ApiModelProperty("缺省进价")
private String defaultPurchasePrice;
@ApiModelProperty("批发价")
private String tradePrice;
@ApiModelProperty("规格说明")
private String specifications;
@ApiModelProperty("规格长宽高")
private String description;
@ApiModelProperty("规格重量")
private String weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("最后调价时间")
private Date priceAdjustmentTimeStart;
private Date priceAdjustmentTimeEnd;
@ApiModelProperty("对方系统代码")
private String systemCode;
@ApiModelProperty("去税最新进价")
private String priceWithoutTax;
@ApiModelProperty("去税库存价")
private String taxableInventoryPrice;
@ApiModelProperty("去税合同进价")
private String ContractPriceExcludingTax;
@ApiModelProperty("商品状态")
private String productStatus;
@ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
private String newestPurchasePrice;
}

91
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java

@ -53,31 +53,10 @@ public class ProductInformationDto implements Dto {
private static final long serialVersionUID = 2628182250934148420L;
private String sid;
@ApiModelProperty("记录版本,锁")
private String lock_version;
@ApiModelProperty("创建者")
private String create_sid;
@ApiModelProperty("更新者")
private String modify_sid;
@ApiModelProperty("记录是否可用,1:可用,0:不可用")
private String is_enable;
@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;
@ApiModelProperty("代码")
private String code;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("含量")
private String content;
@ApiModelProperty("类别")
private String category;
@ApiModelProperty("类别key")
@ -92,84 +71,14 @@ public class ProductInformationDto implements Dto {
private String brand;
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("产地")
private String placeOfOrigin;
@ApiModelProperty("等级")
private String grade;
@ApiModelProperty("等级key")
private String gradeKey;
@ApiModelProperty("保质期")
private String qualityGuaranteePeriod;
@ApiModelProperty("部门")
private String deptartment;
@ApiModelProperty("货架")
private String goodsShelves;
@ApiModelProperty("货架code")
private String goodsShelvesCode;
@ApiModelProperty("第二代码")
private String secondCode;
@ApiModelProperty("毛利率")
private String grossProfitMargin;
@ApiModelProperty("采购员")
private String buyer;
@ApiModelProperty("核算售价")
private String accountingSalesPrice;
@ApiModelProperty("最新进价")
private String latestPurchasePrice;
@ApiModelProperty("库存价")
private String inventoryPrice;
@ApiModelProperty("合同进价")
private String contractPurchasePrice;
@ApiModelProperty("会员价")
private String membershipPrice;
@ApiModelProperty("进项税率")
private String inputTaxRate;
@ApiModelProperty("销项税率")
private String outputTaxRate;
@ApiModelProperty("仓位")
private String position;
@ApiModelProperty("仓位code")
private String positionCode;
@ApiModelProperty("结算供应商")
private String supplier;
@ApiModelProperty("结算供应商Sid")
private String supplierSid;
@ApiModelProperty("配货方式")
private String distributionMethod;
@ApiModelProperty("配货方式Key")
private String distributionMethodKey;
@ApiModelProperty("来源单位")
private String sourceUnit;
@ApiModelProperty("管理到效期")
private String managementExpirationDate;
@ApiModelProperty("配货价")
private String rationingPrice;
@ApiModelProperty("最低售价")
private String lowestSellingPrice;
@ApiModelProperty("缺省进价")
private String defaultPurchasePrice;
@ApiModelProperty("批发价")
private String tradePrice;
@ApiModelProperty("规格说明")
private String specifications;
@ApiModelProperty("规格长宽高")
private String description;
@ApiModelProperty("规格重量")
private String weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("最后调价时间")
private Date priceAdjustmentTimeStart;
private Date priceAdjustmentTimeEnd;
@ApiModelProperty("对方系统代码")
private String systemCode;
@ApiModelProperty("去税最新进价")
private String priceWithoutTax;
@ApiModelProperty("去税库存价")
private String taxableInventoryPrice;
@ApiModelProperty("去税合同进价")
private String ContractPriceExcludingTax;
@ApiModelProperty("商品状态")
private String productStatus;
@ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
private String newestPurchasePrice;
}

2
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java

@ -65,7 +65,7 @@ public interface ProductInformationFeign {
public ResultBean save(@RequestBody ProductInformationDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@PostMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);

119
yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationQuery.java

@ -52,122 +52,9 @@ import java.util.Date;
public class ProductInformationQuery implements Query {
private static final long serialVersionUID = -2156227778094595808L;
@ApiModelProperty("记录版本,锁")
private String lock_version;
@ApiModelProperty("创建者")
private String create_sid;
@ApiModelProperty("更新者")
private String modify_sid;
@ApiModelProperty("记录是否可用,1:可用,0:不可用")
private String is_enable;
@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;
@ApiModelProperty("代码")
private String code;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("含量")
private String content;
@ApiModelProperty("类别")
private String category;
@ApiModelProperty("类别key")
private String categoryKey;
@ApiModelProperty("规格单位")
private String unit;
@ApiModelProperty("制造厂")
private String manufacturer;
@ApiModelProperty("制造厂sid")
private String manufacturerSid;
@ApiModelProperty("品牌")
private String brand;
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("产地")
private String placeOfOrigin;
@ApiModelProperty("等级")
private String grade;
@ApiModelProperty("等级key")
private String gradeKey;
@ApiModelProperty("保质期")
private String qualityGuaranteePeriod;
@ApiModelProperty("部门")
private String deptartment;
@ApiModelProperty("货架")
private String goodsShelves;
@ApiModelProperty("货架code")
private String goodsShelvesCode;
@ApiModelProperty("第二代码")
private String secondCode;
@ApiModelProperty("毛利率")
private String grossProfitMargin;
@ApiModelProperty("采购员")
private String buyer;
@ApiModelProperty("核算售价")
private String accountingSalesPrice;
@ApiModelProperty("最新进价")
private String latestPurchasePrice;
@ApiModelProperty("库存价")
private String inventoryPrice;
@ApiModelProperty("合同进价")
private String contractPurchasePrice;
@ApiModelProperty("会员价")
private String membershipPrice;
@ApiModelProperty("进项税率")
private String inputTaxRate;
@ApiModelProperty("销项税率")
private String outputTaxRate;
@ApiModelProperty("仓位")
private String position;
@ApiModelProperty("仓位code")
private String positionCode;
@ApiModelProperty("结算供应商")
private String supplier;
@ApiModelProperty("结算供应商Sid")
private String supplierSid;
@ApiModelProperty("配货方式")
private String distributionMethod;
@ApiModelProperty("配货方式Key")
private String distributionMethodKey;
@ApiModelProperty("来源单位")
private String sourceUnit;
@ApiModelProperty("管理到效期")
private String managementExpirationDate;
@ApiModelProperty("配货价")
private String rationingPrice;
@ApiModelProperty("最低售价")
private String lowestSellingPrice;
@ApiModelProperty("缺省进价")
private String defaultPurchasePrice;
@ApiModelProperty("批发价")
private String tradePrice;
@ApiModelProperty("规格说明")
private String specifications;
@ApiModelProperty("规格长宽高")
private String description;
@ApiModelProperty("规格重量")
private String weight;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("最后调价时间")
private Date priceAdjustmentTimeStart;
private Date priceAdjustmentTimeEnd;
@ApiModelProperty("对方系统代码")
private String systemCode;
@ApiModelProperty("去税最新进价")
private String priceWithoutTax;
@ApiModelProperty("去税库存价")
private String taxableInventoryPrice;
@ApiModelProperty("去税合同进价")
private String ContractPriceExcludingTax;
@ApiModelProperty("商品状态")
private String productStatus;
@ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
private String newestPurchasePrice;
}

8
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java

@ -75,9 +75,7 @@ public class ProductInformationRest implements ProductInformationFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ProductInformationDto dto) {
ResultBean rb = ResultBean.fireFail();
productInformationService.saveOrUpdateDto(dto);
return rb.success();
return productInformationService.saveOrUpdateDto(dto);
}
@Override
@ -94,6 +92,10 @@ public class ProductInformationRest implements ProductInformationFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ProductInformationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ProductInformation productInformation = productInformationService.fetchBySid(sid);
if(productInformation == null){
return rb.setMsg("该商品档案不存在");
}
ProductInformationDetailsVo vo = productInformationService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}

50
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.productinformation.*;
import com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfo;
@ -83,45 +84,38 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
@Resource
private ProductInformationService productInformationService;
private QueryWrapper<ProductInformation> createQueryWrapper(ProductInformationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ProductInformation> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ProductInformationVo> listPageVo(PagerQuery<ProductInformationQuery> pq) {
ProductInformationQuery query = pq.getParams();
QueryWrapper<ProductInformation> qw = createQueryWrapper(query);
QueryWrapper<ProductInformation> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getName())) {
qw.like("name", query.getName());
}
}
IPage<ProductInformation> page = PagerUtil.queryToPage(pq);
IPage<ProductInformationVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ProductInformationVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ProductInformationDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
public ResultBean saveOrUpdateDto(ProductInformationDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
ProductInformation productInformation = new ProductInformation();
BeanUtil.copyProperties(dto, productInformation, "sid");
baseMapper.insert(productInformation);
} else {
ProductInformation productInformation = fetchBySid(sid);
if (productInformation == null) {
return rb.setMsg("该商品档案不存在");
}
BeanUtil.copyProperties(dto, productInformation, "sid");
baseMapper.updateById(productInformation);
}
this.updateByDto(dto);
}
return rb.success();
public void insertByDto(ProductInformationDto dto) {
ProductInformation entity = new ProductInformation();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(ProductInformationDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ProductInformation entity = baseMapper.fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ProductInformationDetailsVo fetchDetailsVoBySid(String sid) {

Loading…
Cancel
Save