From aaad9d5e67212af0fdd3e9d159452e2fc55e8ddd Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sat, 14 Sep 2024 17:55:16 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmswarehousearea/WmsWarehouseAreaService.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index 7ba14914cc..536e030259 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -13,6 +13,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo; +import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone; +import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; @@ -41,6 +43,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -140,17 +144,18 @@ public class WmsWarehouseAreaService extends MybatisBaseService Date: Wed, 18 Sep 2024 09:11:03 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java | 1 + .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java | 3 +++ .../wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java | 1 + .../wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java | 3 +++ 4 files changed, 8 insertions(+) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java index 2f95de1bf6..7c9f985221 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java @@ -14,6 +14,7 @@ public class WmsWarehouseAreaQuery implements Query { private String code;//编码 private String warehouseSid;//仓库 private String areaTypeSid;//库区类型 + private String zoneSid;//区域类型 @ApiModelProperty("菜单路由") private String menuUrl; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index 536e030259..e1a7e4ab26 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -95,6 +95,9 @@ public class WmsWarehouseAreaService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); From 79ecfe5e90cefdb5ac736db6e1a31b12c2157b34 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Wed, 18 Sep 2024 09:12:16 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/warehouse/goodsShelves/index.vue | 60 ++++++++++++++++--- .../views/warehouse/warehouseArea/index.vue | 32 ++++++++++ 2 files changed, 84 insertions(+), 8 deletions(-) diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue index 6afeaa339f..80359b3601 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue @@ -22,6 +22,12 @@ :value="item.sid" /> + + + + + @@ -86,6 +92,7 @@ import req from '@/api/warehouse/goodsShelves.js' import req2 from '@/api/warehouse/warehouse.js' import req3 from '@/api/warehouse/warehouseArea.js' + import req4 from '@/api/warehouse/warehouseZone.js' import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' @@ -145,9 +152,12 @@ warehouseAreaName: '', warehouseSid: '', warehouseName: '', + zoneSid: '', + zoneName: '', } }, warehouseList: [], + warehouseZoneList: [], warehouseAreaList: [], sids: [], selectionList: [] @@ -181,14 +191,6 @@ this.warehouseList = resp.data }).catch(() => {}) }, - getWarehouseArea(sid) { - this.queryParams.params.areaTypeSid = '' - this.queryParams.params.warehouseAreaName = '' - req3.getAllWarehouseareaBysid(sid).then(resp => { - console.log('>>>>>>>>>getAllWarehousearea', resp) - this.warehouseAreaList = resp.data - }).catch(() => {}) - }, selectWarehouseChange(val) { @@ -197,10 +199,48 @@ this.queryParams.params.warehouseSid = choose[0].sid this.queryParams.params.warehouseName = choose[0].warehouseName + + this.queryParams.params.zoneSid = '' + this.queryParams.params.zoneName = '' + + this.queryParams.params.areaTypeSid = '' + this.queryParams.params.warehouseAreaName = '' + + this.getAllWarehousezone(choose[0].sid) + + }, + + getAllWarehousezone(sid) { + req4.getAllWarehousezoneBysid({ + ckSid: sid + }).then(resp => { + this.warehouseZoneList = resp.data + }) + }, + + selectWarehouseZoneChange(val) { + const choose = this.warehouseZoneList.filter((item) => item.sid == val) + console.log('>>>>>>>>>selectWarehouseZoneChange', choose) + this.queryParams.params.zoneSid = choose[0].sid + this.queryParams.params.zoneName = choose[0].zoneName + + this.queryParams.params.areaTypeSid = '' + this.queryParams.params.warehouseAreaName = '' + this.getWarehouseArea(choose[0].sid) }, + getWarehouseArea(sid) { + + req3.getAllWarehouseareaByZoneSid({ + qySid: sid + }).then(resp => { + console.log('>>>>>>>>>getAllWarehousearea', resp) + this.warehouseAreaList = resp.data + }).catch(() => {}) + }, + selectWrehouseAreaChange(val) { const choose = this.warehouseAreaList.filter((item) => item.sid == val) @@ -273,10 +313,14 @@ size: 10, total: 0, params: { + name: '', + caode: '', areaTypeSid: '', warehouseAreaName: '', warehouseSid: '', warehouseName: '', + zoneSid: '', + zoneName: '', } } this.loadList() diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue index aa02bbab1d..f356a12352 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue @@ -31,6 +31,13 @@ + + + + + +
查询 @@ -88,6 +95,7 @@ import req from '@/api/warehouse/warehouseArea.js' import req2 from '@/api/warehouse/warehouse.js' import req3 from '@/api/warehouse/warehouseAreaType.js' + import req4 from '@/api/warehouse/warehouseZone.js' import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' @@ -147,9 +155,12 @@ warehouseAreaTypeName: '', warehouseSid: '', warehouseName: '', + zoneSid: '', + zoneName: '', } }, warehouseList: [], + warehouseZoneList: [], warehouseAreaTypeLsit: [], sids: [], selectionList: [] @@ -203,6 +214,25 @@ this.queryParams.params.warehouseSid = choose[0].sid this.queryParams.params.warehouseName = choose[0].warehouseName + this.queryParams.params.zoneSid = '' + this.queryParams.params.zoneName = '' + this.getAllWarehousezone(choose[0].sid) + + }, + + getAllWarehousezone(sid) { + req4.getAllWarehousezoneBysid({ + ckSid: sid + }).then(resp => { + this.warehouseZoneList = resp.data + }) + }, + + selectWarehouseZoneChange(val) { + const choose = this.warehouseZoneList.filter((item) => item.sid == val) + console.log('>>>>>>>>>selectWarehouseZoneChange', choose) + this.queryParams.params.zoneSid = choose[0].sid + this.queryParams.params.zoneName = choose[0].zoneName }, selectWrehouseAreaTypeChange(val) { @@ -283,6 +313,8 @@ warehouseAreaTypeName: '', warehouseSid: '', warehouseName: '', + zoneSid: '', + zoneName: '', } } this.loadList() From c8ff40b78642216c205f18439f59cabe7a565ce3 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 19 Sep 2024 16:06:43 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=B9?= =?UTF-8?q?=E5=88=92=E6=89=A3=E6=98=8E=E7=BB=86=E9=9C=80=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentHistoryMapper.xml | 25 ------------------- .../LoanRepaymentHistoryService.java | 22 +--------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 86e487dd9a..07129bd126 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -125,31 +125,6 @@ FROM loan_repayment_plan_details AS p ) AS t ON p.sid = t.sid) as m - -- SELECT - -- h.sid, - -- p.loanContractNo, - -- p.vinNo, - -- p.bankContractNo, - -- p.bankName, - -- p.customer, - -- p.period, - -- p.borrowerName, - -- p.dueDate, - -- p.dueMoney, - -- h.actualDate, - -- date_format(h.dataTime, '%Y-%m-%d') as dataTime, - -- h.actualMoney, - -- h.buckle, - -- h.returnWay, - -- h.planDetailSid, - -- CASE h.updateState - -- WHEN '0' THEN '未更新' - -- WHEN '1' THEN '已更新' - -- END AS updateState, - -- date_format(h.updateTime, '%Y-%m-%d') as updateTime - -- FROM - -- loan_repayment_history AS h - -- LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index a888c59480..12f6fe68a9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -573,31 +573,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService 1 and m.outstandingMoney != m.actualMoney and returnWay = '直还')"); + qw.apply("((SELECT IFNULL(SUM(vehCount),0) FROM loan_repayment_schedule as s WHERE s.bankContractNo = m.bankContractNo and s.isDelete = 0) > 1 and m.outstandingMoney != m.actualMoney and returnWay = '直还')"); } } qw.orderByDesc("m.dataTime"); IPage pagging = baseMapper.monthListPage(page, qw); -// List records = pagging.getRecords(); -// records.removeAll(Collections.singleton(null)); -// if (!records.isEmpty()) { -// for (LoanRepaymentHistoryVo record : records) { -// String planDetailSid = record.getPlanDetailSid(); -// List histories = baseMapper.selByPlanSid(planDetailSid); -// BigDecimal returned = new BigDecimal(0); -// if (!histories.isEmpty()) { -// for (LoanRepaymentHistory history : histories) { -// returned = history.getActualMoney().add(returned); -// } -// } -// LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchBySid(record.getPlanDetailSid()); -// if (null != loanRepaymentPlanDetails) { -// BigDecimal dueMoney = loanRepaymentPlanDetails.getDueMoney(); -// BigDecimal subtract = dueMoney.subtract(returned); -// record.setOutstandingMoney(String.valueOf(subtract)); -// } -// } -// } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } From fc309b87d5d6a344334f4362b0371847514c7c2c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 20 Sep 2024 10:58:15 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/router/index.js | 39 +- .../filing/maintenanceEnterpriseAdd.vue | 2 +- .../maintenanceEnterpriseDaiBan.vue | 475 ++++++++++++++++++ .../maintenanceEnterpriseEdit.vue | 325 ++++++++++++ .../maintenanceEnterpriseYiBan.vue | 261 ++++++++++ 5 files changed, 1092 insertions(+), 10 deletions(-) create mode 100644 yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan.vue create mode 100644 yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseEdit.vue create mode 100644 yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 6a10501229..c77477246a 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -1045,21 +1045,21 @@ export const constantRoutes = [{ import('@/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue'), name: 'ClaimBillingYiBan' }, - // 工单索赔调整--编辑 + // 维修单索赔调整--编辑 { path: '/suopeitiaozhengFlow/claimadjustmentEdit', component: () => import('@/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue'), name: 'ClaimAdjustmentEdit' }, - // 工单索赔调整--待办 + // 维修单索赔调整--待办 { path: '/suopeitiaozhengFlow/claimadjustmentDaiBan', component: () => import('@/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue'), name: 'ClaimAdjustmentDaiBan' }, - // 工单索赔调整--已办 + // 维修单索赔调整--已办 { path: '/suopeitiaozhengFlow/claimadjustmentYiBan', component: () => @@ -1087,42 +1087,42 @@ export const constantRoutes = [{ import('@/views/workFlow/adjustmentFlow/adjustmentYiBan.vue'), name: 'AdjustmentYiBan' }, - // 保外工单开票申请管理--编辑 + // (保外)维修单开票申请管理--编辑 { path: '/gongdankaipiaoFlow/workorderinvoicingEdit', component: () => import('@/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue'), name: 'WorkOrderInvoicingEdit' }, - // 保外工单开票申请管理--待办 + // (保外)维修单开票申请管理--待办 { path: '/gongdankaipiaoFlow/workorderinvoicingDaiBan', component: () => import('@/views/workFlow/gongdankaipiaoFlow/workorderinvoicingDaiBan.vue'), name: 'WorkOrderInvoicingDaiBan' }, - // 保外工单开票申请管理--已办 + // (保外)维修单开票申请管理--已办 { path: '/gongdankaipiaoFlow/workorderinvoicingYiBan', component: () => import('@/views/workFlow/gongdankaipiaoFlow/workorderinvoicingYiBan.vue'), name: 'WorkOrderInvoicingYiBan' }, - // 保外工单应收调差申请管理--编辑 + // (保外)维修单应收调差申请管理--编辑 { path: '/gongdanyingshouFlow/workorderreceivableEdit', component: () => import('@/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue'), name: 'WorkOrderReceivableEdit' }, - // 保外工单应收调差申请管理--待办 + // (保外)维修单应收调差申请管理--待办 { path: '/gongdanyingshouFlow/workorderreceivableDaiBan', component: () => import('@/views/workFlow/gongdanyingshouFlow/workorderreceivableDaiBan.vue'), name: 'WorkOrderReceivableDaiBan' }, - // 保外工单应收调差申请管理--已办 + // (保外)维修单应收调差申请管理--已办 { path: '/gongdanyingshouFlow/workorderreceivableYiBan', component: () => @@ -1277,6 +1277,27 @@ export const constantRoutes = [{ import('@/views/workFlow/didingpeijianFlow/topFittingYiBan.vue'), name: 'TopFittingYiBan' }, + // 欠款月结客户备案 -- 编辑 + { + path: '/qiankuanyuejieFlow/maintenanceEnterpriseEdit', + component: () => + import('@/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseEdit.vue'), + name: 'MaintenanceEnterpriseEdit' + }, + // 欠款月结客户备案 -- 待办 + { + path: '/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan', + component: () => + import('@/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan.vue'), + name: 'MaintenanceEnterpriseDaiBan' + }, + // 欠款月结客户备案 -- 已办 + { + path: '/qiankuanyuejieFlow/maintenanceEnterpriseYiBan', + component: () => + import('@/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue'), + name: 'MaintenanceEnterpriseYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue index e132cc63b2..14de292ec4 100644 --- a/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue +++ b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交 关闭
diff --git a/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan.vue b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan.vue new file mode 100644 index 0000000000..1fa0a382f3 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseDaiBan.vue @@ -0,0 +1,475 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseEdit.vue b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseEdit.vue new file mode 100644 index 0000000000..40bca2ee0c --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseEdit.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue new file mode 100644 index 0000000000..970a179715 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue @@ -0,0 +1,261 @@ + + + + + From 17ea5ca26077b7c512461114086d362652568b91 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 20 Sep 2024 13:38:42 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=88=92=E6=89=A3=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=8E=A8=E8=B4=A2=E5=8A=A1=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanbuckleapply/LoanBuckleApplyFeign.java | 5 ++++- .../loanbuckleapply/LoanBuckleApplyFeignFallback.java | 7 ++++++- .../biz/loanbuckleapply/LoanBuckleApplyRest.java | 5 +++++ .../biz/loanbuckleapply/LoanBuckleApplyService.java | 9 +++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeign.java index 8cb1b877cb..86e65e60ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeign.java @@ -58,6 +58,9 @@ public interface LoanBuckleApplyFeign { @PostMapping("/buckleExport") public void buckleExport(@RequestParam("sid") String sid); + @ApiOperation("财务凭证重推") + @PostMapping("/buckleVoucherRePush") + public ResultBean buckleVoucherRePush(@RequestParam("sid") String sid); @ApiOperation("批量删除") @@ -109,4 +112,4 @@ public interface LoanBuckleApplyFeign { @ResponseBody ResultBean appDetail(@PathVariable("sid") String sid); -} \ No newline at end of file +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java index 2603f3875f..8192a07d0c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java @@ -46,6 +46,11 @@ public class LoanBuckleApplyFeignFallback implements LoanBuckleApplyFeign { } + @Override + public ResultBean buckleVoucherRePush(String sid) { + return null; + } + @Override public ResultBean deleteBySids(String[] sids) { return null; @@ -100,4 +105,4 @@ public class LoanBuckleApplyFeignFallback implements LoanBuckleApplyFeign { public ResultBean appDetail(String sid) { return null; } -} \ No newline at end of file +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java index c4ba46fab0..8dbaacf90e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java @@ -75,6 +75,11 @@ public class LoanBuckleApplyRest implements LoanBuckleApplyFeign { ExportExcelUtils.export(fileNameURL, records, BuckleExportVo.class, response); } + @Override + public ResultBean buckleVoucherRePush(String sid) { + return loanBuckleApplyService.buckleVoucherRePush(sid); + } + @Override public ResultBean deleteBySids(String[] sids) { return loanBuckleApplyService.deleteBySids(sids); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index 22ab80adb4..0e390adc48 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -1448,4 +1448,13 @@ public class LoanBuckleApplyService extends MybatisBaseService Date: Fri, 20 Sep 2024 13:42:50 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=92=E6=89=A3?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=8E=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/api/deduct/deduct.js | 7 +++ .../src/views/deduct/deduct.vue | 51 +++++++++++++++++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter-ui/src/api/deduct/deduct.js b/anrui-riskcenter-ui/src/api/deduct/deduct.js index c68950aea3..a933f9323e 100644 --- a/anrui-riskcenter-ui/src/api/deduct/deduct.js +++ b/anrui-riskcenter-ui/src/api/deduct/deduct.js @@ -57,6 +57,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + buckleVoucherRePush: function(data) { + return request({ + url: '/riskcenter/v1/loanbuckleapply/buckleVoucherRePush', + method: 'post', + params: data + }) + }, // 提交流程 submit: function(params) { return request({ diff --git a/anrui-riskcenter-ui/src/views/deduct/deduct.vue b/anrui-riskcenter-ui/src/views/deduct/deduct.vue index 05caa774aa..f03dab754f 100644 --- a/anrui-riskcenter-ui/src/views/deduct/deduct.vue +++ b/anrui-riskcenter-ui/src/views/deduct/deduct.vue @@ -122,6 +122,7 @@ import req from '@/api/deduct/deduct' import { getStorage } from '@/utils/auth' import deductAdd from './deductAdd' import deductInfo from './deductInfo' +import { getButtonPermissions } from '@/api/Common/dictcommons' export default { name: 'Deduct', @@ -139,6 +140,13 @@ export default { centerDialogVisible: false, btndisabled: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toPush', + btnLabel: '重推' + }, { type: 'danger', size: 'small', @@ -165,7 +173,7 @@ export default { // 翻页 listQuery: { current: 1, - size: 10, + size: 5, total: 0, params: { applyName: '', @@ -189,7 +197,18 @@ export default { mounted() { // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage window.addEventListener('message', this.handleMessage) - this.$refs['btnbar'].setButtonList(this.btnList) + getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => { + if (res.success) { + for (var i = 0; i < res.data.length; i++) { + for (var k = 0; k < this.btnList.length; k++) { + if (res.data[i].buttonId === this.btnList[k].btnKey) { + this.btnList.splice(k, 1) + } + } + } + this.$refs['btnbar'].setButtonList(this.btnList) + } + }) }, methods: { async handleMessage(event) { @@ -232,6 +251,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toPush': + this.toPush() + break case 'doDel': this.doDel() break @@ -282,7 +304,7 @@ export default { handleReset() { this.listQuery = { current: 1, - size: 10, + size: 5, total: 0, params: { applyName: '', @@ -307,6 +329,29 @@ export default { this.viewState = 4 this.$refs['divInfo'].showInfo(row) }, + toPush() { + if (this.sids.length === 1) { + const loading = this.$loading({ + lock: true, + text: '数据推送中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.buckleVoucherRePush({ sid: this.sids[0] }).then((resp) => { + if (resp.success) { + loading.close() + this.$message({ showClose: true, type: 'success', message: '重推成功' }) + this.getList() + } else { + loading.close() + } + }).catch(() => { + loading.close() + }) + } else { + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' }) + } + }, // 删除 doDel() { if (this.sids.length === 0) { From bcdc2595f545110c6f1b73cf4c3887b23ae71887 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 20 Sep 2024 14:28:17 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8F=90=E6=88=90=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparePartsCommissionFilingAdd.vue | 2 +- .../peijianbeianFlow/sparePartsCommissionFilingEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue index bf0072fde0..e8967d6182 100644 --- a/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交 关闭
diff --git a/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue index 0b0448a85d..bca076b33d 100644 --- a/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交
From 705819780d2f2c8836aa1ee5da6f69f170b613ad Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 20 Sep 2024 14:51:48 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E6=8A=80=E5=B8=88=E8=81=8C=E7=A7=B0=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technicalTitleFiling/technicalTitleFilingAdd.vue | 2 +- .../workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue index 1b8459cab8..841af16b62 100644 --- a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交 关闭
diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue index 14664c287c..c161777e41 100644 --- a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 提交 + 提交
From f308555a8fff6f0c37f8a42b9baf19fe41abf369 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 20 Sep 2024 17:02:14 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=87=BA=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/operation/repairbill/repairbillBYLeaveFactory.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue index 56341caf5c..dbc703f343 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue @@ -439,7 +439,7 @@ export default { }, leaveFactory() { if (this.sids.length === 1) { - if (this.multipleSelection[0].subject === '保外' && this.multipleSelection[0].outDoorState === '0') { + if (this.multipleSelection[0].subject === '保外' && this.multipleSelection[0].isOutFactory === '否') { arrearsleavefactory.init(this.sids[0]).then((res) => { if (res.success) { this.viewState = 5 From 6cd4e03c23c3f193d9d370f58d92d74441146731 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 20 Sep 2024 17:52:08 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/asbusrepairbill/AsBusrepairBill.java | 14 ++++- .../AsBusrepairBillAitem.java | 9 +++- .../AsBusrepairBillAitemspec.java | 38 ++++++++++++++ .../AsBusrepairBillSitem.java | 9 +++- .../AsBusrepairInventorybillDetail.java | 4 ++ .../AsBusrepairBillAitemspecMapper.java | 51 +++++++++++++++++++ .../AsBusrepairBillAitemspecMapper.xml | 6 +++ .../AsBusrepairBillAitemspecRest.java | 45 ++++++++++++++++ .../AsBusrepairBillAitemspecService.java | 51 +++++++++++++++++++ .../base/apiadmin/base/BaseGoodsSpuRest.java | 6 +++ .../basegoodsspu/BaseGoodsSpuService.java | 9 ++++ .../sms/biz/smssalesbill/SalesGoodsVo.java | 6 ++- .../sms/biz/smssalesbill/SmsSalesBill.java | 2 + .../biz/smssalesbill/SmsSalesBillService.java | 28 +++++++--- .../SmsSalesBillDetail.java | 13 +++-- .../inventory/wmsinventory/WmsInventory.java | 8 +-- .../WmsInventoryRecord.java | 18 +++++-- .../WmsInventoryRecordDto.java | 19 +++++-- .../wmsshelfbill/WmsShelfBillService.java | 17 +++++++ .../feign/base/basegoodspu/BaseGoodsSpu.java | 33 ++++++++++++ .../base/basegoodspu/BaseGoodsSpuFeign.java | 5 ++ 21 files changed, 365 insertions(+), 26 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.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 e374661c4c..2cc774f8f7 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbusrepairbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -149,5 +150,16 @@ public class AsBusrepairBill extends BaseEntity { private String dockingPhone; @ApiModelProperty("是否确认材料费（1是，0否）") private Integer materialConfirm; - + @ApiModelProperty("派工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date dispatchTime; + @ApiModelProperty("竣工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date finishTime; + @ApiModelProperty("结算时间") + private String settleTime; + @ApiModelProperty("索赔类型key") + private String shClaimTypeKey; + @ApiModelProperty("索赔类型value") + private String shClaimTypeValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java index 64fda0c888..7e4f830e65 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java @@ -27,5 +27,12 @@ public class AsBusrepairBillAitem extends BaseEntity { private BigDecimal price; @ApiModelProperty("销售价常量") private BigDecimal aitemPrice; - + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java new file mode 100644 index 0000000000..42ed79afe8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.as.api.asbusrepairbillaitemspec; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/17 14:56 + */ +@Data +@ApiModel(value = "维修工单-固定附加项目", description = "维修工单-固定附加项目") +@TableName("as_busrepair_bill_aitemspec") +public class AsBusrepairBillAitemspec extends BaseEntity { + @ApiModelProperty("工单sid") + private String billSid; + @ApiModelProperty("附加项目sid") + private String attachItemSid; + @ApiModelProperty("项目名称") + private String attachItem; + @ApiModelProperty("项目费用") + private BigDecimal price; + @ApiModelProperty("开票价") + private BigDecimal taxPrice; + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java index 5cf06cc6d3..b6a105c47f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java @@ -48,6 +48,13 @@ public class AsBusrepairBillSitem extends BaseEntity { private BigDecimal amount; @ApiModelProperty("销售价格常量") private BigDecimal sitemPrice; - + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; } 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 6ca8d91ad1..3cdb4db5c6 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 @@ -108,4 +108,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { private BigDecimal cost; @ApiModelProperty("成本合计") private BigDecimal costTotal; + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java new file mode 100644 index 0000000000..c1ea9be632 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; +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 AsBusrepairBillAitemspecMapper extends BaseMapper { + + @Select("select * from as_busrepair_bill_aitemspec where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_busrepair_bill_aitemspec where billSid = #{sid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml new file mode 100644 index 0000000000..083f65958c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java new file mode 100644 index 0000000000..fd8eff6fb4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + + +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/AsBusrepairBillAitem") +public class AsBusrepairBillAitemspecRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java new file mode 100644 index 0000000000..25cec461b5 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; +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 AsBusrepairBillAitemspecService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java index ac222282ef..1aec4e3d90 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java @@ -21,6 +21,12 @@ public class BaseGoodsSpuRest { BaseGoodsSpuService baseGoodsSpuService; + @ApiOperation("根据sid查询商品") + @GetMapping("/fetchEntityBySid") + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid) { + return baseGoodsSpuService.fetchEntityBySid(sid); + } + @ApiOperation("商品管理分页列表") @PostMapping("/goodsListPage") public ResultBean> goodsListPage(@RequestBody PagerQuery pq) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index 0fb1b5061f..d9cfff3f47 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -554,4 +554,13 @@ public class BaseGoodsSpuService extends MybatisBaseService fetchEntityBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpu baseGoodsSpu = fetchBySid(sid); + if (baseGoodsSpu != null) { + return rb.success().setData(baseGoodsSpu); + } + return rb; + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index 41e582004a..c3f3152557 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -40,8 +40,6 @@ public class SalesGoodsVo { @ApiModelProperty("库存数量") private String currentCount; - @ApiModelProperty("厂家") - private String supplierName; @ApiModelProperty("商品ID") private String goodsID; // 商品ID @@ -63,6 +61,10 @@ public class SalesGoodsVo { private String billObjSid; //供应商 private String billObjName; + //供应商sid + private String supplierSid; + //供应商 + private String supplierName; //销售价常量 private String goodsDetailsPrice; //是否含税（0含税，1不含税） diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java index 967ed27409..602b2a1be1 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java @@ -106,4 +106,6 @@ public class SmsSalesBill extends BaseEntity { private BigDecimal goodsAmount; @ApiModelProperty("附加费") private BigDecimal addAmount; + @ApiModelProperty("结算时间") + private String settleTime; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java index 2b5063c106..590f038d10 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java @@ -241,6 +241,14 @@ public class SmsSalesBillService extends MybatisBaseService goodsSpuResultBean = baseGoodsSpuFeign.fetchEntityBySid(recordDto.getGoodsSpuSid()); + if (goodsSpuResultBean.getSuccess()) { + BaseGoodsSpu goodsSpu = goodsSpuResultBean.getData(); + if (StringUtils.isNotBlank(goodsSpu.getManufacturerName())) { + recordDto.setManufacturerName(goodsSpu.getManufacturerName()); + } + if (StringUtils.isNotBlank(goodsSpu.getManufacturerSid())) { + recordDto.setManufacturerSid(goodsSpu.getManufacturerSid()); + } + } wmsInventoryRecordService.saveRecord(recordDto); } List vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java new file mode 100644 index 0000000000..9f3ab52c19 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java @@ -0,0 +1,33 @@ +package com.yxt.wms.feign.base.basegoodspu; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSpu extends BaseEntity { + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//副标题 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String brandSid;//品牌sid + private String manufacturerSid;//厂家sid + private String manufacturerName;//厂家名称 + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private Integer shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java index 81f2345edc..5ac113f4fd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; /** @@ -24,4 +25,8 @@ public interface BaseGoodsSpuFeign { @ApiOperation("查询商品是否为一品一码") @GetMapping("/selIsGoodsID/{sid}") public ResultBean selIsGoodsID(@PathVariable("sid") String sid); + + @ApiOperation("根据sid查询商品") + @GetMapping("/fetchEntityBySid") + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid); } From 04f35293f02a75f205dea5ad765dca7ab03edb69 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 23 Sep 2024 10:46:07 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=A1=A8=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillAitemspecMapper.xml | 4 ++-- .../biz/inventory/wmsoldinventory/WmsOldInventoryService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml index 083f65958c..f849d1ea31 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 6231499c85..9afbd8cb42 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java @@ -149,7 +149,7 @@ public class WmsOldInventoryService extends MybatisBaseService Date: Mon, 23 Sep 2024 14:25:12 +0800 Subject: [PATCH 13/16] =?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 | 10 +++++----- .../src/views/operation/repairbill/repairbillInfo.vue | 8 ++++---- 2 files changed, 9 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 cb5597f77e..1216f08b17 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -30,7 +30,7 @@ - +
*维修单类型
@@ -38,7 +38,7 @@ - +
*科目
@@ -46,7 +46,7 @@ - +
索赔厂家
@@ -54,7 +54,7 @@ - +
索赔类型
@@ -959,7 +959,7 @@ export default { this.otherSettle_list = res.data } }) - typeValues({ type: 'shClaimType' }).then((res) => { + typeValues({ type: 'sh_claim_type' }).then((res) => { if (res.success) { this.shClaimType_list = res.data } diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue index 4bffa134c8..cca7e0822e 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue @@ -25,19 +25,19 @@ - +
维修单类型
{{ formobj.billType }} - +
科目
{{ formobj.subject }} - +
索赔厂家
{{ formobj.claimManufacturer }} - +
索赔类型
{{ formobj.shClaimTypeValue }} From 78173dbeb8b4a8465409d2502202fedd3538f8c6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 23 Sep 2024 14:29:40 +0800 Subject: [PATCH 14/16] =?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/repairbillAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 1216f08b17..8936362ab4 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -58,7 +58,7 @@
索赔类型
- + From 2956c7cd8339660b7687326d78f356d8dc9a0ad3 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 23 Sep 2024 16:35:08 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSettleApplyService.java | 59 ++++++++----------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 7d95ece6dc..caf42d4235 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -879,11 +879,15 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + //结转剩余保证金 + carryForward(loanSettleApply); + check = 1; + } //设置结清申请的“客户结清确认”状态为是 loanSettleApply.setState(1); //更新车辆表结清状态 @@ -960,7 +970,7 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 List updatePsList = new ArrayList<>();//还款计划明细集合 @@ -1172,24 +1179,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { -// deposit = deposit.subtract(depositKF).add(depositJM); -// } else if (amountTo.compareTo(BigDecimal.ZERO) <= 0) { -// deposit = deposit.subtract(depositKF).add(depositJM).add(amountTo); -// } //按照顺序结转 //月还 if (deposit.compareTo(BigDecimal.ZERO) > 0) { @@ -1639,7 +1629,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { - GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); - voucherDetail.setSceneCode("剩余贷款保证金结转"); - voucherDetail.setBankName(planDetails.getBankName()); - voucherDetail.setDeptCode(deptCode); - voucherDetail.setCustomerCode(customerNumber); - voucherDetail.setAmount(sybzj); - voucherDetails.add(voucherDetail); + if (check == 1) { + if (sybzj.compareTo(BigDecimal.ZERO) > 0) { + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + voucherDetail.setSceneCode("剩余贷款保证金结转"); + voucherDetail.setBankName(planDetails.getBankName()); + voucherDetail.setDeptCode(deptCode); + voucherDetail.setCustomerCode(customerNumber); + voucherDetail.setAmount(sybzj); + voucherDetails.add(voucherDetail); + } } //贷款保证金扣罚 if (bzjKFCw.compareTo(BigDecimal.ZERO) > 0) { @@ -2882,6 +2874,7 @@ public class LoanSettleApplyService extends MybatisBaseService Date: Mon, 23 Sep 2024 17:54:03 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillAitemspec.java | 1 + .../AsBusrepairBillService.java | 81 ++++++++++++++++- .../AsBusrepairInventorybillService.java | 21 +++++ .../feign/wms/wmsInventory/WmsInventory.java | 8 ++ .../biz/smssalesbill/SmsSalesBillService.java | 16 ++++ .../feign/wms/wmsinventory/WmsInventory.java | 91 +++++++++++-------- 6 files changed, 180 insertions(+), 38 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java index 42ed79afe8..618219c0b4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java @@ -35,4 +35,5 @@ public class AsBusrepairBillAitemspec extends BaseEntity { private BigDecimal cost; @ApiModelProperty("成本合计（成本价*数量）") private BigDecimal costTotal; + private int count; } 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 f23943aec1..f7e388dd45 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 @@ -11,6 +11,7 @@ import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord; import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; @@ -33,6 +34,7 @@ import com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyService; import com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyService; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService; +import com.yxt.anrui.as.biz.asbusrepairbillaitemspec.AsBusrepairBillAitemspecService; import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceRest; import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService; import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordRest; @@ -155,7 +157,8 @@ public class AsBusrepairBillService extends MybatisBaseService staffList = sitemVo.getStaffList(); List staffNameList = sitemVo.getStaffNameList(); @@ -381,6 +451,15 @@ public class AsBusrepairBillService extends MybatisBaseService