From 63feaba9057826cea0d00ed9876caf8cf97f8bb4 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 17 Jul 2024 17:55:18 +0800 Subject: [PATCH 01/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java | 2 ++ .../anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java index a89e6dac3e..a46b63c9db 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java @@ -12,5 +12,7 @@ import lombok.Data; public class FileUrlQuery { @ApiModelProperty("附件路径") private String url; // 附件路径 + @ApiModelProperty("附件名称") + private String name; // 附件路径 } 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 aac30e1be3..1bc0eee336 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 @@ -533,6 +533,9 @@ public class AsBusrepairBillService extends MybatisBaseService pagging = baseMapper.pageBillList(page, qw); for (AsBusrepairPageVo record : pagging.getRecords()) { String photoss = record.getPhotoss(); - if (StringUtils.isNotBlank(photoss)){ + if (StringUtils.isNotBlank(photoss)) { String[] files = photoss.split(","); List photos = new ArrayList<>(); for (String file : files) { From 86c652004594891368cf083ddc00adfd2d94a1d7 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 08:49:27 +0800 Subject: [PATCH 02/52] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B7=E5=90=8E?= =?UTF-8?q?=E5=88=86=E9=85=8D=E8=B5=84=E9=87=91=E5=8D=A0=E7=94=A8=E8=B4=B9?= =?UTF-8?q?=EF=BC=8C=E8=B5=84=E6=96=B9=E9=80=BE=E6=9C=9F=E5=88=A9=E6=81=AF?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentScheduleService.java | 106 ++++++++++++------ 1 file changed, 73 insertions(+), 33 deletions(-) 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 cfb2cb4d0f..4b3d6598d6 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 @@ -6026,13 +6026,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } T1 = T1.subtract(D1); + TempL = TempL.subtract(L1); p.setPaymentInterest(L1); p.setOverdue(0); p.setPaymentMoney(D1); @@ -6054,12 +6059,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6134,12 +6144,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6162,12 +6177,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6355,12 +6375,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6383,12 +6408,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6463,12 +6493,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; - } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; + } else { + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6491,12 +6526,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); From c5ca34b13fadbab144ff84ef4045ae2629c1c068 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 09:04:51 +0800 Subject: [PATCH 03/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/repairbill/repairbillAdd.vue | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index e8064e20c8..28f8f610ca 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -61,8 +61,8 @@
*是否外出
- 是 - 否 + 是 + 否 @@ -706,7 +706,7 @@ export default { subsidyRemarks: '', rescueRemarks: '', outRemarks: '', - fileName: '', + fileName: [], operator: '', useOrgSid: '', createOrgSid: '' @@ -1166,11 +1166,20 @@ export default { }, handleSuccess(resp, file, fileList) { if (resp.success) { - console.log(resp, file, fileList, 2222) + this.formobj.fileName.push({ + name: resp.data.sourceFileName, + url: resp.data.fullUrl + }) } }, handleRemove(file, fileList) { - console.log(file, fileList, 2222) + if (this.formobj.fileName.length > 0) { + this.formobj.fileName.forEach((e, index) => { + if (e.url === fileList.response.data.fullUrl) { + this.formobj.fileName.splice(index, 1) + } + }) + } }, saveOrUpdate() { this.formobj.operator = window.sessionStorage.getItem('name') @@ -1428,7 +1437,7 @@ export default { subsidyRemarks: '', rescueRemarks: '', outRemarks: '', - fileName: '', + fileName: [], operator: '', useOrgSid: '', createOrgSid: '' From 7ffc84db2adfff3a56d4e3d6fbd6e6d814de3e40 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 09:23:07 +0800 Subject: [PATCH 04/52] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AC=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=B4=A2=E8=B5=94=E5=8E=82=E5=AE=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asserviceclaimanu/ServiceClaimanuVo.java | 19 +++++++++++++++ .../AsServiceClaimanuMapper.java | 8 +++++-- .../AsServiceClaimanuRest.java | 14 +++++++---- .../AsServiceClaimanuService.java | 24 +++++++++---------- 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java new file mode 100644 index 0000000000..f7c2ed5cad --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.as.api.asserviceclaimanu; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 9:19 + */ +@Data +public class ServiceClaimanuVo { + + + private String sid; + @ApiModelProperty("索赔厂家名称") + private String claiManuName; // 索赔厂家名称 +} + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java index 4ed665035b..83056bbe4f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.as.api.asserviceclaimanu.ServiceClaimanuVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -55,7 +56,7 @@ import java.util.List; public interface AsServiceClaimanuMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + @Update("update as_service_claimanu set isDelete = '1' where sid = #{sid}") void updateIsDel(String sid); @@ -67,4 +68,7 @@ public interface AsServiceClaimanuMapper extends BaseMapper { @Select("select count(*) from as_service_claimanu where claiManuNo = #{claiManuNo} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") int checkSidByCodeAndUseOrgSid(@Param("claiManuNo") String claiManuNo,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); -} \ No newline at end of file + + @Select("select * from as_service_claimanu where useOrgSid = #{useOrgSid} and isDelete = '0'") + List getListByUseOrgSid(@Param("useOrgSid") String useOrgSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java index 1716f3817a..63fe01d813 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.as.biz.asserviceclaimanu; +import com.yxt.anrui.as.api.asserviceclaimanu.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,10 +34,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuQuery; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDetailsVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDto; +import java.util.List; /** * Project: yxt-as(索赔厂家管理)
@@ -88,4 +86,12 @@ public class AsServiceClaimanuRest { AsServiceClaimanuDetailsVo vo = asServiceClaimanuService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @ApiOperation("查询本部门索赔厂家") + @GetMapping("/getListByUseOrgSid") + public ResultBean> getListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid){ + ResultBean rb = ResultBean.fireFail(); + List list = asServiceClaimanuService.getListByUseOrgSid(useOrgSid); + return rb.success().setData(list); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java index 54392cc682..27a23230ca 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.as.biz.asserviceclaimanu; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asserviceclaimanu.*; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; @@ -39,11 +40,6 @@ 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.anrui.as.api.asserviceclaimanu.AsServiceClaimanu; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuQuery; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDetailsVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -73,7 +69,7 @@ public class AsServiceClaimanuService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceClaimanuQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -126,7 +122,7 @@ public class AsServiceClaimanuService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - + public ResultBean saveOrUpdateDto(AsServiceClaimanuDto dto){ ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); @@ -171,23 +167,23 @@ public class AsServiceClaimanuService extends MybatisBaseService getListByUseOrgSid(String useOrgSid) { + return baseMapper.getListByUseOrgSid(useOrgSid); + } +} From bfa685e548684aebb6f9718a4eb7e57b9426943b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 09:32:15 +0800 Subject: [PATCH 05/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/repairbill/repairbillAdd.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 28f8f610ca..08d16325df 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -7,7 +7,7 @@ 选择客户 保存 提交 - 退回 + 退回 确认材料费 打印结算单 结算 @@ -51,7 +51,7 @@
索赔厂家
- + @@ -545,7 +545,7 @@ import req from '@/api/operation/repairbill' import maintenanceitem from '@/api/basicinformation/maintenanceitem' import additionitem from '@/api/basicinformation/additionitem' -import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues } from '@/api/Common/dictcommons' +import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid } from '@/api/Common/dictcommons' import customer from '../../operation/preregistration/relation/customer' import { getStorage } from '@/utils/auth' @@ -859,6 +859,11 @@ export default { this.group_list = resp.data } }) + getListByUseOrgSid({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { + if (resp.success) { + this.claimManufacturer_list = resp.data + } + }) selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { this.user_list = resp.data @@ -914,6 +919,9 @@ export default { req.fetchBySid(sid).then((res) => { if (res.success) { this.formobj = res.data + if (this.formobj.fileName.length > 0) { + this.fileList = this.formobj.fileName + } } }) }, @@ -949,9 +957,9 @@ export default { } }, changeClaimManufacturer(value) { - const choose = this.claimManufacturer_list.filter((item) => item.claimManufacturer === value) + const choose = this.claimManufacturer_list.filter((item) => item.claiManuName === value) if (choose.length > 0 && choose !== null) { - this.formobj.claimManufacturerSid = choose[0].claimManufacturerSid + this.formobj.claimManufacturerSid = choose[0].sid } else { this.formobj.claimManufacturerSid = '' } From 26f38ca075d371b4e93e1694aa7161d2b006e4bd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 09:36:28 +0800 Subject: [PATCH 06/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/Common/dictcommons.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 4dc741125c..93d5d95533 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -35,7 +35,6 @@ export function getListOrg(data) { }) } - // 根据当前登录人orgSidPath(全路径sid)查询分公司 export function getOrgSidByPath(data) { return request({ @@ -53,7 +52,6 @@ export function fetchBySid(sid) { }) } - // 根据分公司Sid获取分公司下所有的部门 export function getListDeptByOrgSid(data) { return request({ @@ -139,6 +137,15 @@ export function getGroupList(data) { }) } +// 部门sid获取索赔厂家 +export function getListByUseOrgSid(data) { + return request({ + url: '/as/v1/asserviceclaimanu/getListByUseOrgSid', + method: 'post', + params: data + }) +} + // 查询分页列表 -- 客户列表 export function customerListPage(params) { return request({ From b19e6e0308ecc5e819ebb845d4b4875256ddf55d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:05:59 +0800 Subject: [PATCH 07/52] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/biz/asbusrepairbill/AsBusrepairBillService.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 1bc0eee336..1072558ae8 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 @@ -360,11 +360,17 @@ public class AsBusrepairBillService extends MybatisBaseService fileList = dto.getFileName(); if (!fileList.isEmpty()) { for (FileUrlQuery query : fileList) { + String name = query.getName(); String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); AsAppendix asAppendix = new AsAppendix(); asAppendix.setLinkSid(sid); asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType()); asAppendix.setFilePath(filePath); + if (name.contains(".")) { + String[] split = name.split("."); + asAppendix.setFileName(split[0]); + asAppendix.setFileType(split[1]); + } asAppendixService.save(asAppendix); } } From eca0c308cc00cc6305b7adac893e5ed66ae5a3ee Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 10:12:35 +0800 Subject: [PATCH 08/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/Common/dictcommons.js | 2 +- yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 93d5d95533..bac9c48af4 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -141,7 +141,7 @@ export function getGroupList(data) { export function getListByUseOrgSid(data) { return request({ url: '/as/v1/asserviceclaimanu/getListByUseOrgSid', - method: 'post', + method: 'get', params: data }) } diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 08d16325df..6a92bda71c 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -906,7 +906,7 @@ export default { day: nowDate.getDate() } this.formobj.createDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) - this.formobj.isGoOut = 0 + this.formobj.isGoOut = '0' this.formobj.nodeCode = '1' this.formobj.nodeName = '登记' }, From e700f1074a40c6fd5034eae508cc2a883639d1e7 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:51:31 +0800 Subject: [PATCH 09/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillListVo.java | 16 +++++ .../asbusrepairbill/AsBusrepairBillRest.java | 7 ++ .../AsBusrepairBillService.java | 68 +++++++++++++++++-- .../AsBusrepairBillInsuranceRecordMapper.java | 50 ++++++++++++++ .../AsBusrepairBillInsuranceRecordMapper.xml | 6 ++ .../AsBusrepairBillInsuranceRecordRest.java | 45 ++++++++++++ ...AsBusrepairBillInsuranceRecordService.java | 50 ++++++++++++++ .../AsBusrepairInventorybillRest.java | 8 +++ 8 files changed, 245 insertions(+), 5 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java new file mode 100644 index 0000000000..61a3c5ccb5 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 10:19 + */ +@Data +public class AsBusrepairInventorybillListVo implements Query { + + + +} 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 88434bc8f0..88f1552a53 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 @@ -54,6 +54,13 @@ public class AsBusrepairBillRest { return asBusrepairBillService.sureMaterialFee(dto); } + @PostMapping("/sendBack") + @ApiOperation("退回") + ResultBean sendBack(@RequestBody AsBusrepairBillDto dto) { + return asBusrepairBillService.sendBack(dto); + } + + @PostMapping("/settle") @ApiOperation("结算") ResultBean settle(@RequestBody AsBusrepairBillDto dto) { 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 1072558ae8..d6f4de3b6d 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 @@ -9,6 +9,7 @@ import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; +import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord; import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto; @@ -26,7 +27,10 @@ import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asappendix.AsAppendixService; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService; +import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceRest; import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService; +import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordRest; +import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordService; import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService; import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService; import com.yxt.anrui.as.biz.asbusrepairbillother.AsBusrepairBillOtherService; @@ -75,6 +79,8 @@ import java.util.*; @Service public class AsBusrepairBillService extends MybatisBaseService { + @Autowired + private AsBusrepairBillInsuranceRecordService asBusrepairBillInsuranceRecordService; @Autowired private AsAppendixService asAppendixService; @Autowired @@ -210,6 +216,7 @@ public class AsBusrepairBillService extends MybatisBaseService insuranceList = insuranceVo.getInsuranceList(); + for (InsuranceRecordVo insuranceRecordVo : insuranceList) { + AsBusrepairBillInsuranceRecord record = new AsBusrepairBillInsuranceRecord(); + BeanUtil.copyProperties(insuranceRecordVo, record, "id", "sid"); + record.setBillSid(sid); + asBusrepairBillInsuranceRecordService.insert(record); + } } //送修人信息 if (null != dto.getOtherVo()) { @@ -367,9 +382,12 @@ public class AsBusrepairBillService extends MybatisBaseService insuranceList = new ArrayList<>(); OtherVo otherVo = new OtherVo();//送修人信息 List sitemVos = new ArrayList<>();// 服务项目 List aitemVos = new ArrayList<>();// 附加项目 @@ -454,10 +474,17 @@ public class AsBusrepairBillService extends MybatisBaseService insuranceRecord = asBusrepairBillInsuranceRecordService.fetchByBillSid(sid); + if (!insuranceRecord.isEmpty()) { + for (AsBusrepairBillInsuranceRecord record : insuranceRecord) { + InsuranceRecordVo insuranceRecordVo = new InsuranceRecordVo(); + BeanUtil.copyProperties(record, insuranceRecordVo); + insuranceList.add(insuranceRecordVo); } + insuranceVo.setInsuranceList(insuranceList); } + vo.setInsuranceVo(insuranceVo); AsBusrepairBillOther other = asBusrepairBillOtherService.fetchByBillSid(sid); if (null != other) { BeanUtil.copyProperties(other, otherVo); @@ -1068,4 +1095,35 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean sendBack(AsBusrepairBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + Integer nodeCode = null; + String nodeName = ""; + if (asBusrepairBill.getNodeCode() == 5 || asBusrepairBill.getNodeCode() == 4) { + nodeCode = 3; + nodeName = "维修"; + } else if (asBusrepairBill.getNodeCode() == 2) { + nodeCode = 1; + nodeName = "登记"; + } else if (asBusrepairBill.getNodeCode() == 3) { + nodeCode = 2; + nodeName = "派工"; + } + asBusrepairBill.setNodeCode(nodeCode); + asBusrepairBill.setNodeName(nodeName); + asBusrepairBill.setNodeTime(new DateTime()); + baseMapper.updateById(asBusrepairBill); + //新增工单环节信息 + AsBusrepairBillNode billNode = new AsBusrepairBillNode(); + billNode.setBillSid(sid); + billNode.setCreateByName(dto.getOperator()); + billNode.setNodeName(nodeName); + billNode.setCreateBySid(dto.getOperatorSid()); + billNode.setNodeCode(nodeCode.toString()); + asBusrepairBillNodeService.insert(billNode); + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java new file mode 100644 index 0000000000..017f5e3be8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; +import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBusrepairBillInsuranceRecordMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_insurance_record where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_busrepair_bill_insurance_record where billSid = #{sid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml new file mode 100644 index 0000000000..2cc260fcb6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java new file mode 100644 index 0000000000..62d645d668 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBusrepairBillInsuranceRecord") +public class AsBusrepairBillInsuranceRecordRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java new file mode 100644 index 0000000000..3d98cf3f11 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord; + +import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; +import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBusrepairBillInsuranceRecordService extends MybatisBaseService { + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index eeb6a545dd..0c319f612d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -36,6 +36,14 @@ public class AsBusrepairInventorybillRest { return rb.success().setData(pv); } +// @PostMapping("/listPage") +// @ApiOperation("维修领料列表") +// ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { +// ResultBean> rb = ResultBean.fireFail(); +// PagerVo pv = asBusrepairInventorybillService.pageList(pagerQuery); +// return rb.success().setData(pv); +// } + @PostMapping("/saveOrUpdate") @ApiOperation("保存或修改") ResultBean saveorUpdate(@RequestBody AsBusrepairInventorybillDto dto) { From 972dfc4610115be1966d2effdd68f714d0aabc7b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:54:46 +0800 Subject: [PATCH 10/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=952.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java index f473a9f164..3417e91956 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java @@ -3,6 +3,7 @@ package com.yxt.anrui.as.api.asbusrepairbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -24,5 +25,5 @@ public class InsuranceVo { @ApiModelProperty("责任比例") private String responsibilityRatio; - private List insuranceList; + private List insuranceList = new ArrayList<>(); } From 1f4bac7e0f58d4e1aeefaa0b005e14717e0e9b7d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 11:00:48 +0800 Subject: [PATCH 11/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=953.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/biz/asbusrepairbill/AsBusrepairBillService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d6f4de3b6d..34f4cfd262 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 @@ -383,11 +383,11 @@ public class AsBusrepairBillService extends MybatisBaseService Date: Thu, 18 Jul 2024 14:31:11 +0800 Subject: [PATCH 12/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=AB=A3=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/repairbill/repairbillByBeCompleted.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue index 58a81b93ac..1e5c7b70f1 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue @@ -398,12 +398,12 @@ export default { this.getList() }, toConfirm() { - req.detailsByManHourFee(this.sids).then((res) => { - if (res.success) { - this.dialogVisible = true - this.formobj = res.data - } - }) + // req.detailsByManHourFee(this.sids).then((res) => { + // if (res.success) { + // this.dialogVisible = true + // this.formobj = res.data + // } + // }) }, allocationProportionChange(value, row) { const choose = this.allocationProportion_list.filter((item) => item.dictKey === value) From 51ef733ac03fa4332eb854fa3125eb99311de3a0 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 14:48:33 +0800 Subject: [PATCH 13/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/maintenanceReceive/index.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index cc9d7b7253..1818676adf 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -35,6 +35,13 @@ + + + + + + @@ -186,6 +193,7 @@ "vinNo": "", "createTimeStart": "", "createTimeEnd": "", + "completeState": "0", } }, @@ -200,6 +208,15 @@ sid: "2" } ], + completeStateList: [{ + name: "未完成", + sid: "0" + }, + { + name: "已完成", + sid: "1" + } + ] billTypeList: [], subjectList: [] } @@ -331,6 +348,9 @@ loadList() { this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false if (resp.success) { @@ -372,6 +392,7 @@ "vinNo": "", "createTimeStart": "", "createTimeEnd": "", + "completeState": "0", } } this.loadList() From f18f45cc33d3b8a2e87958a450260d56c6e6d70f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 14:53:24 +0800 Subject: [PATCH 14/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/operation/repairbill/repairbillAdd.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 6a92bda71c..7568f42867 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -1183,9 +1183,12 @@ export default { handleRemove(file, fileList) { if (this.formobj.fileName.length > 0) { this.formobj.fileName.forEach((e, index) => { - if (e.url === fileList.response.data.fullUrl) { - this.formobj.fileName.splice(index, 1) - } + this.fileList.forEach((k, num) => { + if (e.url === k.response.data.fullUrl || e.url === k.url) { + this.formobj.fileName.splice(index, 1) + this.fileList.splice(num, 1) + } + }) }) } }, From ada119913e358237775b7fdc575c5a13cf0f709c Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 14:55:18 +0800 Subject: [PATCH 15/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/maintenanceReceive/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index 1818676adf..c60101a82c 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -216,7 +216,7 @@ name: "已完成", sid: "1" } - ] + ], billTypeList: [], subjectList: [] } From b84170977daf22007861946cf484ac9856637877 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 15:43:22 +0800 Subject: [PATCH 16/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/maintenanceReceive/index.vue | 176 +++++++++++------- 1 file changed, 108 insertions(+), 68 deletions(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index c60101a82c..5e5f748915 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -10,36 +10,60 @@
- - - + + - - - + + - - - + + - - - + + @@ -52,13 +76,23 @@ - - + 至 - - + @@ -75,8 +109,13 @@
- + @@ -102,8 +141,14 @@
- +
@@ -138,7 +183,7 @@ divOutInfo, divReturnInfo, divConfirmInfo, - divInfo, + divInfo }, data() { @@ -184,37 +229,37 @@ size: 10, total: 0, params: { - "repairState": "", - "billNo": "", - "billType": "", - "subject": "", - "customerName": "", - "vehMark": "", - "vinNo": "", - "createTimeStart": "", - "createTimeEnd": "", - "completeState": "0", + 'repairState': '', + 'billNo': '', + 'billType': '', + 'subject': '', + 'customerName': '', + 'vehMark': '', + 'vinNo': '', + 'createTimeStart': '', + 'createTimeEnd': '', + 'completeState': '0' } }, sids: [], selectionList: [], repairTypeList: [{ - name: "维修中", - sid: "1" + name: '维修中', + sid: '1' }, { - name: "维修完成", - sid: "2" + name: '维修完成', + sid: '2' } ], completeStateList: [{ - name: "未完成", - sid: "0" + name: '未完成', + sid: '0' }, { - name: "已完成", - sid: "1" + name: '已完成', + sid: '1' } ], billTypeList: [], @@ -246,11 +291,10 @@ this.subjectList = resp.data } }) - }, selectionLineChangeHandle(val) { - console.log("val", val); + console.log('val', val) this.selectionList = val const aa = [] @@ -258,7 +302,6 @@ aa.push(element.sid) }) this.sids = aa - }, // 搜索条件效果 clicksearchShow() { @@ -291,7 +334,7 @@ toOut() { // this.$refs['divOutInfo'].showAdd('236195bd-2c76-4e39-aacb-e6ed89b4ca3d') // this.viewState = 2 - if (this.sids.length === 1) { + if (this.sids.length == 1) { this.viewState = 2 this.$refs['divOutInfo'].showAdd(this.sids[0]) } else { @@ -305,7 +348,7 @@ toReturn() { // this.$refs['divReturnInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50') // this.viewState = 3 - if (this.sids.length === 1) { + if (this.sids.length == 1) { this.viewState = 3 this.$refs['divReturnInfo'].showAdd(this.sids[0]) } else { @@ -320,9 +363,7 @@ // this.viewState = 4 // this.$refs['divConfirmInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50') if (this.sids.length === 1) { - - if (this.selectionList[0].repairState == '2') { - + if (this.selectionList[0].repairState == '维修完成') { this.viewState = 4 this.$refs['divConfirmInfo'].showAdd(this.sids[0]) } else { @@ -332,7 +373,6 @@ message: '只能选择维修完成的工单' }) } - } else { this.$message({ showClose: true, @@ -383,16 +423,16 @@ size: 10, total: 0, params: { - "repairState": "", - "billNo": "", - "billType": "", - "subject": "", - "customerName": "", - "vehMark": "", - "vinNo": "", - "createTimeStart": "", - "createTimeEnd": "", - "completeState": "0", + 'repairState': '', + 'billNo': '', + 'billType': '', + 'subject': '', + 'customerName': '', + 'vehMark': '', + 'vinNo': '', + 'createTimeStart': '', + 'createTimeEnd': '', + 'completeState': '0' } } this.loadList() @@ -404,8 +444,8 @@ showResult(row) { this.viewState = 5 - this.$refs['divAdd'].showAdd(row.sid) - }, + this.$refs['divAdd'].showInfos(row.sid) + } } } From 1616735bef22d9ec678711a668c34379cb75a66d Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 16:01:55 +0800 Subject: [PATCH 17/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/maintenanceReceive/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index 5e5f748915..299d13399d 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -299,7 +299,7 @@ this.selectionList = val const aa = [] val.forEach(element => { - aa.push(element.sid) + aa.push(element.billSid) }) this.sids = aa }, From 7befa594b7122c276458d48c50fddf77fc99d9df Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 16:02:13 +0800 Subject: [PATCH 18/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/operation/repairbill/repairbillAdd.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 7568f42867..b2b03e7579 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -1183,12 +1183,9 @@ export default { handleRemove(file, fileList) { if (this.formobj.fileName.length > 0) { this.formobj.fileName.forEach((e, index) => { - this.fileList.forEach((k, num) => { - if (e.url === k.response.data.fullUrl || e.url === k.url) { - this.formobj.fileName.splice(index, 1) - this.fileList.splice(num, 1) - } - }) + if (e.url === file.url) { + this.formobj.fileName.splice(index, 1) + } }) } }, From 1a7e52ffc060f8b578a40e5d8539fb937b16e25e Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 16:07:48 +0800 Subject: [PATCH 19/52] 1 --- yxt-as-ui/src/views/maintenanceReceive/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index 299d13399d..79244d0852 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -444,7 +444,7 @@ showResult(row) { this.viewState = 5 - this.$refs['divAdd'].showInfos(row.sid) + this.$refs['divInfo'].showInfo(row.sid) } } } From c8eb60be6a7509fddbf201167e016be9150f12e1 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 16:13:24 +0800 Subject: [PATCH 20/52] 2 --- yxt-as-ui/src/views/maintenanceReceive/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue index 79244d0852..fbd6948e58 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/index.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue @@ -444,7 +444,7 @@ showResult(row) { this.viewState = 5 - this.$refs['divInfo'].showInfo(row.sid) + this.$refs['divInfo'].showInfo(row.billSid) } } } From 8095e12ad223f69a4b793a43e4cc3263cd05243d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 16:24:29 +0800 Subject: [PATCH 21/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/operation/repairbill/repairbillInfo.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue index 6f898e5d84..18349ddcf0 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue @@ -4,7 +4,7 @@
{{ viewTitle }}
- 反结算 + 反结算 关闭
@@ -247,7 +247,11 @@ {{ formobj.rescueRemarks }} - + +
+ {{ item.name }} +
+ @@ -393,7 +397,7 @@ export default { subsidyRemarks: '', rescueRemarks: '', outRemarks: '', - fileName: '', + fileName: [], operator: '', useOrgSid: '', createOrgSid: '' @@ -493,6 +497,9 @@ export default { resetState() { this.viewState = 1 }, + handleOpen(value) { + window.open(value, '_parent') + }, negativeSettlement() { this.viewState = 2 this.$refs['divFJS'].showAdd(this.formobj.sid) @@ -594,7 +601,7 @@ export default { subsidyRemarks: '', rescueRemarks: '', outRemarks: '', - fileName: '', + fileName: [], operator: '', useOrgSid: '', createOrgSid: '' From 138d600f319119d24426798adc3f95412881b8d8 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 18 Jul 2024 16:33:45 +0800 Subject: [PATCH 22/52] 3 --- .../maintenanceOutbound.vue | 3 +- .../maintenanceReturnBound.vue | 199 +++++----- .../maintenanceReceive/repairbillInfo.vue | 35 +- .../src/views/storage/stocktaking/index.vue | 346 ++++++++++++------ 4 files changed, 345 insertions(+), 238 deletions(-) diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue index f95e36cf91..9f7970ca3e 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue @@ -492,8 +492,7 @@ this.$refs['form_obj'].validate((valid) => { if (valid) { - - req.saveBill(this.formobj) + req.saveOutBill(this.formobj) .then(resp => { if (resp.success) { this.$message({ diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue index 5ade9acb5f..b1e4a7049b 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue @@ -26,14 +26,14 @@
* 申请人
- {{formobj.createByName}} + {{ formobj.createByName }}
* 申请部门
- {{formobj.deptName}} + {{ formobj.deptName }} @@ -51,10 +51,15 @@
* 退料人
- - - + + @@ -77,14 +82,14 @@
维修工单编号
- {{formobj.sourceBillNo}} + {{ formobj.sourceBillNo }}
单据日期
- {{formobj.billDate}} + {{ formobj.billDate }} @@ -101,21 +106,21 @@
工单类型
- {{formobj.billType}} + {{ formobj.billType }}
科目
- {{formobj.subject}} + {{ formobj.subject }}
是否外出
- + 是 否 @@ -129,14 +134,14 @@
客户名称
- {{formobj.customerName}} + {{ formobj.customerName }}
车牌号/车架号
- {{formobj.vehMark}}/{{formobj.vinNo}} + {{ formobj.vehMark }}/{{ formobj.vinNo }} @@ -185,20 +190,27 @@ --> @@ -206,8 +218,12 @@ @@ -242,7 +258,7 @@ } from '@/utils/index.js' export default { components: { - chooseproducts, + chooseproducts }, data() { return { @@ -251,33 +267,33 @@ submitdisabled: false, formobj: { - "sid": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "sourceBillSid": "", - "warehouseManagerSid": "", - "warehouseManager": "", - "useOrgSid": "", - "createOrgSid": "", - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + 'sid': '', + 'createBySid': window.sessionStorage.getItem('userSid'), + 'createByName': window.sessionStorage.getItem('name'), + 'sourceBillSid': '', + 'warehouseManagerSid': '', + 'warehouseManager': '', + 'useOrgSid': '', + 'createOrgSid': '', + 'deptSid': window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window + 'deptName': window.sessionStorage.getItem('defaultOrgPathName').substring(window .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "remarks": "", - "sourceBillNo": "", - "waitorName": "", - "billDate": "", - "billType": "", - "subject": "", - "customerName": "", - "vehMark": "", - "vinNo": "", - "customerOrg": "", - "sitemVoList": [ + 'createTime': getCurrentDate(), + 'remarks': '', + 'sourceBillNo': '', + 'waitorName': '', + 'billDate': '', + 'billType': '', + 'subject': '', + 'customerName': '', + 'vehMark': '', + 'vinNo': '', + 'customerOrg': '', + 'sitemVoList': [ ], - "detailList": [ + 'detailList': [ ] }, @@ -304,7 +320,7 @@ required: true, message: '请选择领料人', trigger: 'change' - }], + }] } } @@ -318,12 +334,9 @@ if (res.success) { this.receivePerList = res.data - console.log("aaaaaa", this.receivePerList); + console.log('aaaaaa', this.receivePerList) } }) - - - }, showAdd(sid) { @@ -351,7 +364,6 @@ this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createTime = getCurrentDate() - getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { @@ -360,14 +372,11 @@ this.formobj.useOrgSid = res.data } }) - - } else { // 根据resp.code进行异常情况处理 } }) .catch(() => {}) - }, backData(value) { this.viewState = 1 @@ -390,7 +399,6 @@ this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createTime = getCurrentDate() - getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { @@ -399,14 +407,11 @@ this.formobj.useOrgSid = res.data } }) - - } else { // 根据resp.code进行异常情况处理 } }) .catch(() => {}) - }, resetState() { this.viewState = 1 @@ -422,8 +427,7 @@ this.$refs['form_obj'].validate((valid) => { if (valid) { - - req.saveBill(this.formobj) + req.saveQuitBill(this.formobj) .then(resp => { if (resp.success) { this.$message({ @@ -437,40 +441,39 @@ } }) .catch(() => {}) - } }) }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.formobj = { - "sid": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "sourceBillSid": "", - "warehouseManagerSid": "", - "warehouseManager": "", - "useOrgSid": "", - "createOrgSid": "", - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( + 'sid': '', + 'createBySid': window.sessionStorage.getItem('userSid'), + 'createByName': window.sessionStorage.getItem('name'), + 'sourceBillSid': '', + 'warehouseManagerSid': '', + 'warehouseManager': '', + 'useOrgSid': '', + 'createOrgSid': '', + 'deptSid': window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( 'defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem( + 'deptName': window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem( 'defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "remarks": "", - "sourceBillNo": "", - "waitorName": "", - "billDate": "", - "billType": "", - "subject": "", - "customerName": "", - "vehMark": "", - "vinNo": "", - "customerOrg": "", - "sitemVoList": [ + 'createTime': getCurrentDate(), + 'remarks': '', + 'sourceBillNo': '', + 'waitorName': '', + 'billDate': '', + 'billType': '', + 'subject': '', + 'customerName': '', + 'vehMark': '', + 'vinNo': '', + 'customerOrg': '', + 'sitemVoList': [ ], - "detailList": [ + 'detailList': [ ] } @@ -488,18 +491,17 @@ }, getWarehouseList() { - console.log("getWarehouseList>>>>>>>>>>>>>"); + console.log('getWarehouseList>>>>>>>>>>>>>') var parpams = { - orgPath: window.sessionStorage.getItem('defaultOrgPath'), + orgPath: window.sessionStorage.getItem('defaultOrgPath') } - console.log("getWarehouseList", parpams); + console.log('getWarehouseList', parpams) req2.getWarehouses(parpams).then((res) => { if (res.success) { this.warehouseList = res.data - console.log("aaaaaa", this.warehouseList); - + console.log('aaaaaa', this.warehouseList) } }) }, @@ -511,14 +513,13 @@ if (res.success) { this.warehouseRackList = res.data - console.log("bbbbb", this.warehouseRackList); - + console.log('bbbbb', this.warehouseRackList) } }) }, selectWarehouseName(row, val) { - console.log("selectWarehouseName", row); - console.log("selectWarehouseName", val); + console.log('selectWarehouseName', row) + console.log('selectWarehouseName', val) const choose = this.warehouseList.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseName', choose) row.warehouseName = choose[0].warehouseName @@ -526,27 +527,23 @@ row.warehouseRackCode = '' row.warehouseRackSid = '' - }, selectWarehouseAreaCode(row, val) { - console.log("selectWarehouseAreaCode", val); + console.log('selectWarehouseAreaCode', val) const choose = this.warehouseRackList.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseAreaCode', choose) row.warehouseRackCode = choose[0].areaCode row.warehouseRackSid = choose[0].sid - }, returnAll() { for (var i = 0; i < this.formobj.detailList.length; i++) { var item = this.formobj.detailList[i] item.count = item.outboundCount - } } - } } diff --git a/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue b/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue index 901dce0e41..5b76fb3a5d 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue @@ -4,7 +4,6 @@
{{ viewTitle }}
- 反结算 关闭
@@ -78,7 +77,8 @@
特殊标注
{{ formobj.isSpecialSign == '1' ? '有' : '否' }} + class="addinputInfo" + >{{ formobj.isSpecialSign == '1' ? '有' : '否' }} @@ -143,21 +143,29 @@
责任划分
{{ formobj.insuranceVo.responsibility }} + class="addinputInfo" + >{{ formobj.insuranceVo.responsibility }}
责任比例
{{ formobj.insuranceVo.responsibilityRatio }} + class="addinputInfo" + >{{ formobj.insuranceVo.responsibilityRatio }}
是否存在人伤
{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }} + class="addinputInfo" + >{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }} - + @@ -172,7 +180,8 @@
是否开发票
{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }} + class="addinputInfo" + >{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}
发票类型
@@ -253,7 +262,7 @@ {{ formobj.rescueRemarks }} - + @@ -266,14 +275,14 @@
应收合计：
{{ ysTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + - 附加费：{{ fjfTotal }} + 税额：0 + 附加费：{{ fjfTotal }} + 税额：0
实收合计：
{{ ssTotal }} = 应收合计：{{ ysTotal }} - - 优惠：{{ yhTotal }} + 优惠：{{ yhTotal }} @@ -439,8 +448,8 @@ fjfTotal() { let fjf = '0' fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj - .subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ? - this.formobj.rescueAmount : '0') + .subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' + ? this.formobj.rescueAmount : '0') if (this.formobj.aitemVos.length > 0) { this.formobj.aitemVos.forEach((e) => { if (e.aitemName !== '') { diff --git a/yxt-as-ui/src/views/storage/stocktaking/index.vue b/yxt-as-ui/src/views/storage/stocktaking/index.vue index ca709dd71d..520059416d 100644 --- a/yxt-as-ui/src/views/storage/stocktaking/index.vue +++ b/yxt-as-ui/src/views/storage/stocktaking/index.vue @@ -9,15 +9,43 @@
- - - + + - - - + + + + + + 至 + + + + + + + + + + + +
@@ -33,34 +61,118 @@
- + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
+ + + + + +
盘点人
+ 审核结果 + + +
生成日期
+ 审核结果 + + +
监盘人
+ + + + + + + +
备注
+ + + + + + +
+ 保 存 + 关 闭 +
+ + +
@@ -79,6 +191,7 @@ }, data() { return { + dialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -90,14 +203,21 @@ size: 'small', icon: 'plus', btnKey: 'toAdd', - btnLabel: '新增' + btnLabel: '生成盘点单' + }, + { + type: 'primary', + size: 'small', + icon: 'edit', + btnKey: 'toEdit', + btnLabel: '盘库' }, { type: 'primary', size: 'small', icon: 'edit', btnKey: 'toEdit', - btnLabel: '编辑' + btnLabel: '生成盘库报告' }, { type: 'info', @@ -112,21 +232,39 @@ size: 10, total: 0, params: { - "createDateStart": "", - "createDateEnd": "", + 'createDateStart': '', + 'createDateEnd': '' } }, sids: [], - selectionList: [] + selectionList: [], + stocktakTypeList: [{ + sid: '1', + name: '未完成' + }, + { + sid: '2', + name: '已完成' + } + ], + formobj: {} } }, mounted() { this.$refs['btnbar'].setButtonList(this.btnList) }, created() { - this.loadList() + // this.loadList() }, methods: { + + handleClose() { + this.dialogVisible = false + }, + saveExamine() { + this.dialogVisible = false + }, + // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow @@ -141,9 +279,9 @@ case 'toAdd': this.toAdd() break - case 'toEdit': - this.toEdit() - break + case 'toEdit': + this.toEdit() + break case 'doClose': this.doClose() break @@ -175,13 +313,6 @@ var pageindex = index + 1 + pagestart return pageindex }, - selectTime1() { - - }, - selectTime2() { - - }, - dosearch() { this.queryParams.current = 1 this.loadList() @@ -192,36 +323,37 @@ size: 10, total: 0, params: { - "createDateStart": "", - "createDateEnd": "", + 'createDateStart': '', + 'createDateEnd': '' } } this.loadList() }, toAdd() { - this.viewState = 2 - this.$refs['divadd'].showAdd() + // this.viewState = 2 + // this.$refs['divadd'].showAdd() + + this.dialogVisible = true }, selectionLineChangeHandle(val) { - console.log("val", val); + console.log('val', val) this.selectionList = val - }, - toEdit(){ - if(this.selectionList.length!=1){ + toEdit() { + if (this.selectionList.length != 1) { this.$message({ type: 'warning', - message: "请选择一条数据。", + message: '请选择一条数据。', showClose: true }) return } - if(this.selectionList[0].checkState==2){ + if (this.selectionList[0].checkState == 2) { this.$message({ type: 'warning', - message: "此记录已完成,不可重复编辑。", + message: '此记录已完成,不可重复编辑。', showClose: true }) return @@ -230,33 +362,6 @@ this.viewState = 3 this.$refs['divadd'].showEdit(this.selectionList[0]) }, - toBuild() { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - - - req.exportExcel(this.queryParams.params).then((resp) => { - loading.close() - const blob = new Blob([resp], { - type: 'application/vnd.ms-excel' - }) - const fileName = '出入库明细_' + this.queryParams.params.createDateStart + '.xls' - const elink = document.createElement('a') - elink.download = fileName - elink.style.display = 'nonde' - elink.href = URL.createObjectURL(blob) - document.body.appendChild(elink) - elink.click() - URL.revokeObjectURL(elink.href) - document.body.removeChild(elink) - }).catch(() => { - loading.close() - }) - }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) @@ -266,57 +371,54 @@ this.viewState = 3 this.$refs['divadd'].showEdit(row) }, - toRelevancyInfo(row) { - const tip = '请确认是否删除所选品牌?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - req.deleteGoods(row.sid).then((resp) => { - loading.close() - if (resp.success) { - this.$message({ - type: 'success', - message: resp.msg, - showClose: true - }) - this.loadList() - } else { - // 根据resp.code进行异常情况处理 - } - }).catch(e => { - loading.close() - }) - }).catch(() => {}) - }, + resetState() { this.viewState = 1 - }, - enableChange(sid, state) { - console.log('sid', sid) - console.log('state', state) - req.updateIsEnable(sid, state).then((resp) => { - if (resp.success) { - this.$message({ - type: 'success', - message: '状态已更新', - showClose: true - }) - } else { // 根据resp.code进行异常情况处理 - } - }).catch(e => { - console.log(e) - }) } } } From 2ebc3f91311eeb2592d49a73808f3854e8e428b7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 16:39:18 +0800 Subject: [PATCH 23/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue index 18349ddcf0..4503345e1f 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue @@ -498,7 +498,7 @@ export default { this.viewState = 1 }, handleOpen(value) { - window.open(value, '_parent') + window.open(value, '_blank') }, negativeSettlement() { this.viewState = 2 From 5dedc84d55c8f4dc6e31f80ce9bcc69b8392c34c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 16:59:15 +0800 Subject: [PATCH 24/52] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/asbusrepairbill/AsBusrepairBill.java | 6 + .../AsBusrepairBillQuery.java | 36 +++++ .../AsBusrepairBillVo.java | 27 ++++ .../AsBusrepairInventoryBillInit.java | 3 +- .../asbusrepairinventorybill/ConfirmDto.java | 16 +++ .../AsBusrepairInventorybillDetail.java | 3 +- .../AsBusrepairInventorybillDetailSDto.java | 2 + .../AsBusrepairBillService.java | 2 + .../AsBusrepairInventorybillMapper.java | 4 + .../AsBusrepairInventorybillMapper.xml | 34 +++++ .../AsBusrepairInventorybillRest.java | 20 ++- .../AsBusrepairInventorybillService.java | 126 +++++++++++++++++- .../wmsoutbill/WmsOutBillService.java | 5 +- 13 files changed, 271 insertions(+), 13 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/ConfirmDto.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 151f150f96..68af7ac0f9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -127,4 +127,10 @@ public class AsBusrepairBill extends BaseEntity { private String outRemarks; @ApiModelProperty("商品登记备注") private String registerRemarks; + @ApiModelProperty("维修状态（0未维修，1维修中，2维修完成）") + private Integer repairState; + @ApiModelProperty("维修工作状态（0未完成，1已完成）") + private Integer completeState; + @ApiModelProperty("出库确认备注") + private String outboundRemarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillQuery.java new file mode 100644 index 0000000000..fd482e7ac0 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillQuery.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 14:34 + */ +@Data +public class AsBusrepairBillQuery implements Query { + + + private String repairState; //维修状态 + private String billNo; //工单编号 + private String billType; //工单类型 + private String subject; //科目 + private String customerName; //是否外出 + private String vehMark; //车牌号 + private String vinNo; //车架号 + + private String createTimeEnd; //进厂结束日期 + private String createTimeStart; //进厂开始日期 + private String completeState; //0未完成 1已完成 + + @ApiModelProperty("使用组织sid") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; + + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java new file mode 100644 index 0000000000..c6855e29ef --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 14:26 + */ +@Data +public class AsBusrepairBillVo { + + + private String repairState; //维修状态 + private String billSid; //维修工单sid + private String billNo; //工单编号 + private String billTypeValue; //工单类型 + private String subjectValue; //科目 + private String customerName; //是否外出 + private String vehMark; //车牌号 + private String vinNo; //车架号 + private String isGoOut; //是否外出 + private String mobile; //联系电话 + private String entryTime; //进厂日期 + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java index 7b86cabfa4..89ec534ed1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java @@ -60,7 +60,8 @@ public class AsBusrepairInventoryBillInit { @ApiModelProperty("客户单位") private String customerOrg; private List sitemVoList = new ArrayList<>(); - + @ApiModelProperty("商品登记备注") + private String registerRemarks; private List detailList = new ArrayList<>(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/ConfirmDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/ConfirmDto.java new file mode 100644 index 0000000000..5209bf4950 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/ConfirmDto.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybill; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 16:48 + */ +@Data +public class ConfirmDto implements Dto { + + private String sid; + private String remarks; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java index b4a7350c38..8ddda8b671 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -60,7 +60,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { private BigDecimal discountAmount; @ApiModelProperty("金额（销售价-优惠金额）") private BigDecimal amount; - + @ApiModelProperty("库存数量") + private BigDecimal inventoryNum; // @ApiModelProperty("科目sid") private String subjectSid; 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 5683b43bf5..7a1f2b0e1f 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 @@ -71,4 +71,6 @@ public class AsBusrepairInventorybillDetailSDto { @ApiModelProperty("领料人姓名") private String operName; private String remarks; + private String inventoryNum; //库存数量 + } 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 34f4cfd262..2f3abe459e 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 @@ -1105,6 +1105,8 @@ public class AsBusrepairBillService extends MybatisBaseService exportExcel(@Param(Constants.WRAPPER)QueryWrapper qw); + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml index ac2d4c4d93..375b68e08b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml @@ -66,4 +66,38 @@ order by a.id desc + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index 0c319f612d..890991aea4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -36,13 +36,13 @@ public class AsBusrepairInventorybillRest { return rb.success().setData(pv); } -// @PostMapping("/listPage") -// @ApiOperation("维修领料列表") -// ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { -// ResultBean> rb = ResultBean.fireFail(); -// PagerVo pv = asBusrepairInventorybillService.pageList(pagerQuery); -// return rb.success().setData(pv); -// } + @PostMapping("/listPage") + @ApiOperation("维修领料列表") + ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairInventorybillService.listPage(pagerQuery); + return rb.success().setData(pv); + } @PostMapping("/saveOrUpdate") @ApiOperation("保存或修改") @@ -62,6 +62,12 @@ public class AsBusrepairInventorybillRest { return asBusrepairInventorybillService.newQuitBill(dto); } + @PostMapping("/saveConfirm") + @ApiOperation("商品出库确认") + ResultBean saveConfirm(@RequestBody ConfirmDto dto) { + return asBusrepairInventorybillService.saveConfirm(dto); + } + @GetMapping("/details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid) { 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 528b362fc2..5b3cf7070e 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 @@ -1,12 +1,15 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybill; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDetailsVo; import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; +import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairinventorybill.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto; @@ -16,6 +19,7 @@ import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; +import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService; import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; @@ -67,6 +71,9 @@ public class AsBusrepairInventorybillService extends MybatisBaseService sitemVos = data.getSitemVos(); List sitemsVos = new ArrayList<>(); if (!sitemVos.isEmpty()) { @@ -428,7 +438,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService selOutBoundCountBySitemSid(String sourceBillSid, String busTypeKey, String goodsID, String sitemSid) { ResultBean rb = ResultBean.fireFail(); - String count = baseMapper.selOutBoundCountBySitemSid(sourceBillSid, busTypeKey, goodsID,sitemSid); + String count = baseMapper.selOutBoundCountBySitemSid(sourceBillSid, busTypeKey, goodsID, sitemSid); return rb.success().setData(count); } @@ -518,4 +528,116 @@ public class AsBusrepairInventorybillService extends MybatisBaseService list = baseMapper.exportExcel(qw); return list; } + + public PagerVo listPage(PagerQuery pagerQuery) { + AsBusrepairBillQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + //单据编号 + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("a.billNo", query.getBillNo()); + } + + if (StringUtils.isNotBlank(query.getBillType())) { + qw.like("a.billType", query.getBillType()); + } + if (StringUtils.isNotBlank(query.getRepairState())) { + if (query.getRepairState().equals("维修中")) { + qw.eq("a.repairState", 1); + } else if (query.getRepairState().equals("维修完成")) { + qw.eq("a.repairState", 2); + } + } + //单据日期开始时间-单据日期结束时间 + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + ); + //维修工单编号 + if (StringUtils.isNotBlank(query.getSubject())) { + qw.eq("a.subject", query.getSubject()); + } + //业务类型 + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("a.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("v.vehMark", query.getVehMark()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("v.vinNo", query.getVinNo()); + } + if (query.getCompleteState().equals("0")) { + qw.apply("a.completeState = 0 \n" + + "\t\tAND a.repairState > 0 \n" + + "\tAND (a.SUBJECT = '保外' OR ( a.SUBJECT = '保内' AND (a.oldIsReclaim = 1 OR a.isGoOut = 1)))"); + } else if (query.getCompleteState().equals("1")) { + qw.eq("a.completeState", 1); + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveConfirm(ConfirmDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(dto.getSid()); + asBusrepairBill.setNodeCode(4); + asBusrepairBill.setNodeName("竣工"); + asBusrepairBill.setNodeTime(new DateTime()); + asBusrepairBill.setCompleteState(1); + if (StringUtils.isNotBlank(dto.getRemarks())) { + asBusrepairBill.setOutboundRemarks(dto.getRemarks()); + } + asBusrepairBillService.updateById(asBusrepairBill); + //新增工单环节信息 + AsBusrepairBillNode billNode = new AsBusrepairBillNode(); + billNode.setBillSid(sid); +// billNode.setCreateByName(dto.getOperator()); + billNode.setNodeName("竣工"); +// billNode.setCreateBySid(dto.getOperatorSid()); + billNode.setNodeCode("4"); + asBusrepairBillNodeService.insert(billNode); + return rb.success(); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java index c77f46d7c3..2aa791e106 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java @@ -48,6 +48,7 @@ public class WmsOutBillService extends MybatisBaseService listPage(PagerQuery pagerQuery) { WmsOutBillQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -129,7 +130,7 @@ public class WmsOutBillService extends MybatisBaseService wrapper.like("wi.goodsSpuName", query.getName()).or().like("wi.goodsSkuCode", query.getName())); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { @@ -144,7 +145,7 @@ public class WmsOutBillService extends MybatisBaseService 0"); //ToDo:供应商 From 48c0ae266a9a7ad1f7d8e75021603968bdefc402 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 17:26:15 +0800 Subject: [PATCH 25/52] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E7=BB=B4=E4=BF=AE=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairServiceItemQuery.java | 19 +++++++++++++++++++ .../biz/asserviceitem/AsServiceItemRest.java | 9 +++++++++ .../asserviceitem/AsServiceItemService.java | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsBusrepairServiceItemQuery.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsBusrepairServiceItemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsBusrepairServiceItemQuery.java new file mode 100644 index 0000000000..193a0367aa --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsBusrepairServiceItemQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.as.api.asserviceitem; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 17:21 + */ +@Data +public class AsBusrepairServiceItemQuery implements Query { + + private String useOrgSid; // 部门sid + private String subject; // 科目 + @ApiModelProperty("项目名称") + private String sitemName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java index 7779e8b174..049fd516c6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java @@ -34,6 +34,15 @@ public class AsServiceItemRest { return rb.success().setData(pv); } + @ApiOperation("选择本部门维修项目") + @PostMapping("/getServiceItemListPage") + public ResultBean> getServiceItemListPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asServiceItemService.getServiceItemListPage(pq); + return rb.success().setData(pv); + } + + @ApiOperation("禁用") @PostMapping("/disableState") public ResultBean disableState(@RequestBody String[] sids) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java index 43cee797cb..c747d9abba 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java @@ -257,4 +257,23 @@ public class AsServiceItemService extends MybatisBaseService getServiceItemListPage(PagerQuery pq) { + AsBusrepairServiceItemQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getSitemName())) { + qw.and(wrapper -> wrapper.like("a.sitemName", query.getSitemName()).or().like("a.sitemCode", query.getSitemName())); + } + if (StringUtils.isNotBlank(query.getSubject())) { + qw.eq("a.subjectName",query.getSubject()); + } + qw.eq("a.isDelete", 0); + qw.eq("a.isEnable", 1); + qw.eq("a.state", 2); + qw.orderByAsc("a.sortNo"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } From cd0a567007066aed9ea48a433e7c8e76507740ab Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 18 Jul 2024 17:43:17 +0800 Subject: [PATCH 26/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95--=E6=9C=8D=E5=8A=A1=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/repairbill/repairbillAdd.vue | 19 ++++++++++++------- .../operation/repairbill/repairbillInfo.vue | 6 ++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index b2b03e7579..87721c0be1 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -543,9 +543,8 @@ From d46442683ae369180193df901bcf56d0fda9e1ae Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 19 Jul 2024 14:15:27 +0800 Subject: [PATCH 40/52] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=A2=E6=88=B7--?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publicPage/quickAddCustomer.vue | 652 ++++++++++++++++++ .../components/publicPage/selectCustomer.vue | 54 +- 2 files changed, 702 insertions(+), 4 deletions(-) create mode 100644 yxt-as-ui/src/components/publicPage/quickAddCustomer.vue diff --git a/yxt-as-ui/src/components/publicPage/quickAddCustomer.vue b/yxt-as-ui/src/components/publicPage/quickAddCustomer.vue new file mode 100644 index 0000000000..90ea055b25 --- /dev/null +++ b/yxt-as-ui/src/components/publicPage/quickAddCustomer.vue @@ -0,0 +1,652 @@ + + + + + diff --git a/yxt-as-ui/src/components/publicPage/selectCustomer.vue b/yxt-as-ui/src/components/publicPage/selectCustomer.vue index 3de96c1abc..7502236f54 100644 --- a/yxt-as-ui/src/components/publicPage/selectCustomer.vue +++ b/yxt-as-ui/src/components/publicPage/selectCustomer.vue @@ -40,7 +40,8 @@
- + +