From f79f33f2cfaabba1a66dd111b909f8ddfce62480 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 Feb 2023 11:52:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E7=AF=B7=E5=B8=83=E6=BB=91=E9=81=93?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8D=B8=E6=B6=B2=E5=8E=8B=E7=9B=96=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E5=BA=95=E6=9D=BF=E5=8A=A0=E7=83=AD=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shangzhuangguanli/shangzhuangAdd.vue | 98 ++++++++++++++++++- 1 file changed, 94 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue index 6f78a42e48..e6923511e8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue @@ -96,7 +96,10 @@
篷布滑道
- + + + + @@ -110,13 +113,19 @@
自卸液压盖板
- + + + +
底板加热
- + + + + @@ -148,6 +157,9 @@ export default { color_list: [], refitMethod_list: [], plateMaterial_list: [], + tarpaulinSlide_list: [], + selfUnHyCoPl_list: [], + floorHeating_list: [], refitFactory_list: [], formobj: { sid: '', @@ -168,9 +180,12 @@ export default { plateThicknessBottom: '', plateThicknessEdge: '', tarpaulinSlide: '', + tarpaulinSlideKey: '', refrigerator: '', selfUnHyCoPl: '', + selfUnHyCoPlKey: '', floorHeating: '', + floorHeatingKey: '', useOrgSid: '', createOrgSid: '' }, @@ -225,6 +240,21 @@ export default { this.plateMaterial_list = res.data } }) + typeValues({ type: 'sz_pbhd' }).then((res) => { + if (res.success) { + this.tarpaulinSlide_list = res.data + } + }) + typeValues({ type: 'sz_zxyygb' }).then((res) => { + if (res.success) { + this.selfUnHyCoPl_list = res.data + } + }) + typeValues({ type: 'sz_dbjr' }).then((res) => { + if (res.success) { + this.floorHeating_list = res.data + } + }) }, changeInstallName(value) { let bb = null @@ -295,9 +325,69 @@ export default { this.formobj.plateMaterialValue = bb.name this.formobj.plateMaterialKey = bb.key }, + changeTarpaulinSlide(value) { + const choose = this.tarpaulinSlide_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.tarpaulinSlide = choose[0].dictValue + this.formobj.tarpaulinSlideKey = choose[0].dictKey + } + }, + clearTarpaulinSlide() { + this.formobj.tarpaulinSlide = '' + this.formobj.tarpaulinSlideKey = '' + }, + changeSelfUnHyCoPl(value) { + const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.selfUnHyCoPl = choose[0].dictValue + this.formobj.selfUnHyCoPlKey = choose[0].dictKey + } + }, + clearSelfUnHyCoPl() { + this.formobj.selfUnHyCoPl = '' + this.formobj.selfUnHyCoPlKey = '' + }, + changeFloorHeating(value) { + const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.floorHeating = choose[0].dictValue + this.formobj.floorHeatingKey = choose[0].dictKey + } + }, + clearFloorHeating() { + this.formobj.floorHeating = '' + this.formobj.floorHeatingKey = '' + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') - this.formobj = {} + this.formobj = { + sid: '', + vehicleTypeKey: '', + vehicleTypeValue: '', + installNameKey: '', + installNameValue: '', + refitMethodKey: '', + refitMethodValue: '', + refitFactory: '', + colorKey: '', + colorValue: '', + wk_long: '', + wk_wide: '', + wk_high: '', + plateMaterialKey: '', + plateMaterialValue: '', + plateThicknessBottom: '', + plateThicknessEdge: '', + tarpaulinSlide: '', + tarpaulinSlideKey: '', + refrigerator: '', + selfUnHyCoPl: '', + selfUnHyCoPlKey: '', + floorHeating: '', + floorHeatingKey: '', + useOrgSid: '', + createOrgSid: '' + } this.$refs['form_obj'].resetFields() this.$emit('doback') }, From 90d9850296371cc809f6629cb4ca4c4150b4a5ba Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 Feb 2023 11:54:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6--=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93--?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8A=98=E8=AE=A9=E5=AD=97=E6=AE=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index 49b1c22d75..4b2bfe1502 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -467,7 +467,7 @@ export default { this.temp.customerSid = resp.data.customerSid this.temp.mobile = resp.data.mobile this.temp.giftsDescription = resp.data.totaldiscount - this.temp.salesAllowance = resp.data.carDiscountPrice + // this.temp.salesAllowance = resp.data.carDiscountPrice this.temp.middleOne = resp.data.intermediaryName this.temp.rebateMoneyOne = resp.data.distributorPrice this.temp.middleTwo = resp.data.intermediaryName2 From 873e5bf4325845d1b22eefd20a2dae2f74b0079f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 Feb 2023 11:56:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2--=E9=87=8D?= =?UTF-8?q?=E6=8E=A8=E6=95=B0=E6=8D=AE=E6=97=B6=E5=8A=A0=E8=BD=BD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BF=87=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/purchasereceipt/purchasereceipt.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue index 3591c55542..8a6ffccb11 100644 --- a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue +++ b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue @@ -347,11 +347,22 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' }) return } else { + const loading = this.$loading({ + lock: true, + text: '数据推送中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) req.ctcgykd({ cgrkdSid: 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() }) } }, From 9260b0a5d0a2e133d549f7d461499a22984edc01 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 10 Feb 2023 13:52:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/api/basevehicle/BaseVehicle.java | 2 ++ .../base/api/basevehicle/BaseVehicleSelectVo.java | 2 ++ .../yxt/anrui/base/api/basevehicle/BaseVehicleVo.java | 2 ++ .../biz/baseaccadjapply/BaseAccadjApplyService.java | 10 +++------- .../base/biz/basevehicle/BaseVehicleService.java | 2 +- .../biz/scmapplyinbound/ScmApplyInboundService.java | 2 ++ .../ScmApplyInboundQueryService.java | 11 ++++++++++- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index 6de14e5426..98a65c1ebf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -181,4 +181,6 @@ public class BaseVehicle extends BaseEntity { private String orgCode; @ApiModelProperty(value = "车辆型号") private String vehMark; + @ApiModelProperty(value = "公司入库日期") + private String orgPriceDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index eacbc7d55a..c5bbcd79ae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -154,4 +154,6 @@ public class BaseVehicleSelectVo implements Vo { private String supplierCode; @ApiModelProperty(value = "分公司code") private String orgCode; + @ApiModelProperty(value = "公司入库日期") + private String orgPriceDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index c312fcf1b2..0d9afe12f9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -250,4 +250,6 @@ public class BaseVehicleVo implements Vo { private String trailerOrInstallDealPrice; @ApiModelProperty("总成交价") private String totalDealPrice; + @ApiModelProperty(value = "公司入库日期") + private String orgPriceDate; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index d289d53cf6..a438e34c1b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -520,18 +520,14 @@ public class BaseAccadjApplyService extends MybatisBaseService fInStockEntry = new ArrayList<>(); for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + String vinNo = baseInternalPurchaseVehicle.getVinNo(); //单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价 sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + ""); //车辆类型 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 7f5ec72b40..ac713da928 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1560,7 +1560,7 @@ public class BaseVehicleService extends MybatisBaseService scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(sid); + vo.setScmApplyInboundVehQueryList(scmApplyInboundVehQueryDetailsVos); + BigDecimal totalMoney = new BigDecimal(0); + for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { + String settleMoney = scmApplyInboundVehQueryDetailsVo.getSettleMoney(); + totalMoney = totalMoney.add(new BigDecimal(settleMoney)); + } + String transform = TransformMoney.transform(totalMoney.toString()); + vo.setTotalMoney(transform); return vo; } @@ -260,7 +269,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService fInStockEntry = new ArrayList<>(); //直接调拨单的物料列表