From 1b09dab46ff240705678d66ede686ff4ee9b8079 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 31 Oct 2024 14:48:14 +0800 Subject: [PATCH] 10.31 --- .../convenienceStore/inventory/details.vue | 583 +++++++++--------- .../views/convenienceStore/stockStatistic.vue | 1 + .../mapper/MtInventoryDetailsMapper.java | 3 +- .../mapper/xml/MtInventoryDetailsMapper.xml | 5 +- .../service/MtInventoryDetailsService.java | 7 + .../impl/MtInventoryDetailsServiceImpl.java | 16 + .../impl/StockStatisticServiceImpl.java | 7 + .../vo/MtInventoryDetailsVO.java | 12 +- .../convenienceSore/vo/StockStatisticVo.java | 4 + 9 files changed, 343 insertions(+), 295 deletions(-) diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue index 0d76939e9..a0e0500de 100644 --- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue +++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue @@ -1,161 +1,172 @@ @@ -181,45 +193,37 @@ - + - - - - - - - - - - - - - - - - - - - - - - - 查询 - - + + + + + + + + + + + + + + + + 搜索 + @@ -235,8 +239,8 @@ - - + + @@ -247,15 +251,20 @@ {{ getName(supplierList, scope.row.supplierId) }} - + + + + -
- 确 定 +
取 消 + 确 定
@@ -266,25 +275,24 @@ import {getAuditPremApi} from "@/api/oilConfig/staff"; import {BigNumber} from "bignumber.js"; import {listLJGoods} from "@/api/convenienceStore/ljgoods"; -import {getName,parseTime} from "../../../utils/fuint"; -import {selectParentById, selectTree} from "@/api/convenienceStore/goods"; +import {parseTime} from "../../../utils/fuint"; +import {selectTree} from "@/api/convenienceStore/goods"; import {listSupplier} from "@/api/convenienceStore/supplier"; import { - getInventoryDetailsPageApi, + auditInventoryApi, + batchProcessingApi, delDetailsApi, editInventoryApi, - addInventoryApi, - batchProcessingApi, - auditInventoryApi, - storageInventoryApi, - abolitionInventoryApi, - exportExcelApi, getSalesByMtInventoryApi + exportExcelApi, + getInventoryDetailsPageApi, + getSalesByMtInventoryApi, + storageInventoryApi } from "@/api/convenienceStore/inventory"; export default { name: "details", - props:[ + props: [ 'PinventoryId', 'PorderNumber', 'PorderDate', @@ -295,7 +303,7 @@ export default { return { detailsList: [], commodityList: [], - commodityForm:{ + commodityForm: { cvsGoodId: "", cvsGood: "", supplierId: "", @@ -304,44 +312,43 @@ export default { remark: "", page: 1, pageSize: 10, - isRecovery:0, + isRecovery: 0, }, inventoryForm: { - inventoryId:this.$props.PinventoryId, - id:this.$props.PinventoryId, + inventoryId: this.$props.PinventoryId, + id: this.$props.PinventoryId, orderNumber: this.$props.PorderNumber, approvalStatus: this.$props.PapprovalStatus, orderDate: this.$props.PorderDate, creataByName: this.$props.PcreataByName, - roductQuantity:0, // 商品数量 - inventoryQuantity: 0 ,// 盘点数量 - damageQuantity: 0 ,// 货损数量 + roductQuantity: 0, // 商品数量 + inventoryQuantity: 0,// 盘点数量 + damageQuantity: 0,// 货损数量 inventoryDiscrepancy: 0,// 库存差异 profitLossAmount: 0// 盈亏总额 }, - inventoryId : this.$props.PinventoryId, - + inventoryId: this.$props.PinventoryId, // 商品分类列表 - cvsGoodList:[], + cvsGoodList: [], // 供应商列表 - supplierList:[], + supplierList: [], - state:this.$props.PapprovalStatus, + state: this.$props.PapprovalStatus, - saveFlag:false, - auditFlag:true, - voidFlag:true, - storageFlag:true, - multipleSelection:[], // 表格 + saveFlag: false, + auditFlag: true, + voidFlag: true, + storageFlag: true, + multipleSelection: [], // 表格 // 弹出框标题 - title:'选择商品', + title: '添加盘点商品', // 显示搜索条件 showSearch: true, disableInput: false, // 默认不禁用 @@ -349,13 +356,13 @@ export default { open: false, // 总条数 total: 0, - + numberInput: false, // 查询参数 queryParams: { // supplierId: '', inventoryId: this.$props.PinventoryId, - page:null, - pageSize:null + page: null, + pageSize: null }, // 遮罩层 loading: false, @@ -364,7 +371,7 @@ export default { // 表单校验 rules: { supplierName: [ - { required: true, message: "供应商名称不能为空", trigger: "blur" }, + {required: true, message: "供应商名称不能为空", trigger: "blur"}, ], }, } @@ -383,23 +390,23 @@ export default { // this.inventoryForm.approvalStatus = this.$props.PapprovalStatus this.state = this.$props.PapprovalStatus - if ( this.state == null) { + if (this.state == null) { this.state = 'await' } - if (this.state=='await') { + if (this.state == 'await') { this.numberInput = false - }else { + } else { this.numberInput = true } - console.log("this.inventoryForm",this.inventoryForm) + console.log("this.inventoryForm", this.inventoryForm) if (this.inventoryForm.orderNumber == null) { this.refresh(); } if (this.inventoryForm.orderDate == null) { - this.inventoryForm.orderDate =new Date() + this.inventoryForm.orderDate = new Date() } this.getDetailsList(); @@ -407,10 +414,14 @@ export default { this.JudgmentButton(); }, methods: { + // 返回页面 + cancelPurchase() { + this.$router.back() + }, parseTime, getDetailsList() { let this_ = this - getInventoryDetailsPageApi(this.queryParams).then(res=>{ + getInventoryDetailsPageApi(this.queryParams).then(res => { this_.detailsList = res.data.records; this.total = res.data.total; this.inventoryForm.productQuantity = res.data.total; @@ -419,7 +430,7 @@ export default { }, getCommodityList() { let this_ = this - listLJGoods(this_.commodityForm).then(res=>{ + listLJGoods(this_.commodityForm).then(res => { this_.commodityList = res.data.records; this_.sumMethod(res.data.records); // this.total = response.data.total; @@ -435,30 +446,27 @@ export default { commodityDel(data) { this.$confirm('确定删除?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - if (data.id != null) { - delDetailsApi(data).then(res=>{ - }) - } - const index = this.detailsList.indexOf(data); // 查找要删除的对象的索引 - if (index !== -1) { - this.detailsList.splice(index, 1); // 使用splice方法删除对象 - } - this.inventoryForm.productQuantity--; - this.sumMethod(this.detailsList); + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + if (data.id != null) { + delDetailsApi(data).then(res => { + }) + } + const index = this.detailsList.indexOf(data); // 查找要删除的对象的索引 + if (index !== -1) { + this.detailsList.splice(index, 1); // 使用splice方法删除对象 + } + this.inventoryForm.productQuantity--; + this.sumMethod(this.detailsList); - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消删除' - }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' }); - - - + }); }, @@ -468,7 +476,7 @@ export default { }, // 改变数字时 - change(data,flag) { + change(data, flag) { let profitLossAmount = new BigNumber(data.profitLossAmount); let inventoryDiscrepancy = new BigNumber(data.inventoryDiscrepancy); let inventoryQuantity = new BigNumber(data.inventoryQuantity); //正常 @@ -476,10 +484,10 @@ export default { let purchasePrice = new BigNumber(data.purchasePrice); let stock = new BigNumber(data.stock); // 计算库存差异 - console.log("inventoryQuantity",inventoryQuantity) - console.log("damageQuantity",damageQuantity) - console.log("stock",stock) - let addStocke = inventoryQuantity.minus(damageQuantity) // 正常减货损 + console.log("inventoryQuantity", inventoryQuantity) + console.log("damageQuantity", damageQuantity) + console.log("stock", stock) + let addStocke = inventoryQuantity.minus(damageQuantity) // 正常减货损 // let addStocke = inventoryQuantity.plus(damageQuantity) inventoryDiscrepancy = addStocke.minus(stock) // // 计算盈亏金额 @@ -490,8 +498,8 @@ export default { // 计算盈亏 // 库存差异 - let a = inventoryQuantity.minus(stock) - let b= a.minus(purchasePrice) + let a = inventoryQuantity.minus(stock) + let b = a.minus(purchasePrice) // 盈亏金额 data.inventoryDiscrepancy = a.toNumber(); data.profitLossAmount = b.toNumber(); @@ -508,42 +516,42 @@ export default { // this_.inventoryForm.productQuantity = 0 // } - this_.inventoryForm.productQuantity = data.length, - this_.inventoryForm.inventoryQuantity = new BigNumber(0), - this_.inventoryForm.damageQuantity = new BigNumber(0), - this_.inventoryForm.inventoryDiscrepancy = new BigNumber(0), - this_.inventoryForm.profitLossAmount = new BigNumber(0), + this_.inventoryForm.productQuantity = data.length, + this_.inventoryForm.inventoryQuantity = new BigNumber(0), + this_.inventoryForm.damageQuantity = new BigNumber(0), + this_.inventoryForm.inventoryDiscrepancy = new BigNumber(0), + this_.inventoryForm.profitLossAmount = new BigNumber(0), - data.forEach(da => { - if (da.inventoryQuantity != null) { + data.forEach(da => { + if (da.inventoryQuantity != null) { - this_.inventoryForm.inventoryQuantity= this_.inventoryForm.inventoryQuantity.plus(da.inventoryQuantity) - } - if (da.inventoryDiscrepancy != null) { - this_.inventoryForm.inventoryDiscrepancy = this_.inventoryForm.inventoryDiscrepancy.plus(da.inventoryDiscrepancy) - } - if (da.profitLossAmount != null) { - this_.inventoryForm.profitLossAmount = this_.inventoryForm.profitLossAmount.plus(da.profitLossAmount) - } - }) + this_.inventoryForm.inventoryQuantity = this_.inventoryForm.inventoryQuantity.plus(da.inventoryQuantity) + } + if (da.inventoryDiscrepancy != null) { + this_.inventoryForm.inventoryDiscrepancy = this_.inventoryForm.inventoryDiscrepancy.plus(da.inventoryDiscrepancy) + } + if (da.profitLossAmount != null) { + this_.inventoryForm.profitLossAmount = this_.inventoryForm.profitLossAmount.plus(da.profitLossAmount) + } + }) }, - async addCommodity () { + async addCommodity() { let this_ = this let sum = 0; for (const mul of this.multipleSelection) { let flag = true; - this_.detailsList.forEach(det=>{ + this_.detailsList.forEach(det => { if (mul.id == det.goodsId) { flag = false sum++ } }) - if(flag) { + if (flag) { let getPurchaseByTankIdData - await getSalesByMtInventoryApi({goodsId:mul.id}).then(res=>{ + await getSalesByMtInventoryApi({goodsId: mul.id}).then(res => { getPurchaseByTankIdData = res.data }) @@ -552,25 +560,25 @@ export default { goodsId: mul.id, commodityName: mul.name, cvsGoodId: mul.cvsGoodId, - unit:mul.unit, - stock:mul.stock, + unit: mul.unit, + stock: mul.stock, purchasePrice: mul.buyingPrice, - goodsNo:mul.goodsNo, - inventoryQuantity:1, - damageQuantity:0, - profitLossAmount:0, // 盈亏金额 - inventoryDiscrepancy:0, // 库存差异 - purchase:getPurchaseByTankIdData.purchase, - goodsSales:getPurchaseByTankIdData.goodsSales, - inventorySales:getPurchaseByTankIdData.inventorySales, - exchangeSales:getPurchaseByTankIdData.exchangeSales, + goodsNo: mul.goodsNo, + inventoryQuantity: 1, + damageQuantity: 0, + profitLossAmount: 0, // 盈亏金额 + inventoryDiscrepancy: 0, // 库存差异 + purchase: getPurchaseByTankIdData.purchase, + goodsSales: getPurchaseByTankIdData.goodsSales, + inventorySales: getPurchaseByTankIdData.inventorySales, + exchangeSales: getPurchaseByTankIdData.exchangeSales, } this_.detailsList.push(now) } } - if(sum>0) { - this.$modal.msgError("同一货损单不能有两件相同的商品，您选择了"+sum+"件相同的商品，已为您剔除"); + if (sum > 0) { + this.$modal.msgError("同一货损单不能有两件相同的商品，您选择了" + sum + "件相同的商品，已为您剔除"); } this_.open = false @@ -586,7 +594,7 @@ export default { page: 1, pageSize: 1000, total: 0, - isRecovery:0, + isRecovery: 0, } this.commodityList = [] @@ -595,7 +603,7 @@ export default { }, // 查询搜索列表信息 - getQueryList(){ + getQueryList() { selectTree().then(response => { this.cvsGoodList = response.data.records }); @@ -616,43 +624,42 @@ export default { let min = 100; // 最小的四位数是 1000 let max = 999; // 最大的四位数是 9999 let randomFourDigitNumber = Math.floor(Math.random() * (max - min + 1)) + min; - this.inventoryForm.orderNumber = timestamp+randomFourDigitNumber.toString(); + this.inventoryForm.orderNumber = timestamp + randomFourDigitNumber.toString(); }, - // 判断按钮是否可用 - async JudgmentButton(){ + async JudgmentButton() { let judgmentPermissions1 = await this.judgmentPermissions("盘点商品审核"); - if (judgmentPermissions1 > 0){ - this.auditFlag=false, - this.voidFlag=false + if (judgmentPermissions1 > 0) { + this.auditFlag = false, + this.voidFlag = false } let judgmentPermissions2 = await this.judgmentPermissions("盘点商品入库"); - if (judgmentPermissions2 > 0){ + if (judgmentPermissions2 > 0) { this.storageFlag = false } let judgmentPermissions3 = await this.judgmentPermissions("盘点商品废止"); - if (judgmentPermissions3 > 0){ - this.voidFlag=false - }else { - this.voidFlag=true + if (judgmentPermissions3 > 0) { + this.voidFlag = false + } else { + this.voidFlag = true } }, // 判断权限 async judgmentPermissions(data) { - let fil ={ - auditPrem:data + let fil = { + auditPrem: data } return await getAuditPremApi(fil).then(res => { return res.data }); }, - async save(flag){ + async save(flag) { let this_ = this // 保存时修改退货单 @@ -666,18 +673,18 @@ export default { // roductQuantity:0, // 商品数量 // inventoryQuantity: 0 // 盘点数量 // }, - if(this_.detailsList.length<=0) { + if (this_.detailsList.length <= 0) { this.$modal.msgError("盘点单不能为空"); return -1; } - await editInventoryApi(this.inventoryForm).then(res=>{ + await editInventoryApi(this.inventoryForm).then(res => { // 批量保存订单 - batchProcessingApi(this_.detailsList).then(res=>{ + batchProcessingApi(this_.detailsList).then(res => { this.$modal.msgSuccess("保存成功"); if (flag != -1) { this.goToAbout(); } - }).catch(res=>{ + }).catch(res => { this.$modal.msgError("保存失败"); }) @@ -685,20 +692,20 @@ export default { }, // 保存并审核 - async audit(){ + async audit() { // 保存 let number = await this.save(-1); if (number != -1) { // 审核 - let fil ={ + let fil = { id: this.inventoryId } - console.log(" id: this.inventoryId",fil) + console.log(" id: this.inventoryId", fil) await auditInventoryApi(fil).then(res => { if (res.data) { this.state = 'ysh' this.$modal.msgWarning("审核成功"); - }else { + } else { this.$modal.msgWarning("暂无审核权限"); } this.goToAbout() @@ -716,7 +723,7 @@ export default { type: 'warning' }).then(() => { // 审核 - let fil ={ + let fil = { id: this.inventoryId } storageInventoryApi(fil).then(res => { @@ -733,7 +740,7 @@ export default { // 作废 - abolition(){ + abolition() { if (this.inventoryId < 0) { this.$modal.msgWarning("数据未保存，不可废弃"); return; @@ -743,7 +750,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - let fil ={ + let fil = { id: this.inventoryId } abolitioninventoryApi(fil).then(res => { @@ -765,16 +772,16 @@ export default { async exportExcel() { - let fil ={ + let fil = { inventoryId: this.inventoryId } - exportExcelApi(fil).then(res=>{ - console.log("res",res) + exportExcelApi(fil).then(res => { + console.log("res", res) // this.downloadFile(res); - const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); + const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}); - this.$download.saveAs(blob,this.inventoryForm.orderNumber+'.xlsx') + this.$download.saveAs(blob, this.inventoryForm.orderNumber + '.xlsx') }) }, } @@ -782,19 +789,18 @@ export default {