yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

采购退货单调整

zhanglei
God 1 year ago
parent
205677afa2
commit
31a728bcfe
7 changed files with 109 additions and 145 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java
  2. 6
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
  3. 39
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
  4. 37
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
  5. 99
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
  6. 32
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
  7. 24
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

17
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java
View File

@ -94,21 +94,4 @@ public class PmsPurchasebackBillRest {
PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@PostMapping("/exportExcel")
@ApiOperation(value = "导出")
public void exportExcel(@RequestBody PmsPurchasebackBillQuery query) {
//得到所有要导出的数据
List<PmsPurchasebackBillExcelVo> exportVoList = pmsPurchasebackBillService.listExcel(query);
//定义导出的excel名字
String excelName = "出入库查询";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, PmsPurchasebackBillExcelVo.class, response);
}
}

6
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
View File

@ -53,11 +53,5 @@ import java.util.List;
public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBill> {
IPage<PmsPurchasebackBillVo> selectPageVo(IPage<PmsPurchasebackBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
List<PmsPurchasebackBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
@Select("select * from pms_purchaseback_bill")
List<PmsPurchasebackBillVo> selectListVo();
List<PmsPurchasebackBillExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PmsPurchasebackBillExcelVo> qw);
}

39
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
View File

@ -6,43 +6,24 @@
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
SELECT
ppb.sid,
ppb.`nodeState`,
ppb.billNo,
ppb.createOrgName,
ppb.`deptName`,
ppb.createTime,
ppb.`finishTime`,
pb.billNo AS sourceBillNo,
pb.`payTypeValue`,
pb.`purchaseReasonValue`,
pb.`purchaseTypeValue`,
pb.supplierName,
pb.supplierPhone,
pb.purchaserName,
pb.storekeeperName,
pbs.settleTime
SUM(ppbd.backAmount) AS backAmountCount
FROM
pms_purchaseback_bill ppb
LEFT JOIN pms_purchase_bill pb
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppb.`sid` = ppbd.`billSid`
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
SELECT * FROM pms_purchaseback_bill <where> ${ew.sqlSegment} </where>
</select>
<select id="listExcel" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillExcelVo">
SELECT
ppb.billNo,
ppb.createTime,
pb.billNo AS sourceBillNo,
pb.supplierName,
pb.supplierPhone,
pb.purchaserName,
pb.storekeeperName,
pbs.settleTime
FROM
pms_purchaseback_bill ppb
LEFT JOIN pms_purchase_bill pb
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

37
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
View File

@ -51,20 +51,33 @@ import java.math.BigDecimal;
@ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件")
public class PmsPurchasebackBillQuery implements Query {
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建开始日期")
private String createStartTime;
@ApiModelProperty("创建结束日期")
private String createEndTime;
@ApiModelProperty("门店sid")
private String createOrgSid;
@ApiModelProperty("单据状态(0未作废,1已作废)")
private String documentState;
@ApiModelProperty("票据类型key")
private String billTypeKey;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("欠款状态(0欠款,1未欠款)")
private String arrearsState;
@ApiModelProperty("其他查询条件")
private String otherQuery;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
private String purchaseTypeValue;
@ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("组织全路径")
private String orgPath;
}

99
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
View File

@ -31,6 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
import com.yxt.pms.feign.flowable.flow.FlowableFeign;
import com.yxt.pms.feign.flowable.flow2.FlowFeign;
import com.yxt.pms.feign.flowable.flowtask.FlowTaskFeign;
import com.yxt.pms.feign.message.MessageFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -61,33 +70,63 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
@Autowired
private PmsPurchasebackDetailService pmsPurchasebackDetailService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
public PagerVo<PmsPurchasebackBillVo> listPageVo(PagerQuery<PmsPurchasebackBillQuery> pq) {
PmsPurchasebackBillQuery query = pq.getParams();
QueryWrapper<PmsPurchasebackBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
String orgPath = query.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
qw.eq("ppb.createOrgSid", createOrgSid);
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ppb.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("ppb.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("ppb.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("ppb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("ppb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getSourceBillNo())) {
qw.like("pb.billNo", query.getSourceBillNo());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("ppb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
if (StringUtils.isNotBlank(query.getPayTypeValue())) {
qw.like("pb.payTypeValue", query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("pb.supplierName", query.getSupplierName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
qw.groupBy("ppb.sid");
IPage<PmsPurchasebackBill> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchasebackBillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchasebackBillVo> p = PagerUtil.pageToVo(pagging, null);
@ -146,36 +185,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
pmsPurchasebackDetailService.delByMainSid(sid);
}
}
public List<PmsPurchasebackBillExcelVo> listExcel(PmsPurchasebackBillQuery query) {
QueryWrapper<PmsPurchasebackBillExcelVo> qw = new QueryWrapper<>();
if (query != null){
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("ppb.documentState",query.getDocumentState());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("ppb.arrearsState",query.getArrearsState());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
}
List<PmsPurchasebackBillExcelVo> list = baseMapper.listExcel(qw);
list.removeAll(Collections.singleton(null));
return list;
}
}

32
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
View File

@ -55,24 +55,32 @@ public class PmsPurchasebackBillVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
private String purchaseTypeValue;
@ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("供应商联系电话")
private String supplierPhone;
@ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("库管员姓名")
private String storekeeperName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("结算时间")
private Date settleTime;
@ApiModelProperty("票据类型value(不含税、增值税、普通税、已含增值税)")
private String billTypeValue;
@ApiModelProperty("退货金额")
private String backAmountCount;
@ApiModelProperty("应收金额")
private String receivableAmount;
}

24
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java
View File

@ -77,12 +77,7 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
}
public void saveOrUpdateDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
this.insertByDto(dto);
}
public void insertByDto(PmsPurchasePayDto dto){
@ -98,23 +93,6 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchasePay entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
List<PmsPurchasePayFile> filePaths = dto.getFilePaths();
String url = "";
for (PmsPurchasePayFile pmsPurchasePayFile : filePaths) {
String filePath = pmsPurchasePayFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.updateById(entity);
}
public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchasePay entity = fetchBySid(sid);
PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();

Write Preview
Loading…
Cancel
Save