## 全网产品添加删除操作;全网产品明细添加操作时间查询显示;
This commit is contained in:
parent
42e3866fcc
commit
7aaef9f1da
|
@ -126,6 +126,18 @@ public class AllProductController extends BaseController {
|
|||
return AjaxResult.success(iAllProductService.updateById(param));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param pkId
|
||||
* @return
|
||||
*/
|
||||
@DeleteMapping("/{pkId}")
|
||||
public AjaxResult delete(@PathVariable Integer pkId) {
|
||||
iAllProductService.deleteProduct(pkId, SecurityUtils.getUserId());
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改库存数量
|
||||
*
|
||||
|
|
|
@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.hzs.common.core.enums.EProductSource;
|
||||
import com.hzs.common.core.utils.DateUtils;
|
||||
import com.hzs.common.core.utils.StringUtils;
|
||||
import com.hzs.common.core.utils.poi.ExcelUtil;
|
||||
import com.hzs.common.core.web.controller.BaseController;
|
||||
|
@ -49,6 +50,12 @@ public class AllProductDetailController extends BaseController {
|
|||
if (StringUtils.isNotEmpty(param.getOrderCode())) {
|
||||
queryWrapper.like(AllProductDetail::getOrderCode, param.getOrderCode());
|
||||
}
|
||||
if (StringUtils.isNotEmpty(param.getStartDate())) {
|
||||
queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YAMMER)));
|
||||
}
|
||||
if (StringUtils.isNotEmpty(param.getEndDate())) {
|
||||
queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YAMMER)));
|
||||
}
|
||||
queryWrapper.orderByDesc(AllProductDetail::getCreationTime);
|
||||
List<AllProductDetail> productList = iAllProductDetailService.list(queryWrapper);
|
||||
|
||||
|
@ -82,6 +89,12 @@ public class AllProductDetailController extends BaseController {
|
|||
if (StringUtils.isNotEmpty(param.getOrderCode())) {
|
||||
queryWrapper.like(AllProductDetail::getOrderCode, param.getOrderCode());
|
||||
}
|
||||
if (StringUtils.isNotEmpty(param.getStartDate())) {
|
||||
queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YAMMER)));
|
||||
}
|
||||
if (StringUtils.isNotEmpty(param.getEndDate())) {
|
||||
queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YAMMER)));
|
||||
}
|
||||
queryWrapper.orderByDesc(AllProductDetail::getCreationTime);
|
||||
List<AllProductDetail> productList = iAllProductDetailService.list(queryWrapper);
|
||||
|
||||
|
|
|
@ -27,5 +27,13 @@ public class AllProductQueryParam {
|
|||
* 来源订单号
|
||||
*/
|
||||
private String orderCode;
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private String startDate;
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private String endDate;
|
||||
|
||||
}
|
||||
|
|
|
@ -15,4 +15,10 @@ public interface IAllProductService extends IService<AllProduct> {
|
|||
*/
|
||||
void changeInventory(AllProduct param);
|
||||
|
||||
/**
|
||||
* 删除产品
|
||||
* @param pkId
|
||||
*/
|
||||
void deleteProduct(Integer pkId, Long userId);
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
package com.hzs.sale.all.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.hzs.common.core.enums.EDelFlag;
|
||||
import com.hzs.common.core.enums.EProductSource;
|
||||
import com.hzs.common.domain.sale.all.AllProduct;
|
||||
import com.hzs.common.domain.sale.all.AllProductDetail;
|
||||
|
@ -11,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 全系统产品 服务实现类
|
||||
*/
|
||||
|
@ -34,4 +38,22 @@ public class AllProductServiceImpl extends ServiceImpl<AllProductMapper, AllProd
|
|||
productDetail.setPkCreator(param.getPkModified());
|
||||
iAllProductDetailService.save(productDetail);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteProduct(Integer pkId, Long userId) {
|
||||
this.update(Wrappers.<AllProduct>lambdaUpdate()
|
||||
.eq(AllProduct::getPkId, pkId)
|
||||
.set(AllProduct::getDelFlag, EDelFlag.DELETE.getValue())
|
||||
.set(AllProduct::getPkModified, userId)
|
||||
.set(AllProduct::getModifiedTime, new Date())
|
||||
);
|
||||
|
||||
iAllProductDetailService.update(Wrappers.<AllProductDetail>lambdaUpdate()
|
||||
.eq(AllProductDetail::getPkAllProduct, pkId)
|
||||
.set(AllProductDetail::getDelFlag, EDelFlag.DELETE.getValue())
|
||||
.set(AllProductDetail::getPkModified, userId)
|
||||
.set(AllProductDetail::getModifiedTime, new Date())
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
package com.hzs.sale.all.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.hzs.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class AllProductDetailQueryVO implements Serializable {
|
||||
|
@ -33,4 +35,11 @@ public class AllProductDetailQueryVO implements Serializable {
|
|||
@Excel(name = "变动说明")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue