From ccd385c09dd2a350fc3cfecea700608d5f9b787a Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 11 Nov 2024 11:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/biz/as/oldparts/AppOldPartsService.java | 1 + .../as/biz/asbusclaimbill/AsBusclaimBillRest.java | 12 ++++++------ .../as/biz/asbusrepairbill/AsBusrepairBillMapper.xml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java index b320bf367b..cb0c1259b4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java @@ -68,6 +68,7 @@ public class AppOldPartsService { List records = pagerVoResultBean.getData().getRecords(); for (AsBusrepairPageVo record : records) { AppOldPartsVo appOldPartsVo = new AppOldPartsVo(); + appOldPartsVo.setSid(record.getBillNo()); appOldPartsVo.setBillId(record.getBillNo()); appOldPartsVo.setVehMark(record.getVehMark()); appOldPartsVo.setVinNo(record.getVinNo()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java index c383840f58..2dfe776cc8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java @@ -234,20 +234,20 @@ public class AsBusclaimBillRest { asBusclaimBillExcelInfoList.add(asBusclaimBillExcelInfo); if (!asBusclaimBillExcelInfoList.isEmpty()) { for (AsBusclaimBillExcelInfo excelInfo : asBusclaimBillExcelInfoList) { + if (StringUtils.isBlank(excelInfo.getVinNo())) { + checkWord.add("车架号不能为空"); + break; + } if (StringUtils.isBlank(excelInfo.getBillNo())) { checkWord.add("索赔单编号不能为空"); break; }else { - AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(excelInfo.getBillNo()); + AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNoAndVinNo(asBusclaimBillExcelInfo.getBillNo(),asBusclaimBillExcelInfo.getVinNo()); if (asBusclaimBill == null){ - checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在"); + checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在或车架号" + asBusclaimBillExcelInfo.getVinNo() + "填写不正确"); break; } } - if (StringUtils.isBlank(excelInfo.getVinNo())) { - checkWord.add("车架号不能为空"); - break; - } if (StringUtils.isBlank(excelInfo.getState())) { checkWord.add("状态不能为空"); break; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 147dad4cc5..6ebf1b7c4c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -76,7 +76,7 @@ yxt_wms.wms_old_register wor LEFT JOIN as_busrepair_bill a ON a.billNo = wor.billNo - LEFT JOIN as_busrepair_bill_vech av av + LEFT JOIN as_busrepair_bill_vech av ON a.sid = av.billSid LEFT JOIN as_busrepair_inventorybill ai ON ai.sourceBillSid = a.sid