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-ui/src/api/statement/mountings.js b/yxt-as-ui/src/api/statement/mountings.js new file mode 100644 index 0000000000..167061ba30 --- /dev/null +++ b/yxt-as-ui/src/api/statement/mountings.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 -- 业务汇总表 + fittingsSummaryRecord: function(params) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventory/fittingsSummaryRecord', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 业务明细表 + fittingsStorageRecord: function(params) { + return request({ + url: '/as/v1/AsBusrepairBill/fittingsStorageRecord', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue index 0e9462e59b..6de0ddc052 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue @@ -330,7 +330,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue index 08236638bf..fa65b1316f 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue @@ -129,7 +129,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue b/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue new file mode 100644 index 0000000000..386d5617fe --- /dev/null +++ b/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue @@ -0,0 +1,293 @@ + + + + diff --git a/yxt-as-ui/src/views/statement/mountings/partsSummary.vue b/yxt-as-ui/src/views/statement/mountings/partsSummary.vue new file mode 100644 index 0000000000..09f6550b92 --- /dev/null +++ b/yxt-as-ui/src/views/statement/mountings/partsSummary.vue @@ -0,0 +1,229 @@ + + + + diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue index c7b40bba7f..ae3f0cadcd 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue @@ -240,7 +240,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue index 19d8d9e0ad..181867a0e9 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue @@ -311,7 +311,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue index 594191b3a5..54a13c46bd 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue @@ -164,7 +164,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, 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 a0ef027fd2..f4db5e2c62 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