From 349b68711b03ecad50f6685443a7f355d9e58680 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 5 Aug 2024 16:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=92=8C=E7=BB=B4=E4=BF=AE=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicleMapper.xml | 4 +- .../LoanRepaymentScheduleService.java | 3 + .../app/GoodsConfrimDetailsVo.java | 34 ++++++++++ .../app/GoodsConfrimListQuery.java | 18 +++++ .../app/GoodsConfrimListVo.java | 49 ++++++++++++++ .../AsBusrepairInventoryBillInit.java | 1 + .../AsBusrepairInventorybillDetailSDto.java | 6 ++ .../AsBusrepairBillMapper.java | 6 ++ .../asbusrepairbill/AsBusrepairBillMapper.xml | 67 +++++++++++++++++++ .../asbusrepairbill/AsBusrepairBillRest.java | 29 +++++++- .../AsBusrepairBillService.java | 60 +++++++++++++++-- .../AsBusrepairInventorybillService.java | 59 ++++++++++++++-- .../AsBusrepairInventorybillDetailMapper.xml | 8 ++- ...AsBusrepairInventorybillDetailService.java | 36 +++++----- 14 files changed, 344 insertions(+), 36 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsConfrimDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsConfrimListQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsConfrimListVo.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 605c79710b..231f63f04e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -3,11 +3,11 @@ insert into bus_sales_order_vehicle(createBySid,sid,createTime,salesOrderSid,linkNo,linkSid,borrowerSid, - isEnable,loanContractSid) + isEnable,loanContractSid,temporaryNo) values (#{item.createBySid},#{item.sid},#{item.createTime},#{item.salesOrderSid},#{item.linkNo},#{item.linkSid},#{item.borrowerSid}, - #{item.isEnable},#{item.loanContractSid}) + #{item.isEnable},#{item.loanContractSid},#{item.temporaryNo}) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 8e7e764f36..3de05518ff 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -5000,6 +5000,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService detailList = new ArrayList<>(); + private List receiveList = new ArrayList<>(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java index 7a1f2b0e1f..16352e20ec 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java @@ -72,5 +72,11 @@ public class AsBusrepairInventorybillDetailSDto { private String operName; private String remarks; private String inventoryNum; //库存数量 + private String returnAmount; //退库金额 = amount + private String receivePer; //领料人 + private String receiveTimes; //领料时间 + private String sid; + + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index 8920f05b17..546b05fbad 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbusrepairbill.*; +import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo; +import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo; import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo; import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; @@ -56,4 +58,8 @@ public interface AsBusrepairBillMapper extends BaseMapper { IPage notConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List selGoodsReceiveByBillSid(@Param("sid") String sid); + + IPage notConfirmList2(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List goodsConfrimInfoList(@Param("sid") String sid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 568e267b86..c1d0516b37 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -212,4 +212,71 @@ LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid WHERE d.state = 1 and i.sourceBillSid = #{sid} + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 06d8f4e8c3..38bd4606b9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -1,9 +1,7 @@ package com.yxt.anrui.as.biz.asbusrepairbill; import com.yxt.anrui.as.api.asbusrepairbill.*; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo; +import com.yxt.anrui.as.api.asbusrepairbill.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -11,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @description: 维修工单 * @author: dimengzhe @@ -201,4 +201,27 @@ public class AsBusrepairBillRest { public ResultBean fetchDetailsBySid2(@PathVariable("sid") String sid) { return asBusrepairBillService.fetchDetailsBySid(sid); } + //----------------------------app维修完毕----------------------------- + @PostMapping("/notConfirmList2") + @ApiOperation("获取维修完毕待确认列表") + ResultBean> notConfirmList2(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.notConfirmList2(pagerQuery); + return rb.success().setData(pv); + } + + @PostMapping("/submitList2") + @ApiOperation("维修确认提交") + ResultBean submitList2(@RequestBody GoodsReceiveSubmit query) { + ResultBean rb = ResultBean.fireFail(); + asBusrepairBillService.submitList2(query); + return rb.success(); + } + + @ApiOperation("工单商品列表") + @GetMapping("/goodsConfrimInfoList") + public ResultBean> goodsConfrimInfoList(@RequestParam("sid") String sid) { + return asBusrepairBillService.goodsConfrimInfoList(sid); + } + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index ac299f01c3..c77d7186ca 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbusrepairbill.*; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit; -import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo; +import com.yxt.anrui.as.api.asbusrepairbill.app.*; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord; @@ -647,6 +644,11 @@ public class AsBusrepairBillService extends MybatisBaseService notConfirmList2(PagerQuery pagerQuery) { + GoodsConfrimListQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getName())) { + qw.and(wrapper -> wrapper.like("b.billNo", query.getName()) + .or().like("b.customerName", query.getName()) + .or().like("v.vehMark", query.getName()) + ); + } + String orgPath = query.getOrgPath(); + List split = Arrays.asList(orgPath.split("/")); + String useOrgSid = ""; + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + qw.eq("b.deptSid", useOrgSid); + qw.eq("b.repairState", 1); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.notConfirmList2(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + + } + + public void submitList2(GoodsReceiveSubmit query) { + List list = query.getList(); + if (!list.isEmpty()) { + for (String s : list) { + AsBusrepairBill detail = fetchBySid(s); + if (null != detail) { + detail.setRepairState(2); + baseMapper.updateById(detail); + } + } + } + } + + public ResultBean> goodsConfrimInfoList(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.goodsConfrimInfoList(sid); + return rb.success().setData(list); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index e79d0d9378..4d49faa5b1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -44,6 +44,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -259,25 +260,53 @@ public class AsBusrepairInventorybillService extends MybatisBaseService detailList = dto.getDetailList(); if (!detailList.isEmpty()) { for (AsBusrepairInventorybillDetailSDto sDto : detailList) { AsBusrepairInventorybillDetail detail = new AsBusrepairInventorybillDetail(); - BeanUtil.copyProperties(sDto, detail); - if (StringUtils.isNotBlank(sDto.getOutboundCount())) { - detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount())); + BeanUtil.copyProperties(sDto, detail,"id","sid"); +// if (StringUtils.isNotBlank(sDto.getOutboundCount())) { +// detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount())); +// } + if (isEnable == 1) { + if (StringUtils.isNotBlank(sDto.getCount())) { + detail.setCurrentCount(new BigDecimal(sDto.getCount())); + } + } else if (isEnable == 2) { + String sid = sDto.getSid(); + AsBusrepairInventorybillDetail detailUpdate = asBusrepairInventorybillDetailService.fetchBySid(sid); + BigDecimal count = BigDecimal.ZERO; + BigDecimal currentCount = BigDecimal.ZERO; + if (null != detailUpdate) { + if (null != detailUpdate.getCurrentCount()) { + currentCount = detailUpdate.getCurrentCount(); + } + if (StringUtils.isNotBlank(sDto.getCount())) { + count = new BigDecimal(sDto.getCount()); + } + BigDecimal subtract = currentCount.subtract(count); + detailUpdate.setCurrentCount(subtract); + asBusrepairInventorybillDetailService.updateById(detailUpdate); + detail.setCurrentCount(subtract); + if (StringUtils.isNotBlank(sDto.getReturnAmount())) { + detail.setAmount(new BigDecimal(sDto.getReturnAmount())); + } + } } detail.setBillSid(entity.getSid()); String inventorySid = sDto.getInventorySid(); @@ -302,6 +331,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService list = new ArrayList<>(); - //List goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid); + List list2 = new ArrayList<>(); List goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSidForBack(sid); if (!goodsDetails.isEmpty()) { for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) { AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto(); + AsBusrepairInventorybillDetailSDto goodsDetailsVo2 = new AsBusrepairInventorybillDetailSDto(); BeanUtil.copyProperties(goodsDetail, goodsDetailsVo); - if (null != goodsDetail.getCount()) { - goodsDetailsVo.setOutboundCount(goodsDetail.getCount().toString()); + BeanUtil.copyProperties(goodsDetail, goodsDetailsVo2); + if (StringUtils.isNotBlank(goodsDetail.getOperName())) { + goodsDetailsVo.setReceivePer(goodsDetail.getOperName()); + goodsDetailsVo2.setReceivePer(goodsDetail.getOperName()); + } + if (null != goodsDetail.getReceivedTime()) { + goodsDetailsVo.setReceiveTimes(sdf.format(goodsDetail.getReceivedTime())); + goodsDetailsVo2.setReceiveTimes(sdf.format(goodsDetail.getReceivedTime())); + } + if (null != goodsDetail.getCurrentCount()) { + goodsDetailsVo.setOutboundCount(goodsDetail.getCurrentCount().toString()); + goodsDetailsVo2.setOutboundCount(goodsDetail.getCurrentCount().toString()); } goodsDetailsVo.setCount("0"); +// if (null != goodsDetail.getAmount()) { +// goodsDetailsVo.setReturnAmount(goodsDetail.getAmount().toString()); +// } list.add(goodsDetailsVo); + list2.add(goodsDetailsVo2); } vo.setDetailList(list); + vo.setReceiveList(list2); } } return rb.success().setData(vo); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml index e34ae599f6..000a1d2784 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -27,7 +27,8 @@ FROM as_busrepair_inventorybill_detail AS d LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid WHERE b.sourceBillSid = #{sid} - GROUP BY d.goodsID + and d.isEnable = 1 +-- GROUP BY d.goodsID diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java index 73d79971f3..bf43469cf2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -43,29 +43,29 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService getGoodsDetailsByBillSid(String sid) { List list = baseMapper.getGoodsDetailsByBillSid(sid); - if (!list.isEmpty()) { - for (AsBusrepairInventorybillDetail record : list) { - //维修出入库查询已出库数量 - String chuKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "0", record.getGoodsID()).getData(); - String ruKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "1", record.getGoodsID()).getData(); - BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); - record.setCount(count); - } - } +// if (!list.isEmpty()) { +// for (AsBusrepairInventorybillDetail record : list) { +// //维修出入库查询已出库数量 +// String chuKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "0", record.getGoodsID()).getData(); +// String ruKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "1", record.getGoodsID()).getData(); +// BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); +// record.setCount(count); +// } +// } return list; } public List getGoodsDetailsByBillSidForBack(String sid) { List list = baseMapper.getGoodsDetailsByBillSidForBack(sid); - if (!list.isEmpty()) { - for (AsBusrepairInventorybillDetail record : list) { - //维修出入库查询已出库数量 - String chuKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "0", record.getGoodsID(),record.getSitemSid()).getData(); - String ruKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "1", record.getGoodsID(),record.getSitemSid()).getData(); - BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); - record.setCount(count); - } - } +// if (!list.isEmpty()) { +// for (AsBusrepairInventorybillDetail record : list) { +// //维修出入库查询已出库数量 +// String chuKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "0", record.getGoodsID(),record.getSitemSid()).getData(); +// String ruKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "1", record.getGoodsID(),record.getSitemSid()).getData(); +// BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); +// record.setCount(count); +// } +// } return list; } }