Browse Source

1.查询包条码,查看明细

dev-warehouse
0.0 2 years ago
parent
commit
a9f2334ea9
  1. 22
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java
  2. 13
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
  3. 62
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackagereceiptVO.java
  4. 50
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
  5. 33
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java
  6. 33
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java
  7. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.java
  8. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml
  9. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java
  10. 69
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
  11. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  12. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPackagereceiptService.java
  13. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSigndetailService.java
  14. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackagereceiptServiceImpl.java
  15. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java

22
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@ -17,9 +17,12 @@
package com.logpm.distribution.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigInteger;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@ -65,12 +68,12 @@ public class DistributionSigndetailEntity extends TenantEntity {
* 签收表id
*/
@ApiModelProperty(value = "签收表id")
private Integer masterId;
/**
* 服务号
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
private Long masterId;
// /**
// * 服务号
// */
// @ApiModelProperty(value = "服务号")
// private String serviceNumber;
/**
* 配送/自提单号
*/
@ -110,11 +113,13 @@ public class DistributionSigndetailEntity extends TenantEntity {
* 入库时间
*/
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date warehousingTime;
/**
* 备货时间
*/
@ApiModelProperty(value = "备货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date leadTime;
/**
* 在库时长;()
@ -126,6 +131,11 @@ public class DistributionSigndetailEntity extends TenantEntity {
*/
@ApiModelProperty(value = "签收件数")
private Integer signedNumber;
/**
* 订单总数
*/
@ApiModelProperty(value = "订单总数")
private Integer ordersNumber;
/**
* 是否齐套
*/

13
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@ -17,6 +17,7 @@
package com.logpm.distribution.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -76,6 +77,11 @@ public class DistributionSignforEntity extends TenantEntity {
*/
@ApiModelProperty(value = "收货人")
private String consignee;
/**
* 收货人手机
*/
@ApiModelProperty(value = "收货人手机")
private String consigneePhone;
/**
* 收货地址
*/
@ -130,7 +136,14 @@ public class DistributionSignforEntity extends TenantEntity {
* 签收时间
*/
@ApiModelProperty(value = "签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date signingTime;
/**
* 司机签收时间
*/
@ApiModelProperty(value = "司机签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date sjsigningTime;
/**
* 签收人
*/

62
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackagereceiptVO.java

@ -17,6 +17,7 @@
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -32,4 +33,65 @@ import lombok.EqualsAndHashCode;
public class DistributionPackagereceiptVO extends DistributionPackagereceiptEntity {
private static final long serialVersionUID = 1L;
/**
* 仓库
*/
@ApiModelProperty(value = "仓库")
private String warehouse;
/**
* 状态
*/
@ApiModelProperty(value = "状态")
private Integer conditions;
/**
* 包条码
*/
@ApiModelProperty(value = "包条码")
private String packetBarCode;
/**
* 货位信息
*/
@ApiModelProperty(value = "货位信息")
private String goodsAllocation;
/**
* 所在托盘
*/
@ApiModelProperty(value = "所在托盘")
private String pallet;
/**
* 一级品
*/
@ApiModelProperty(value = "一级品")
private String firsts;
/**
* 二级品
*/
@ApiModelProperty(value = "二级品")
private String second;
/**
* 三级品
*/
@ApiModelProperty(value = "三级品")
private String thirdProduct;
/**
* 物料
*/
@ApiModelProperty(value = "物料")
private String material;
/**
* 数量
*/
@ApiModelProperty(value = "数量")
private Integer quantity;
/**
* 车次号
*/
@ApiModelProperty(value = "车次号")
private String trainNumber;
/**
* 在库订单ID
*/
@ApiModelProperty(value = "在库订单ID")
private String stockArticleId;
}

50
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@ -16,11 +16,17 @@
*/
package com.logpm.distribution.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* 签收明细 视图实体类
*
@ -31,5 +37,49 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class DistributionSigndetailVO extends DistributionSigndetailEntity {
private static final long serialVersionUID = 1L;
/**
* 客户
*/
@ApiModelProperty(value = "客户")
private String consignee;
/**
* 客户电话
*/
@ApiModelProperty(value = "客户电话")
private String consigneePhone;
/**
* 收货地址
*/
@ApiModelProperty(value = "收货地址")
private String deliveryAddress;
/**
* 服务号
*/
@ApiModelProperty(value = "服务号")
private String serviceNumber;
// /**
// * 订单自编号;订单关联id
// */
// @ApiModelProperty(value = "订单自编号;订单关联id")
// private String orderId;
/**
* 签收时间
*/
@ApiModelProperty(value = "签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date signingTime;
/**
* 司机签收时间
*/
@ApiModelProperty(value = "司机签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date sjsigningTime;
/**
* 包条信息
*/
@ApiModelProperty(value = "包条信息")
private List<DistributionPackagereceiptVO> distributionPackagereceiptVOList;
}

33
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java

@ -16,6 +16,14 @@
*/
package com.logpm.distribution.controller;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.logpm.distribution.dto.DistributionSigndetailDTO;
import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
import com.logpm.distribution.entity.DistributionSignforEntity;
import com.logpm.distribution.feign.IDistributionSignforClient;
import com.logpm.distribution.service.IDistributionPackagereceiptService;
import com.logpm.distribution.service.IDistributionSignforService;
import com.logpm.distribution.vo.DistributionPackagereceiptVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@ -23,10 +31,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -39,6 +50,7 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import com.baomidou.mybatisplus.core.metadata.IPage;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
@ -54,19 +66,32 @@ import javax.servlet.http.HttpServletResponse;
@AllArgsConstructor
@RequestMapping("/signdetail")
@Api(value = "签收明细", tags = "签收明细接口")
@Slf4j
public class DistributionSigndetailController extends BladeController {
private final IDistributionSigndetailService distributionSigndetailService;
private final IDistributionSignforService distributionSignforService;
private final IDistributionPackagereceiptService distributionPackagereceiptService;
/**
* 签收明细 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入distributionSigndetail")
public R<DistributionSigndetailEntity> detail(DistributionSigndetailEntity distributionSigndetail) {
public R<DistributionSigndetailVO> detail(DistributionSigndetailDTO distributionSigndetail) {
DistributionSigndetailEntity detail = distributionSigndetailService.getOne(Condition.getQueryWrapper(distributionSigndetail));
return R.data(detail);
DistributionSigndetailVO distributionSigndetailVO = new DistributionSigndetailVO();
//查询主表数据
DistributionSignforEntity distributionSignfor = distributionSignforService.getById(detail.getMasterId());
BeanUtil.copyProperties(detail,distributionSigndetailVO);
BeanUtil.copyProperties(distributionSignfor,distributionSigndetailVO);
//查询包条信息
List<DistributionPackagereceiptVO> distributionPackagereceiptVOList =distributionPackagereceiptService.getListByMasterId(detail.getId());
distributionSigndetailVO.setDistributionPackagereceiptVOList(distributionPackagereceiptVOList);
return R.data(distributionSigndetailVO);
}
/**
* 签收明细 分页
@ -85,7 +110,9 @@ public class DistributionSigndetailController extends BladeController {
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入distributionSigndetail")
public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailVO distributionSigndetail, Query query) {
public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailDTO distributionSigndetail, Query query) {
//获取当前登录用户
BladeUser user = AuthUtil.getUser();
IPage<DistributionSigndetailVO> pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail);
return R.data(pages);
}

33
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java

@ -16,10 +16,14 @@
*/
package com.logpm.distribution.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 签收明细 数据传输对象实体类
*
@ -30,5 +34,34 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
private static final long serialVersionUID = 1L;
/**
* 客户
*/
@ApiModelProperty(value = "客户")
private String consignee;
/**
* 客户电话
*/
@ApiModelProperty(value = "客户电话")
private String consigneePhone;
/**
* 收货地址
*/
@ApiModelProperty(value = "收货地址")
private String deliveryAddress;
/**
* 签收时间
*/
@ApiModelProperty(value = "签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date signingTime;
/**
* 司机签收时间
*/
@ApiModelProperty(value = "司机签收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date sjsigningTime;
}

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.java

@ -51,5 +51,10 @@ public interface DistributionPackagereceiptMapper extends BaseMapper<Distributio
* @return
*/
List<DistributionPackagereceiptExcel> exportDistributionPackagereceipt(@Param("ew") Wrapper<DistributionPackagereceiptEntity> queryWrapper);
/**
* 通过主ID关联查询
*
* @return
*/
List<DistributionPackagereceiptVO> selectListByMasterId(Long id);
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml

@ -33,5 +33,8 @@
<select id="exportDistributionPackagereceipt" resultType="com.logpm.distribution.excel.DistributionPackagereceiptExcel">
SELECT * FROM logpm_distribution_packagereceipt ${ew.customSqlSegment}
</select>
<select id="selectListByMasterId" resultType="com.logpm.distribution.vo.DistributionPackagereceiptVO">
</select>
</mapper>

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java

@ -16,6 +16,7 @@
*/
package com.logpm.distribution.mapper;
import com.logpm.distribution.dto.DistributionSigndetailDTO;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
import com.logpm.distribution.vo.DistributionSigndetailVO;
import com.logpm.distribution.excel.DistributionSigndetailExcel;
@ -40,7 +41,7 @@ public interface DistributionSigndetailMapper extends BaseMapper<DistributionSig
* @param distributionSigndetail
* @return
*/
List<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage page, DistributionSigndetailVO distributionSigndetail);
List<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage page,@Param("param") DistributionSigndetailDTO distributionSigndetail);
/**

69
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml

@ -37,12 +37,77 @@
<select id="selectDistributionSigndetailPage" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">
select * from logpm_distribution_signdetail where is_deleted = 0
SELECT
ldsd.id id,
ldsf.service_number serviceNumber,
ldsd.delivery_number deliveryNumber,
ldsd.train_number trainNumber,
ldsd.serve_type serveType,
ldsd.order_id orderId,
ldsd.mall_name mallName,
ldsd.goods_name goodsName,
ldsd.warehouse warehouse,
ldsd.warehousing_time warehousingTime,
ldsd.lead_time leadTime,
ldsd.duration_in_stock durationInStock,
ldsd.orders_number ordersNumber,
ldsd.is_kitting isKitting,
ldsd.brand brand,
ldsd.signed_number signedNumber,
ldsf.consignee consignee,
ldsf.signing_time signingTime,
ldsf.sjsigning_time sjsigningTime,
ldsf.consignee_phone consigneePhone,
ldsf.delivery_address deliveryAddress
FROM
logpm_distribution_signdetail ldsd
JOIN logpm_distribution_signfor ldsf ON ldsd.master_id = ldsf.id
<where>
ldsd.is_deleted = 0
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldsf.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.deliveryNumber!=null and param.deliveryNumber!=''">
and ldsd.delivery_number like concat('%',#{param.deliveryNumber},'%')
</if>
<if test="param.trainNumber!=null and param.trainNumber!=''">
and ldsd.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.serveType!=null and param.serveType!=''">
and ldsd.serve_type=#{param.serveType}
</if>
<if test="param.orderId!=null and param.orderId!=''">
and ldsd.order_id like concat('%',#{param.orderId},'%')
</if>
<if test="param.mallName!=null and param.mallName!=''">
and ldsd.mall_name like concat('%',#{param.mallName},'%')
</if>
<if test="param.goodsName!=null and param.goodsName!=''">
and ldsd.goods_name like concat('%',#{param.goodsName},'%')
</if>
<if test="param.warehouse!=null and param.warehouse!=''">
and ldsd.warehouse like concat('%',#{param.warehouse},'%')
</if>
<if test="param.durationInStock!=null and param.durationInStock!=''">
and ldsd.duration_in_stock like concat('%',#{param.durationInStock},'%')
</if>
<if test="param.deliveryAddress!=null and param.deliveryAddress!=''">
and ldsf.deliveryAddress like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.consignee!=null and param.consignee!=''">
and ldsd.consignee like concat('%',#{param.consignee},'%')
</if>
<if test="param.consigneePhone!=null and param.consigneePhone!=''">
and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')
</if>
</where>
order by ldsd.create_time desc
</select>
<select id="exportDistributionSigndetail" resultType="com.logpm.distribution.excel.DistributionSigndetailExcel">
SELECT * FROM logpm_distribution_signdetail ${ew.customSqlSegment}
SELECT *
FROM logpm_distribution_signdetail ${ew.customSqlSegment}
</select>
</mapper>

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@ -39,6 +39,7 @@
<result column="delivery_sign_pictures" property="deliverySignPictures"/>
<result column="service_number" property="serviceNumber"/>
<result column="notes" property="notes"/>
<result column="consignee_phone" property="consigneePhone"/>
</resultMap>

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPackagereceiptService.java

@ -49,5 +49,10 @@ public interface IDistributionPackagereceiptService extends BaseService<Distribu
* @return
*/
List<DistributionPackagereceiptExcel> exportDistributionPackagereceipt(Wrapper<DistributionPackagereceiptEntity> queryWrapper);
/**
* 根据主id查询
*
* @return
*/
List<DistributionPackagereceiptVO> getListByMasterId(Long id);
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSigndetailService.java

@ -17,6 +17,7 @@
package com.logpm.distribution.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.logpm.distribution.dto.DistributionSigndetailDTO;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
import com.logpm.distribution.vo.DistributionSigndetailVO;
import com.logpm.distribution.excel.DistributionSigndetailExcel;
@ -38,7 +39,7 @@ public interface IDistributionSigndetailService extends BaseService<Distribution
* @param distributionSigndetail
* @return
*/
IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailVO distributionSigndetail);
IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailDTO distributionSigndetail);
/**

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackagereceiptServiceImpl.java

@ -16,6 +16,7 @@
*/
package com.logpm.distribution.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.distribution.dto.DistributionPackagereceiptDTO;
import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
import com.logpm.distribution.vo.DistributionPackagereceiptVO;
@ -52,4 +53,9 @@ public class DistributionPackagereceiptServiceImpl extends BaseServiceImpl<Distr
return distributionPackagereceiptList;
}
@Override
public List<DistributionPackagereceiptVO> getListByMasterId(Long id) {
return baseMapper.selectListByMasterId(id);
}
}

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java

@ -16,11 +16,15 @@
*/
package com.logpm.distribution.service.impl;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.logpm.distribution.dto.DistributionSigndetailDTO;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
import com.logpm.distribution.vo.DistributionSigndetailVO;
import com.logpm.distribution.excel.DistributionSigndetailExcel;
import com.logpm.distribution.mapper.DistributionSigndetailMapper;
import com.logpm.distribution.service.IDistributionSigndetailService;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.config.MybatisPlusConfiguration;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -34,10 +38,11 @@ import java.util.List;
* @since 2023-06-13
*/
@Service
@Slf4j
public class DistributionSigndetailServiceImpl extends BaseServiceImpl<DistributionSigndetailMapper, DistributionSigndetailEntity> implements IDistributionSigndetailService {
@Override
public IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailVO distributionSigndetail) {
public IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailDTO distributionSigndetail) {
return page.setRecords(baseMapper.selectDistributionSigndetailPage(page, distributionSigndetail));
}

Loading…
Cancel
Save