更改

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<AsBusrepairPageVo> 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());

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;

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