dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-10-28 17:12:18 +08:00
parent 92eafa75ec
commit bf244b1f50
38 changed files with 1764 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
fuintAdmin/src/api/convenienceStore/inventory.js Normal file
View File

@ -0,0 +1,87 @@
import request from '@/utils/request'
/**
* 订单
*/
export function getInventoryPageApi(query) {
return request({
url: '/business/convenience/mtInventory/getListByPage',
method: 'get',
params: query
})
}
// 新增
export function addInventoryApi(data) {
return request({
url: '/business/convenience/mtInventory',
method: 'post',
data: data
})
}
// 修改
export function editInventoryApi(data) {
return request({
url: '/business/convenience/mtInventory',
method: 'put',
data: data
})
}
/**
* 订单详情
*/
export function getInventoryDetailsPageApi(query) {
return request({
url: '/business/convenience/mtInventoryDetails/getListByPage',
method: 'get',
params: query
})
}
export function delDetailsApi(query) {
return request({
url: '/business/convenience/mtInventoryDetails',
method: 'delete',
params: query
})
}
export function batchProcessingApi(data) {
return request({
url: '/business/convenience/mtInventoryDetails/batchProcessing',
method: 'post',
data: data
})
}
// 审核
export function auditInventoryApi(data) {
return request({
url: 'business/convenience/mtInventory/audit',
method: 'get',
params: data
})
}
// 入库
export function storageInventoryApi(data) {
return request({
url: 'business/convenience/mtInventory/storage',
method: 'get',
params: data
})
}
// 作废
export function abolitionInventoryApi(data) {
return request({
url: 'business/convenience/mtInventory/abolition',
method: 'get',
params: data
})
}

31
fuintAdmin/src/api/convenienceStore/purchase.js
View File

@ -58,3 +58,34 @@ export function batchProcessingApi(data) {
data: data
})
}
// 审核
export function auditPurchaseApi(data) {
return request({
url: 'business/convenience/mtPurchase/audit',
method: 'get',
params: data
})
}
// 入库
export function storagePurchaseApi(data) {
return request({
url: 'business/convenience/mtPurchase/storage',
method: 'get',
params: data
})
}
// 作废
export function abolitionPurchaseApi(data) {
return request({
url: 'business/convenience/mtPurchase/abolition',
method: 'get',
params: data
})
}

28
fuintAdmin/src/api/convenienceStore/returns.js
View File

@ -58,3 +58,31 @@ export function batchProcessingApi(data) {
data: data
})
}
// 审核
export function auditReturnsApi(data) {
return request({
url: 'business/convenience/mtReturns/audit',
method: 'get',
params: data
})
}
// 入库
export function storageReturnsApi(data) {
return request({
url: 'business/convenience/mtReturns/storage',
method: 'get',
params: data
})
}
// 作废
export function abolitionReturnsApi(data) {
return request({
url: 'business/convenience/mtReturns/abolition',
method: 'get',
params: data
})
}

12
fuintAdmin/src/api/oilConfig/oilTank.js
View File

@ -35,7 +35,7 @@ export function cleanTankApi(data) {
})
}
// 初始化信息
// 导出信息
export function exportExcelTankApi(data) {
return request({
url: 'business/petrolStationManagement/oilTank/exportExcel',
@ -45,4 +45,14 @@ export function exportExcelTankApi(data) {
})
}
// 导出 Excel 文件
export function exportExcelTank(data) {
return request({
url: 'business/petrolStationManagement/oilTank/exportExcel',
method: 'post',
responseType: 'blob', // 表明响应类型为二进制流
data: data // 通过 data 参数传递需要的数据
});
}

109
fuintAdmin/src/views/convenienceStore/purchase/details.vue
View File

@ -27,12 +27,13 @@
<el-form-item label="盘点单号">
<el-input v-model="purchaseForm.orderNumber"
style="width: 220Px">
style="width: 220Px" :disabled="numberInput">
<el-button slot="append" @click="refresh()" icon="el-icon-refresh"></el-button>
</el-input>
</el-form-item>
<el-form-item label="盘点时间" >
<el-date-picker
:disabled="numberInput"
style="width: 220Px"
v-model="purchaseForm.orderDate"
type="date"
@ -45,7 +46,7 @@
<div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="auditFlag" @click="storage">盘点并处理库存</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled=" storageFlag" @click="storage()">进货并入库</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
</div>
@ -206,12 +207,8 @@
<script>
import {getAuditPremApi} from "@/api/oilConfig/staff";
import {
abolitionInventoryApi,
auditInventoryApi,
delInventoryOrderApi,
storageInventoryApi
} from "@/api/oilConfig/oilInventory";
import {BigNumber} from "bignumber.js";
import {listLJGoods} from "@/api/convenienceStore/ljgoods";
import {getName,parseTime} from "../../../utils/fuint";
@ -222,7 +219,10 @@ import {
delDetailsApi,
editPurchaseApi,
addPurchaseApi,
batchProcessingApi
batchProcessingApi,
auditPurchaseApi,
storagePurchaseApi,
abolitionPurchaseApi,
} from "@/api/convenienceStore/purchase";
@ -269,7 +269,7 @@ export default {
saveFlag:false,
auditFlag:false,
voidFlag:false,
storageFlag:true,
storageFlag:false,
multipleSelection:[], // 表格
// 弹出框标题
@ -284,8 +284,8 @@ export default {
// 查询参数
queryParams: {
supplierId: '',
inventoryId: null,
// supplierId: '',
purchaseId: null,
page:null,
pageSize:null
},
@ -306,6 +306,7 @@ export default {
this.purchaseForm.purchaseId = this.$props.PpurchaseId
this.purchaseId = this.$props.PpurchaseId
this.queryParams.purchaseId = this.$props.PpurchaseId
this.purchaseForm.orderNumber = this.$props.PorderNumber
this.purchaseForm.orderDate = this.$props.PorderDate
this.purchaseForm.approvalStatus = this.$props.PapprovalStatus
@ -333,11 +334,12 @@ export default {
this.getDetailsList();
this.getQueryList();
this.JudgmentButton();
},
methods: {
getDetailsList() {
let this_ = this
getPurchaseDetailsPageApi().then(res=>{
getPurchaseDetailsPageApi(this.queryParams).then(res=>{
this_.detailsList = res.data.records;
this.total = res.data.total;
this.sumMethod(res.data.records);
@ -453,8 +455,8 @@ export default {
// 刷新订单编号
refresh() {
let timestamp = new Date().getTime();
let min = 100; // 最小的四位数是 1000
let max = 999; // 最大的四位数是 9999
let min = 100; // 最小的四位数是 100
let max = 999; // 最大的四位数是 999
let randomFourDigitNumber = Math.floor(Math.random() * (max - min + 1)) + min;
this.purchaseForm.orderNumber = timestamp+randomFourDigitNumber.toString();
},
@ -463,17 +465,21 @@ export default {
// 判断按钮是否可用
async JudgmentButton(){
let judgmentPermissions1 = await this.judgmentPermissions("盘点审核");
let judgmentPermissions1 = await this.judgmentPermissions("进货审核");
if (judgmentPermissions1 > 0){
this.auditFlag=false,
this.voidFlag=false
this.auditFlag=false
// this.voidFlag=false
} else {
this.auditFlag=true
}
let judgmentPermissions2 = await this.judgmentPermissions("盘点入库");
let judgmentPermissions2 = await this.judgmentPermissions("进货入库");
if (judgmentPermissions2 > 0){
this.storageFlag = false
}else {
this.storageFlag = true
}
let judgmentPermissions3 = await this.judgmentPermissions("盘点废止");
let judgmentPermissions3 = await this.judgmentPermissions("进货废止");
if (judgmentPermissions3 > 0){
this.voidFlag=false
}else {
@ -492,7 +498,7 @@ export default {
});
},
async save(){
async save(flag){
let this_ = this
// 保存之前进行判断
if (this_.purchaseForm.orderNumber == null) {
@ -510,13 +516,15 @@ export default {
// 新增
await addPurchaseApi(this_.purchaseForm).then(res=>{
this_.purchaseId = res.data.id
this.queryParams.purchaseId = res.data.id
}).catch(res=>{
this.$modal.msgError("保存失败");
return;
})
}else {
// 修改
this_.purchaseForm.id = this_.purchaseId
this_.purchaseForm.id = this_.purchaseId
this.queryParams.purchaseId = this_.purchaseId
await editPurchaseApi(this_.purchaseForm).then(res=> {
}).catch(res=>{
this.$modal.msgError("保存失败");
@ -530,27 +538,38 @@ export default {
})
await batchProcessingApi(this_.detailsList).then(res=>{
console.log("22222222222222")
this.$modal.msgSuccess("保存成功");
this.goToAbout();
if (flag == -1) {
this.goToAbout();
}
}).catch(res=>{
this.$modal.msgError("保存失败");
})
},
// 保存并审核
audit(){
async audit(){
// 保存
let number = this.save();
let number = await this.save(-1);
if (number != -1) {
// 审核
let fil ={
id: this.inventoryId
id: this.purchaseId
}
console.log(" id: this.purchaseId",fil)
auditInventoryApi(fil).then(res => {
this.state = 'ysh'
this.$modal.msgWarning("审核成功");
this.goToAbout()
console.log(" id: this.purchaseId1",fil)
await auditPurchaseApi(fil).then(res => {
if (res.data) {
this.state = 'ysh'
this.$modal.msgWarning("审核成功");
this.goToAbout()
} else {
this.$modal.msgWarning("暂无审核权限");
}
})
}
},
@ -558,13 +577,18 @@ export default {
// 入库
storage() {
let this_ = this;
if (this_.inventoryNo.inventoryNo == null) {
this.$modal.msgWarning("请先选择进货单号");
return;
}else if (this_.inventoryNo.inventoryDate==null) {
this.$modal.msgWarning("请先选择进货时间");
return;
// 保存之前进行判断
if (this_.purchaseForm.orderNumber == null) {
this.$modal.msgError("进货单号不能为空");
return -1;
}else if (this_.purchaseForm.orderDate == null) {
this.$modal.msgError("进货时间不能为空");
return -1;
}else if(this_.detailsList.length<=0) {
this.$modal.msgError("进货单不能为空");
return -1;
}
this.$confirm('确认后盘点中的对应油品入库油罐库存将发生变化，且不可逆，确认已按照盘点数量入库吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -572,9 +596,10 @@ export default {
}).then(() => {
// 审核
let fil ={
id: this.inventoryId
id: this.purchaseId
}
storageInventoryApi(fil).then(res => {
console.log("fil",fil)
storagePurchaseApi(fil).then(res => {
this.state = 'qrts'
this.$modal.msgWarning("入库成功");
})
@ -587,7 +612,7 @@ export default {
},
// 作废
abolition(){
if (this.inventoryId < 0) {
if (this.PurchaseId < 0) {
this.$modal.msgWarning("数据未保存，不可废弃");
return;
}
@ -597,9 +622,9 @@ export default {
type: 'warning'
}).then(() => {
let fil ={
id: this.inventoryId
id: this.PurchaseId
}
abolitionInventoryApi(fil).then(res => {
abolitionPurchaseApi(fil).then(res => {
if (res.data) {
this.state = 'yzf'
this.$modal.msgWarning("作废成功");

98
fuintAdmin/src/views/convenienceStore/returns/details.vue
View File

@ -27,25 +27,27 @@
<el-form-item label="退货单号">
<el-input v-model="returnsForm.orderNumber"
:disabled="numberInput"
style="width: 220Px">
<el-button slot="append" @click="refresh()" icon="el-icon-refresh"></el-button>
</el-input>
</el-form-item>
<el-form-item label="退货时间" >
<el-date-picker
:disabled="numberInput"
style="width: 220Px"
v-model="returnsForm.orderDate"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-date-picker>
</el-form-item>
</el-form>
</div>
</div>
<div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="auditFlag" @click="storage">退货处理库存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
</div>
@ -206,12 +208,6 @@
<script>
import {getAuditPremApi} from "@/api/oilConfig/staff";
import {
abolitionInventoryApi,
auditInventoryApi,
delInventoryOrderApi,
storageInventoryApi
} from "@/api/oilConfig/oilInventory";
import {BigNumber} from "bignumber.js";
import {listLJGoods} from "@/api/convenienceStore/ljgoods";
import {getName,parseTime} from "../../../utils/fuint";
@ -222,7 +218,10 @@ import {
delDetailsApi,
editReturnsApi,
addReturnsApi,
batchProcessingApi
batchProcessingApi,
auditReturnsApi,
storageReturnsApi,
abolitionReturnsApi
} from "@/api/convenienceStore/returns";
@ -267,8 +266,8 @@ export default {
state:'await',
saveFlag:false,
auditFlag:false,
voidFlag:false,
auditFlag:true,
voidFlag:true,
storageFlag:true,
multipleSelection:[], // 表格
@ -284,8 +283,8 @@ export default {
// 查询参数
queryParams: {
supplierId: '',
inventoryId: null,
// supplierId: '',
returnsId: null,
page:null,
pageSize:null
},
@ -306,6 +305,7 @@ export default {
this.returnsForm.returnsId = this.$props.PreturnsId
this.returnsId = this.$props.PreturnsId
this.queryParams.returnsId = this.$props.PreturnsId
this.returnsForm.orderNumber = this.$props.PorderNumber
this.returnsForm.orderDate = this.$props.PorderDate
this.returnsForm.approvalStatus = this.$props.PapprovalStatus
@ -332,11 +332,12 @@ export default {
this.getDetailsList();
this.getQueryList();
this.JudgmentButton();
},
methods: {
getDetailsList() {
let this_ = this
getReturnsDetailsPageApi().then(res=>{
getReturnsDetailsPageApi(this.queryParams).then(res=>{
this_.detailsList = res.data.records;
this.total = res.data.total;
this.sumMethod(res.data.records);
@ -466,17 +467,17 @@ export default {
// 判断按钮是否可用
async JudgmentButton(){
let judgmentPermissions1 = await this.judgmentPermissions("盘点审核");
let judgmentPermissions1 = await this.judgmentPermissions("退货审核");
if (judgmentPermissions1 > 0){
this.auditFlag=false,
this.voidFlag=false
}
let judgmentPermissions2 = await this.judgmentPermissions("盘点入库");
let judgmentPermissions2 = await this.judgmentPermissions("退货出库");
if (judgmentPermissions2 > 0){
this.storageFlag = false
}
let judgmentPermissions3 = await this.judgmentPermissions("盘点废止");
let judgmentPermissions3 = await this.judgmentPermissions("退货废止");
if (judgmentPermissions3 > 0){
this.voidFlag=false
}else {
@ -495,17 +496,17 @@ export default {
});
},
async save(){
async save(flag){
let this_ = this
// 保存之前进行判断
if (this_.returnsForm.orderNumber == null) {
this.$modal.msgError("进货单号不能为空");
this.$modal.msgError("退货单号不能为空");
return -1;
}else if (this_.returnsForm.orderDate == null) {
this.$modal.msgError("进货时间不能为空");
this.$modal.msgError("退货时间不能为空");
return -1;
}else if(this_.detailsList.length<=0) {
this.$modal.msgError("进货单不能为空");
this.$modal.msgError("退货单不能为空");
return -1;
}
@ -514,6 +515,7 @@ export default {
this_.returnsForm.approvalStatus = 'await'
await addReturnsApi(this_.returnsForm).then(res=>{
this_.returnsId = res.data.id
this.queryParams.returnsId = res.data.id
}).catch(res=>{
this.$modal.msgError("保存失败");
return;
@ -521,6 +523,7 @@ export default {
}else {
// 修改
this_.returnsForm.id = this_.returnsId
this.queryParams.returnsId = this_.returnsId
await editReturnsApi(this_.returnsForm).then(res=> {
}).catch(res=>{
this.$modal.msgError("保存失败");
@ -535,25 +538,31 @@ export default {
await batchProcessingApi(this_.detailsList).then(res=>{
this.$modal.msgSuccess("保存成功");
this.goToAbout();
if (flag != -1) {
this.goToAbout();
}
}).catch(res=>{
this.$modal.msgError("保存失败");
})
},
// 保存并审核
audit(){
async audit(){
// 保存
let number = this.save();
let number = await this.save(-1);
if (number != -1) {
// 审核
let fil ={
id: this.inventoryId
id: this.returnsId
}
console.log(" id: this.ReturnsId",fil)
auditInventoryApi(fil).then(res => {
this.state = 'ysh'
this.$modal.msgWarning("审核成功");
await auditReturnsApi(fil).then(res => {
if (res.data) {
this.state = 'ysh'
this.$modal.msgWarning("审核成功");
}else {
this.$modal.msgWarning("暂无审核权限");
}
this.goToAbout()
})
}
@ -562,13 +571,18 @@ export default {
// 入库
storage() {
let this_ = this;
if (this_.inventoryNo.inventoryNo == null) {
this.$modal.msgWarning("请先选择进货单号");
return;
}else if (this_.inventoryNo.inventoryDate==null) {
this.$modal.msgWarning("请先选择进货时间");
return;
// 保存之前进行判断
if (this_.returnsForm.orderNumber == null) {
this.$modal.msgError("退货单号不能为空");
return -1;
}else if (this_.returnsForm.orderDate == null) {
this.$modal.msgError("退货时间不能为空");
return -1;
}else if(this_.detailsList.length<=0) {
this.$modal.msgError("退货单不能为空");
return -1;
}
this.$confirm('确认后盘点中的对应油品入库油罐库存将发生变化，且不可逆，确认已按照盘点数量入库吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -576,9 +590,9 @@ export default {
}).then(() => {
// 审核
let fil ={
id: this.inventoryId
id: this.returnsId
}
storageInventoryApi(fil).then(res => {
storageReturnsApi(fil).then(res => {
this.state = 'qrts'
this.$modal.msgWarning("入库成功");
})
@ -588,10 +602,12 @@ export default {
message: '已取消'
});
});
},
},
// 作废
abolition(){
if (this.inventoryId < 0) {
if (this.returnsId < 0) {
this.$modal.msgWarning("数据未保存，不可废弃");
return;
}
@ -601,9 +617,9 @@ export default {
type: 'warning'
}).then(() => {
let fil ={
id: this.inventoryId
id: this.returnsId
}
abolitionInventoryApi(fil).then(res => {
abolitionReturnsApi(fil).then(res => {
if (res.data) {
this.state = 'yzf'
this.$modal.msgWarning("作废成功");

3
fuintAdmin/src/views/oilConfig/oilInventory/list.vue
View File

@ -8,7 +8,8 @@
<el-form-item label="状态" v-model="queryParams.status" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%">
<el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%" clearable
>
<el-option
v-for="dict in dict.type.oilPurchasedStatus"
:key="dict.value"

10
fuintAdmin/src/views/oilConfig/oilInventory/order.vue
View File

@ -34,7 +34,7 @@
<div style="height: 100%; width: 30%; display: flex; flex-direction: column; justify-content: space-between;">
<el-form ref="myForm" label-width="100px">
<el-form-item label="盘点单号">
<el-input v-model="inventoryNo.inventoryNo" @change="saveJudgment"
<el-input v-model="inventoryNo.inventoryNo" @change="saveJudgment" :disabled="numberInput"
style="width: 220Px">
<el-button slot="append" @click="refresh()" icon="el-icon-refresh"></el-button>
</el-input>
@ -44,6 +44,7 @@
style="width: 220Px"
v-model="inventoryNo.inventoryDate"
@change="saveJudgment"
:disabled="numberInput"
type="date"
placeholder="选择日期">
</el-date-picker>
@ -96,7 +97,7 @@
</el-table-column>
<el-table-column label="库存差异升数(L)" align="center" prop="stockDifference"/>
<el-table-column label="盈亏金额" align="center" prop="profitLossAmount"/>
<el-table-column v-if="state =='await' || state=='ysh'"label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column v-if="state =='await' || state=='ysh'" label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@ -337,8 +338,9 @@ export default {
this.$route.query.inventoryTime;
this.inventoryNo.inventoryDate = new Date(parseInt(this.$route.query.inventoryDate))
if (this.$route.query.inventoryDate != null) {
this.inventoryNo.inventoryDate = new Date(parseInt(this.$route.query.inventoryDate))
}
if (this.inventoryNo.inventoryDate == null) {
this.inventoryNo.inventoryDate = new Date()

6
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -3,7 +3,8 @@
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="供应商名称" prop="supplierName">
<el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width:100%">
<el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width:100%" clearable
>
<el-option
v-for="option in suppliersList"
:key="option.id"
@ -19,7 +20,8 @@
<el-form-item label="状态" v-model="queryParams.status" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择供应商" style="width:100%">
<el-select v-model="queryParams.status" placeholder="请选择供应商" style="width:100%" clearable
>
<el-option
v-for="dict in dict.type.oilPurchasedStatus"
:key="dict.value"

45
fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
View File

@ -25,7 +25,7 @@
<div style="height: 100%; width: 40%; display: flex; flex-direction: column; justify-content: space-between;">
<el-form ref="myForm" label-width="100px">
<el-form-item label="进货单号">
<el-input v-model="purchaseForm.purchaseNo" @change="saveJudgment"
<el-input v-model="purchaseForm.purchaseNo" @change="saveJudgment" :disabled="numberInput"
style="width: 220Px">
<el-button slot="append" @click="refresh()" icon="el-icon-refresh"></el-button>
</el-input>
@ -35,6 +35,7 @@
style="width: 220Px"
v-model="purchaseForm.purchaseDate"
@change="saveJudgment"
:disabled="numberInput"
type="date"
placeholder="选择日期">
</el-date-picker>
@ -76,22 +77,22 @@
<!-- <el-table-column label="入库前库存" align="center" prop="preInboundInventory"/>-->
<el-table-column label="油品密度(g/ml)" align="center" prop="productDensity">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.productDensity" @change="change(scope.row)" controls-position="right" :min="0.000001" :max="1000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.productDensity" @change="change(scope.row)" controls-position="right" :min="0" :max="10000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="采购吨数(t)" align="center" prop="purchaseWeight">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.purchaseWeight" @change="change(scope.row)" controls-position="right" :min="0.000001" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.purchaseWeight" @change="change(scope.row)" controls-position="right" :min="0" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column :disabled="numberInput" label="采购单价(元/吨)" align="center" prop="purchasePrice">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.purchasePrice" @change="change(scope.row)" controls-position="right" :min="0.000001" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.purchasePrice" @change="change(scope.row)" controls-position="right" :min="0" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="小计金额（元）" align="center" prop="totalAmount">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.totalAmount" @change="change(scope.row)" controls-position="right" :min="0.000001" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.totalAmount" @change="change(scope.row)" controls-position="right" :min="0" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="采购升数（L）" align="center" prop="purchaseVolume"/>
@ -365,9 +366,11 @@ export default {
// this.purchaseForm.purchaseDate = localDate;
// console.log("this.purchaseForm.purchaseDate:", this.purchaseForm.purchaseDate);
this.purchaseForm.purchaseDate = new Date(parseInt(this.$route.query.purchaseDate))
if (this.$route.query.purchaseDate != null) {
this.purchaseForm.purchaseDate = new Date(parseInt(this.$route.query.purchaseDate))
}
console.log("this.purchaseForm.purchaseDate",this.purchaseForm.purchaseDate)
if (this.purchaseForm.purchaseDate == null) {
this.purchaseForm.purchaseDate = new Date()
}
@ -519,7 +522,7 @@ export default {
})
},
// 保存订单信息
savePurchase(){
async savePurchase(flag){
if (this.purchaseForm.purchaseNo == null) {
this.$modal.msgWarning("请先选择进货单号");
return -1;
@ -545,15 +548,19 @@ export default {
this.queryParams.purchaseId = response.data.id,
this.purchaseId = response.data.id,
this.purchaseNo = response.data.purchaseNo,
this.state = response.data.status,
this.state = response.data.status
//todo 优化 将这些代码加到后台中完成并进行事务管理
editPurchuseApi(oilPurchase).then(response2 => {
this.$router.push({ path: '/oilPurchase/purchaseOrder', query: {
purchaseId: oilPurchase.purchaseId,
purchaseNo: response.data.purchaseNo,
state: response.data.status
editPurchuseApi(oilPurchase).then(response2 => {
if (flag != -1) {
// this.$router.push({ path: '/oilPurchase/purchaseOrder', query: {
// purchaseId: oilPurchase.purchaseId,
// purchaseNo: response.data.purchaseNo,
// state: response.data.status
// }});
this.$router.push('/oilConfig/oilPurchase/list');
}
});
})
this.getList();
});
@ -600,16 +607,17 @@ export default {
},
// 保存并审核
audit(){
async audit(){
// 保存
let number = this.savePurchase();
let number = await this.savePurchase(-1);
if (number != -1) {
// 审核
let fil ={
id: this.purchaseId
}
console.log(" id: this.purchaseId",fil)
auditApi(fil).then(res => {
await auditApi(fil).then(res => {
if (res.data) {
this.state = 'ysh'
this.numberInput= true
@ -617,7 +625,6 @@ export default {
this.$router.push('/oilConfig/oilPurchase/list');
}else {
this.$modal.msgWarning("暂无审核权限");
}
})

45
fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
View File

@ -4,7 +4,8 @@
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="油品" prop="oilNumber">
<el-select v-model="queryParams.numberId" placeholder="请选择油品" style="width:100%" @change="chooseOilNumber()">
<el-select v-model="queryParams.numberId" placeholder="请选择油品" style="width:100%" @change="chooseOilNumber()" clearable
>
<el-option
v-for="option in selectOilTypeByPrice"
:key="option.numberId"
@ -25,7 +26,7 @@
/>
</el-form-item>
<el-form-item label="状态" v-model="queryParams.status" prop="status">
<el-form-item label="状态" v-model="queryParams.status" prop="status" clearable>
<el-select v-model="queryParams.status" placeholder="" style="width:100%">
<el-option label="全部" value=""></el-option>
<el-option
@ -47,11 +48,14 @@
<!-- 列表-->
<el-card style="margin-top: 20px" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<h3>油罐列表</h3>
</el-col>
</el-col> -->
<!-- <el-button @click="exportExcelTank()">导出</el-button>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">123123123</right-toolbar>-->
<div style="display: flex;justify-content: space-between">
<div style="font-size: 18px">油罐列表</div>
<el-button type="primary" @click="exportExcelTank()">导出</el-button>
</div>
</el-row>
<el-table ref="tables"
@ -220,20 +224,31 @@ export default {
methods: {
exportExcelTank() {
console.log("resbgdfgddffffffffffffffffffffffffffffffffffffffffffffffff")
exportExcelTankApi().then(res=>{
console.log("res",res)
const blob = new Blob([res], {
type: 'application/vnd.ms-excel'
});
let link = document.createElement('a');
link.href = URL.createObjectURL(blob);
link.setAttribute('download', '存油统计.xlsx');
link.click();
link = null;
// this.downloadFile(res);
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'库存统计.xLsx')
})
},
downloadFile(blobData) {
this.$down()
// 创建一个 Blob 对象，并创建一个 URL，用于下载文件
const blob = new Blob([blobData], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
const url = window.URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
// 设置下载文件的名称
link.setAttribute('download', 'exportedFile.xlsx');
// 模拟点击链接进行下载
link.click();
},
getList() {
getTankApi(this.queryParams).then(res=>{
this.statisticsList = res.data.records

92
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryController.java Normal file
View File

@ -0,0 +1,92 @@
package com.fuint.business.convenienceSore.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.service.MtInventoryService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 商品盘点表(MtInventory)表控制层
*
* @author makejava
* @since 2023-10-28 14:45:20
*/
@RestController
@RequestMapping("mtInventory")
public class MtInventoryController extends BaseController {
/**
* 服务对象
*/
@Resource
private MtInventoryService mtInventoryService;
/**
* 分页查询
*
* @param mtInventory 筛选条件
* @param pageRequest 分页对象
* @return 查询结果
*/
@GetMapping("/queryByPage")
public ResponseObject queryByPage(MtInventory mtInventory,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
com.baomidou.mybatisplus.extension.plugins.pagination.Page page =new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo,pageSize);
IPage<MtInventory> list = mtInventoryService.queryByPage(page,mtInventory);
return getSuccessResult(list);
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping("{id}")
public ResponseObject queryById(@PathVariable("id") Integer id) {
return getSuccessResult(this.mtInventoryService.queryById(id));
}
/**
* 新增数据
*
* @param mtInventory 实体
* @return 新增结果
*/
@PostMapping
public ResponseObject add(@RequestBody MtInventory mtInventory) {
return getSuccessResult(this.mtInventoryService.insert(mtInventory));
}
/**
* 编辑数据
*
* @param mtInventory 实体
* @return 编辑结果
*/
@PutMapping
public ResponseObject edit(@RequestBody MtInventory mtInventory) {
return getSuccessResult(this.mtInventoryService.update(mtInventory));
}
/**
* 删除数据
*
* @param id 主键
* @return 删除是否成功
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
return getSuccessResult(this.mtInventoryService.deleteById(id));
}
}

93
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java Normal file
View File

@ -0,0 +1,93 @@
package com.fuint.business.convenienceSore.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.service.MtInventoryDetailsService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 盘点详情表(MtInventoryDetails)表控制层
*
* @author makejava
* @since 2023-10-28 14:45:43
*/
@RestController
@RequestMapping("mtInventoryDetails")
public class MtInventoryDetailsController extends BaseController {
/**
* 服务对象
*/
@Resource
private MtInventoryDetailsService mtInventoryDetailsService;
/**
* 分页查询
*
* @param mtInventoryDetails 筛选条件
* @param pageNo
* @param pageSize
* @return 查询结果
*/
@GetMapping("/queryByPage")
public ResponseObject queryByPage(MtInventoryDetails mtInventoryDetails,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
com.baomidou.mybatisplus.extension.plugins.pagination.Page page =new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo,pageSize);
IPage<MtInventoryDetails> list = mtInventoryDetailsService.queryByPage(page,mtInventoryDetails);
return getSuccessResult(list);
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping("{id}")
public ResponseObject queryById(@PathVariable("id") Integer id) {
return getSuccessResult(this.mtInventoryDetailsService.queryById(id));
}
/**
* 新增数据
*
* @param mtInventoryDetails 实体
* @return 新增结果
*/
@PostMapping
public ResponseObject add(@RequestBody MtInventoryDetails mtInventoryDetails) {
return getSuccessResult(this.mtInventoryDetailsService.insert(mtInventoryDetails));
}
/**
* 编辑数据
*
* @param mtInventoryDetails 实体
* @return 编辑结果
*/
@PutMapping
public ResponseObject edit(@RequestBody MtInventoryDetails mtInventoryDetails) {
return getSuccessResult(this.mtInventoryDetailsService.update(mtInventoryDetails));
}
/**
* 删除数据
*
* @param id 主键
* @return 删除是否成功
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
return getSuccessResult(this.mtInventoryDetailsService.deleteById(id));
}
}

60
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java Normal file
View File

@ -0,0 +1,60 @@
package com.fuint.business.convenienceSore.entity;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
/**
* 商品盘点表(MtInventory)实体类
*
* @author makejava
* @since 2023-10-28 14:45:20
*/
@Data
public class MtInventory extends BaseEntity {
private static final long serialVersionUID = -65570314745243532L;
/**
* 盘点ID（主键）
*/
private Integer inventoryId;
/**
* 业务单号
*/
private String orderNumber;
/**
* 审核状态
*/
private String approvalStatus;
/**
* 制单日期
*/
private Date orderDate;
/**
* 审核人
*/
private String approver;
/**
* 确认人
*/
private String confirmer;
/**
* 盈亏金额
*/
private Double profitLossAmount;
/**
* 库存差异
*/
private Double inventoryDiscrepancy;
/**
* 盘点数量
*/
private Integer inventoryQuantity;
/**
* 店铺ID
*/
private Integer storeId;
}

55
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventoryDetails.java Normal file
View File

@ -0,0 +1,55 @@
package com.fuint.business.convenienceSore.entity;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
/**
* 盘点详情表(MtInventoryDetails)实体类
*
* @author makejava
* @since 2023-10-28 14:45:44
*/
@Data
public class MtInventoryDetails extends BaseEntity {
private static final long serialVersionUID = 220628641692116040L;
/**
* 盘点详情ID（主键）
*/
private Integer id;
/**
* 商品ID
*/
private Integer productId;
/**
* 盘点ID
*/
private Integer inventoryId;
/**
* 进价
*/
private Double purchasePrice;
/**
* 库存
*/
private Integer stock;
/**
* 盈亏金额
*/
private Double profitLossAmount;
/**
* 库存差异
*/
private Double inventoryDiscrepancy;
/**
* 盘点数量
*/
private Integer inventoryQuantity;
/**
* 店铺ID
*/
private Integer storeId;
}

86
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtInventoryDetailsMapper.java Normal file
View File

@ -0,0 +1,86 @@
package com.fuint.business.convenienceSore.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 盘点详情表(MtInventoryDetails)表数据库访问层
*
* @author makejava
* @since 2023-10-28 14:45:43
*/
public interface MtInventoryDetailsMapper {
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
MtInventoryDetails queryById(Integer id);
/**
* 查询指定行数据
*
* @param mtInventoryDetails 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
IPage<MtInventoryDetails> queryAllByLimit(Page page, @Param("mtInventoryDetails") MtInventoryDetails mtInventoryDetails);
/**
* 统计总行数
*
* @param mtInventoryDetails 查询条件
* @return 总行数
*/
long count(MtInventoryDetails mtInventoryDetails);
/**
* 新增数据
*
* @param mtInventoryDetails 实例对象
* @return 影响行数
*/
int insert(MtInventoryDetails mtInventoryDetails);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<MtInventoryDetails> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<MtInventoryDetails> entities);
/**
* 批量新增或按主键更新数据（MyBatis原生foreach方法）
*
* @param entities List<MtInventoryDetails> 实例对象列表
* @return 影响行数
* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
*/
int insertOrUpdateBatch(@Param("entities") List<MtInventoryDetails> entities);
/**
* 修改数据
*
* @param mtInventoryDetails 实例对象
* @return 影响行数
*/
int update(MtInventoryDetails mtInventoryDetails);
/**
* 通过主键删除数据
*
* @param id 主键
* @return 影响行数
*/
int deleteById(Integer id);
}

87
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtInventoryMapper.java Normal file
View File

@ -0,0 +1,87 @@
package com.fuint.business.convenienceSore.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 商品盘点表(MtInventory)表数据库访问层
*
* @author makejava
* @since 2023-10-28 14:45:20
*/
public interface MtInventoryMapper {
/**
* 通过ID查询单条数据
*
* @param inventoryId 主键
* @return 实例对象
*/
MtInventory queryById(Integer inventoryId);
/**
* 查询指定行数据
*
* @param mtInventory 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
IPage<MtInventory> queryAllByLimit(Page page, @Param("mtPurchaseDetails") MtInventory mtInventory);
/**
* 统计总行数
*
* @param mtInventory 查询条件
* @return 总行数
*/
long count(MtInventory mtInventory);
/**
* 新增数据
*
* @param mtInventory 实例对象
* @return 影响行数
*/
int insert(MtInventory mtInventory);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<MtInventory> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<MtInventory> entities);
/**
* 批量新增或按主键更新数据（MyBatis原生foreach方法）
*
* @param entities List<MtInventory> 实例对象列表
* @return 影响行数
* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
*/
int insertOrUpdateBatch(@Param("entities") List<MtInventory> entities);
/**
* 修改数据
*
* @param mtInventory 实例对象
* @return 影响行数
*/
int update(MtInventory mtInventory);
/**
* 通过主键删除数据
*
* @param inventoryId 主键
* @return 影响行数
*/
int deleteById(Integer inventoryId);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtPurchaseDetailsMapper.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.entity.MtPurchase;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.business.petrolStationManagement.entity.OilInventoryOrder;
import com.fuint.business.petrolStationManagement.vo.OilInventoryOrderVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
@ -36,6 +38,10 @@ public interface MtPurchaseDetailsMapper {
IPage<MtPurchaseDetailsVO> getListByPage(Page page, @Param("mtPurchaseDetails") MtPurchaseDetails mtPurchaseDetails);
List<MtPurchaseDetailsVO> getAllList2(@Param("mtPurchaseDetails") MtPurchaseDetails mtPurchaseDetails);
int editGoods(MtPurchaseDetailsVO mtPurchaseDetails);
/**
* 统计总行数
*

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtPurchaseMapper.java
View File

@ -89,7 +89,7 @@ public interface MtPurchaseMapper {
*/
int deleteById(Integer id);
int editStateById(Integer id,String status);
int editStateById(@Param("id") Integer id,@Param("status") String status);
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtReturnsDetailsMapper.java
View File

@ -38,6 +38,8 @@ public interface MtReturnsDetailsMapper {
IPage<MtReturnsDetailsVO> getListByPage(Page page, @Param("mtReturnsDetails") MtReturnsDetails mtReturnsDetails);
List<MtReturnsDetailsVO> getAllList2(@Param("mtReturnsDetails") MtReturnsDetails mtReturnsDetails);
/**
* 统计总行数
*
@ -89,5 +91,8 @@ public interface MtReturnsDetailsMapper {
*/
int deleteById(Integer purchaseDetailId);
int editGoods(MtReturnsDetailsVO mtReturnsDetailsVO);
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/MtReturnsMapper.java
View File

@ -87,5 +87,8 @@ public interface MtReturnsMapper {
*/
int deleteById(Integer id);
int editStateById(@Param("id") Integer id,@Param("status") String status);
}

209
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtInventoryDetailsMapper.xml Normal file
View File

@ -0,0 +1,209 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.convenienceSore.mapper.MtInventoryDetailsMapper">
<resultMap type="com.fuint.business.convenienceSore.entity.MtInventoryDetails" id="MtInventoryDetailsMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="productId" column="product_id" jdbcType="INTEGER"/>
<result property="inventoryId" column="inventory_id" jdbcType="INTEGER"/>
<result property="purchasePrice" column="purchase_price" jdbcType="NUMERIC"/>
<result property="stock" column="stock" jdbcType="INTEGER"/>
<result property="profitLossAmount" column="profit_loss_amount" jdbcType="NUMERIC"/>
<result property="inventoryDiscrepancy" column="inventory_discrepancy" jdbcType="NUMERIC"/>
<result property="inventoryQuantity" column="inventory_quantity" jdbcType="INTEGER"/>
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="INTEGER"/>
<result property="updateBy" column="update_by" jdbcType="INTEGER"/>
</resultMap>
<!--查询单个-->
<select id="queryById" resultMap="MtInventoryDetailsMap">
select
id, product_id, inventory_id, purchase_price, stock, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by
from mt_inventory_details
where id = #{id}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="MtInventoryDetailsMap">
select
id, product_id, inventory_id, purchase_price, stock, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by
from mt_inventory_details
<where>
<if test="id != null">
and id = #{id}
</if>
<if test="productId != null">
and product_id = #{productId}
</if>
<if test="inventoryId != null">
and inventory_id = #{inventoryId}
</if>
<if test="purchasePrice != null">
and purchase_price = #{purchasePrice}
</if>
<if test="stock != null">
and stock = #{stock}
</if>
<if test="profitLossAmount != null">
and profit_loss_amount = #{profitLossAmount}
</if>
<if test="inventoryDiscrepancy != null">
and inventory_discrepancy = #{inventoryDiscrepancy}
</if>
<if test="inventoryQuantity != null">
and inventory_quantity = #{inventoryQuantity}
</if>
<if test="storeId != null">
and store_id = #{storeId}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="createBy != null">
and create_by = #{createBy}
</if>
<if test="updateBy != null">
and update_by = #{updateBy}
</if>
</where>
</select>
<!--统计总行数-->
<select id="count" resultType="java.lang.Long">
select count(1)
from mt_inventory_details
<where>
<if test="id != null">
and id = #{id}
</if>
<if test="productId != null">
and product_id = #{productId}
</if>
<if test="inventoryId != null">
and inventory_id = #{inventoryId}
</if>
<if test="purchasePrice != null">
and purchase_price = #{purchasePrice}
</if>
<if test="stock != null">
and stock = #{stock}
</if>
<if test="profitLossAmount != null">
and profit_loss_amount = #{profitLossAmount}
</if>
<if test="inventoryDiscrepancy != null">
and inventory_discrepancy = #{inventoryDiscrepancy}
</if>
<if test="inventoryQuantity != null">
and inventory_quantity = #{inventoryQuantity}
</if>
<if test="storeId != null">
and store_id = #{storeId}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="createBy != null">
and create_by = #{createBy}
</if>
<if test="updateBy != null">
and update_by = #{updateBy}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into mt_inventory_details(product_id, inventory_id, purchase_price, stock, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values (#{productId}, #{inventoryId}, #{purchasePrice}, #{stock}, #{profitLossAmount}, #{inventoryDiscrepancy}, #{inventoryQuantity}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_inventory_details(product_id, inventory_id, purchase_price, stock, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.productId}, #{entity.inventoryId}, #{entity.purchasePrice}, #{entity.stock}, #{entity.profitLossAmount}, #{entity.inventoryDiscrepancy}, #{entity.inventoryQuantity}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_inventory_details(product_id, inventory_id, purchase_price, stock, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.productId}, #{entity.inventoryId}, #{entity.purchasePrice}, #{entity.stock}, #{entity.profitLossAmount}, #{entity.inventoryDiscrepancy}, #{entity.inventoryQuantity}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
on duplicate key update
product_id = values(product_id),
inventory_id = values(inventory_id),
purchase_price = values(purchase_price),
stock = values(stock),
profit_loss_amount = values(profit_loss_amount),
inventory_discrepancy = values(inventory_discrepancy),
inventory_quantity = values(inventory_quantity),
store_id = values(store_id),
create_time = values(create_time),
update_time = values(update_time),
create_by = values(create_by),
update_by = values(update_by)
</insert>
<!--通过主键修改数据-->
<update id="update">
update mt_inventory_details
<set>
<if test="productId != null">
product_id = #{productId},
</if>
<if test="inventoryId != null">
inventory_id = #{inventoryId},
</if>
<if test="purchasePrice != null">
purchase_price = #{purchasePrice},
</if>
<if test="stock != null">
stock = #{stock},
</if>
<if test="profitLossAmount != null">
profit_loss_amount = #{profitLossAmount},
</if>
<if test="inventoryDiscrepancy != null">
inventory_discrepancy = #{inventoryDiscrepancy},
</if>
<if test="inventoryQuantity != null">
inventory_quantity = #{inventoryQuantity},
</if>
<if test="storeId != null">
store_id = #{storeId},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="createBy != null">
create_by = #{createBy},
</if>
<if test="updateBy != null">
update_by = #{updateBy},
</if>
</set>
where id = #{id}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from mt_inventory_details where id = #{id}
</delete>
</mapper>

220
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtInventoryMapper.xml Normal file
View File

@ -0,0 +1,220 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.convenienceSore.mapper.MtInventoryMapper">
<resultMap type="com.fuint.business.convenienceSore.entity.MtInventory" id="MtInventoryMap">
<result property="inventoryId" column="inventory_id" jdbcType="INTEGER"/>
<result property="orderNumber" column="order_number" jdbcType="VARCHAR"/>
<result property="approvalStatus" column="approval_status" jdbcType="VARCHAR"/>
<result property="orderDate" column="order_date" jdbcType="TIMESTAMP"/>
<result property="approver" column="approver" jdbcType="VARCHAR"/>
<result property="confirmer" column="confirmer" jdbcType="VARCHAR"/>
<result property="profitLossAmount" column="profit_loss_amount" jdbcType="NUMERIC"/>
<result property="inventoryDiscrepancy" column="inventory_discrepancy" jdbcType="NUMERIC"/>
<result property="inventoryQuantity" column="inventory_quantity" jdbcType="INTEGER"/>
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="INTEGER"/>
<result property="updateBy" column="update_by" jdbcType="INTEGER"/>
</resultMap>
<!--查询单个-->
<select id="queryById" resultMap="MtInventoryMap">
select
inventory_id, order_number, approval_status, order_date, approver, confirmer, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by
from mt_inventory
where inventory_id = #{inventoryId}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="MtInventoryMap">
select
inventory_id, order_number, approval_status, order_date, approver, confirmer, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by
from mt_inventory
<where>
<if test="inventoryId != null">
and inventory_id = #{inventoryId}
</if>
<if test="orderNumber != null and orderNumber != ''">
and order_number = #{orderNumber}
</if>
<if test="approvalStatus != null and approvalStatus != ''">
and approval_status = #{approvalStatus}
</if>
<if test="orderDate != null">
and order_date = #{orderDate}
</if>
<if test="approver != null and approver != ''">
and approver = #{approver}
</if>
<if test="confirmer != null and confirmer != ''">
and confirmer = #{confirmer}
</if>
<if test="profitLossAmount != null">
and profit_loss_amount = #{profitLossAmount}
</if>
<if test="inventoryDiscrepancy != null">
and inventory_discrepancy = #{inventoryDiscrepancy}
</if>
<if test="inventoryQuantity != null">
and inventory_quantity = #{inventoryQuantity}
</if>
<if test="storeId != null">
and store_id = #{storeId}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="createBy != null">
and create_by = #{createBy}
</if>
<if test="updateBy != null">
and update_by = #{updateBy}
</if>
</where>
</select>
<!--统计总行数-->
<select id="count" resultType="java.lang.Long">
select count(1)
from mt_inventory
<where>
<if test="inventoryId != null">
and inventory_id = #{inventoryId}
</if>
<if test="orderNumber != null and orderNumber != ''">
and order_number = #{orderNumber}
</if>
<if test="approvalStatus != null and approvalStatus != ''">
and approval_status = #{approvalStatus}
</if>
<if test="orderDate != null">
and order_date = #{orderDate}
</if>
<if test="approver != null and approver != ''">
and approver = #{approver}
</if>
<if test="confirmer != null and confirmer != ''">
and confirmer = #{confirmer}
</if>
<if test="profitLossAmount != null">
and profit_loss_amount = #{profitLossAmount}
</if>
<if test="inventoryDiscrepancy != null">
and inventory_discrepancy = #{inventoryDiscrepancy}
</if>
<if test="inventoryQuantity != null">
and inventory_quantity = #{inventoryQuantity}
</if>
<if test="storeId != null">
and store_id = #{storeId}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="createBy != null">
and create_by = #{createBy}
</if>
<if test="updateBy != null">
and update_by = #{updateBy}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="inventoryId" useGeneratedKeys="true">
insert into mt_inventory(order_number, approval_status, order_date, approver, confirmer, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values (#{orderNumber}, #{approvalStatus}, #{orderDate}, #{approver}, #{confirmer}, #{profitLossAmount}, #{inventoryDiscrepancy}, #{inventoryQuantity}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
</insert>
<insert id="insertBatch" keyProperty="inventoryId" useGeneratedKeys="true">
insert into mt_inventory(order_number, approval_status, order_date, approver, confirmer, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.orderNumber}, #{entity.approvalStatus}, #{entity.orderDate}, #{entity.approver}, #{entity.confirmer}, #{entity.profitLossAmount}, #{entity.inventoryDiscrepancy}, #{entity.inventoryQuantity}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="inventoryId" useGeneratedKeys="true">
insert into mt_inventory(order_number, approval_status, order_date, approver, confirmer, profit_loss_amount, inventory_discrepancy, inventory_quantity, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.orderNumber}, #{entity.approvalStatus}, #{entity.orderDate}, #{entity.approver}, #{entity.confirmer}, #{entity.profitLossAmount}, #{entity.inventoryDiscrepancy}, #{entity.inventoryQuantity}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
on duplicate key update
order_number = values(order_number),
approval_status = values(approval_status),
order_date = values(order_date),
approver = values(approver),
confirmer = values(confirmer),
profit_loss_amount = values(profit_loss_amount),
inventory_discrepancy = values(inventory_discrepancy),
inventory_quantity = values(inventory_quantity),
store_id = values(store_id),
create_time = values(create_time),
update_time = values(update_time),
create_by = values(create_by),
update_by = values(update_by)
</insert>
<!--通过主键修改数据-->
<update id="update">
update mt_inventory
<set>
<if test="orderNumber != null and orderNumber != ''">
order_number = #{orderNumber},
</if>
<if test="approvalStatus != null and approvalStatus != ''">
approval_status = #{approvalStatus},
</if>
<if test="orderDate != null">
order_date = #{orderDate},
</if>
<if test="approver != null and approver != ''">
approver = #{approver},
</if>
<if test="confirmer != null and confirmer != ''">
confirmer = #{confirmer},
</if>
<if test="profitLossAmount != null">
profit_loss_amount = #{profitLossAmount},
</if>
<if test="inventoryDiscrepancy != null">
inventory_discrepancy = #{inventoryDiscrepancy},
</if>
<if test="inventoryQuantity != null">
inventory_quantity = #{inventoryQuantity},
</if>
<if test="storeId != null">
store_id = #{storeId},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="createBy != null">
create_by = #{createBy},
</if>
<if test="updateBy != null">
update_by = #{updateBy},
</if>
</set>
where inventory_id = #{inventoryId}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from mt_inventory where inventory_id = #{inventoryId}
</delete>
</mapper>

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml
View File

@ -123,15 +123,11 @@
from mt_purchase_details md
left join mt_goods mg ON md.goods_id = mg.id
<where>
purchase_id = #{mtPurchaseDetails.purchaseId}
<if test="mtPurchaseDetails.goodsId != null">
and goods_id = #{mtPurchaseDetails.goodsId}
</if>
<if test="mtPurchaseDetails.purchaseId != null">
and purchase_id = #{mtPurchaseDetails.purchaseId}
</if>
<if test="mtPurchaseDetails.quantityPurchased != null">
and quantity_purchased = #{mtPurchaseDetails.quantityPurchased}
</if>
<if test="mtPurchaseDetails.unitPrice != null">
and unit_price = #{mtPurchaseDetails.unitPrice}
</if>
@ -143,6 +139,29 @@
</if>
</where>
</select>
<select id="getAllList2" resultType="com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO">
select
md.id id,
md.quantity_purchased quantityPurchased,
md.unit_price unitPrice,
md.subtotal_amount subtotalAmount,
mg.name commodityName,
mg.cvs_good_id cvsGoodId,
mg.unit unit,
mg.supplier_id supplierId,
mg.id goodsId,
mg.stock stock,
mp.order_number orderNumber
from mt_purchase_details md
left join mt_purchase mp ON md.purchase_id = mp.id
left join mt_goods mg ON md.goods_id = mg.id
<where>
purchase_id = #{mtPurchaseDetails.purchaseId}
<if test="mtPurchaseDetails.storeId != null">
and md.store_id = #{mtPurchaseDetails.storeId}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
@ -259,5 +278,13 @@
delete from mt_purchase_details where id = #{id}
</delete>
<update id="editGoods">
update mt_goods set
stock = stock + #{quantityPurchased} ,
update_time = NOW()
where id = #{goodsId}
</update>
</mapper>

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseMapper.xml
View File

@ -138,15 +138,15 @@
LEFT JOIN mt_staff ms1 ON mp.create_by = ms1.id
LEFT JOIN mt_staff ms2 ON mp.approver = ms2.id
<where>
mp.store_id = #{mtPurchase.storeId}
<if test="mtPurchase.approvalStatus != null and mtPurchase.approvalStatus != ''">
and approval_status = #{mtPurchase.approvalStatus}
</if>
<if test="mtPurchase.orderNumber != null and mtPurchase.orderNumber != ''">
and order_number LIKE CONCAT('%', #{mtPurchase.orderNumber}, '%')
</if>
<if test="mtPurchase.storeId != null">
and mp.store_id = #{mtPurchase.storeId}
</if>
<if test="mtPurchase.supplierId != null">
and mp.store_id = #{mtPurchase.storeId}
</if>
@ -248,7 +248,6 @@
update mt_purchase
set approval_status = #{status}
where id = #{id}
</update>
<!--通过主键删除-->

40
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtReturnsDetailsMapper.xml
View File

@ -114,6 +114,7 @@
md.return_quantity returnQuantity,
md.return_price returnPrice,
md.subtotal_amount subtotalAmount,
md.pre_inbound_inventory preInboundInventory,
mg.name commodityName,
mg.cvs_good_id cvsGoodId,
mg.unit unit,
@ -123,26 +124,45 @@
from mt_returns_details md
left join mt_goods mg ON md.goods_id = mg.id
<where>
md.store_id = #{mtReturnsDetails.storeId}
and returns_id = #{mtReturnsDetails.returnsId}
<if test="mtReturnsDetails.goodsId != null">
and goods_id = #{mtReturnsDetails.goodsId}
</if>
<if test="mtReturnsDetails.returnsId != null">
and returns_id = #{mtReturnsDetails.returnsId}
</if>
<if test="mtReturnsDetails.returnQuantity != null">
and return_quantity = #{mtReturnsDetails.returnQuantity}
</if>
<if test="mtReturnsDetails.returnPrice != null">
and return_price = #{mtReturnsDetails.returnPrice}
</if>
<if test="mtReturnsDetails.subtotalAmount != null">
and subtotal_amount = #{mtReturnsDetails.subtotalAmount}
</if>
<if test="mtReturnsDetails.storeId != null">
and md.store_id = #{mtReturnsDetails.storeId}
</if>
</where>
</select>
<select id="getAllList2" resultType="com.fuint.business.convenienceSore.vo.MtReturnsDetailsVO">
select
md.id id,
md.return_quantity returnQuantity,
md.return_price returnPrice,
md.subtotal_amount subtotalAmount,
md.pre_inbound_inventory preInboundInventory,
mg.name commodityName,
mg.cvs_good_id cvsGoodId,
mg.unit unit,
mg.supplier_id supplierId,
mg.id goodsId,
mg.stock stock,
mr.order_number orderNumber
from mt_returns_details md
left join mt_returns mr ON md.returns_id = mr.id
left join mt_goods mg ON md.goods_id = mg.id
where
returns_id = #{mtReturnsDetails.returnsId}
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
@ -154,7 +174,7 @@
insert into mt_returns_details(goods_id, returns_id, return_quantity, return_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by, pre_inbound_inventory)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.goodsId}, #{entity.returnsId}, #{entity.returnQuantity}, #{entity.returnPrice}, #{entity.subtotalAmount}, #{entity.storeId}, NOW(), NOW(), #{entity.createBy}, #{entity.updateBy}, #{preInboundInventory})
(#{entity.goodsId}, #{entity.returnsId}, #{entity.returnQuantity}, #{entity.returnPrice}, #{entity.subtotalAmount}, #{entity.storeId}, NOW(), NOW(), #{entity.createBy}, #{entity.updateBy}, #{entity.preInboundInventory})
</foreach>
</insert>
@ -250,6 +270,12 @@
where id = #{user.id}
</foreach>
</update>
<update id="editGoods">
update mt_goods set
stock = stock - #{returnQuantity} ,
update_time = NOW()
where id = #{goodsId}
</update>
<!--通过主键删除-->
<delete id="deleteById">

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtReturnsMapper.xml
View File

@ -239,5 +239,12 @@
delete from mt_returns where id = #{id}
</delete>
<update id="editStateById">
update mt_returns
set approval_status = #{status}
where id = #{id}
</update>
</mapper>

57
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryDetailsService.java Normal file
View File

@ -0,0 +1,57 @@
package com.fuint.business.convenienceSore.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
/**
* 盘点详情表(MtInventoryDetails)表服务接口
*
* @author makejava
* @since 2023-10-28 14:45:44
*/
public interface MtInventoryDetailsService {
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
MtInventoryDetails queryById(Integer id);
/**
* 分页查询
*
* @param mtInventoryDetails 筛选条件
* @param page 分页对象
* @return 查询结果
*/
IPage<MtInventoryDetails> queryByPage(Page page, MtInventoryDetails mtInventoryDetails);
/**
* 新增数据
*
* @param mtInventoryDetails 实例对象
* @return 实例对象
*/
MtInventoryDetails insert(MtInventoryDetails mtInventoryDetails);
/**
* 修改数据
*
* @param mtInventoryDetails 实例对象
* @return 实例对象
*/
MtInventoryDetails update(MtInventoryDetails mtInventoryDetails);
/**
* 通过主键删除数据
*
* @param id 主键
* @return 是否成功
*/
boolean deleteById(Integer id);
}

58
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtInventoryService.java Normal file
View File

@ -0,0 +1,58 @@
package com.fuint.business.convenienceSore.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.entity.MtPurchase;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
/**
* 商品盘点表(MtInventory)表服务接口
*
* @author makejava
* @since 2023-10-28 14:45:20
*/
public interface MtInventoryService {
/**
* 通过ID查询单条数据
*
* @param inventoryId 主键
* @return 实例对象
*/
MtInventory queryById(Integer inventoryId);
/**
* 分页查询
*
* @param mtInventory 筛选条件
* @param page 分页对象
* @return 查询结果
*/
IPage<MtInventory> queryByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, MtInventory mtInventory);
/**
* 新增数据
*
* @param mtInventory 实例对象
* @return 实例对象
*/
MtInventory insert(MtInventory mtInventory);
/**
* 修改数据
*
* @param mtInventory 实例对象
* @return 实例对象
*/
MtInventory update(MtInventory mtInventory);
/**
* 通过主键删除数据
*
* @param inventoryId 主键
* @return 是否成功
*/
boolean deleteById(Integer inventoryId);
}

89
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryDetailsServiceImpl.java Normal file
View File

@ -0,0 +1,89 @@
package com.fuint.business.convenienceSore.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.mapper.MtInventoryDetailsMapper;
import com.fuint.business.convenienceSore.service.MtInventoryDetailsService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import javax.annotation.Resource;
/**
* 盘点详情表(MtInventoryDetails)表服务实现类
*
* @author makejava
* @since 2023-10-28 14:45:44
*/
@Service("mtInventoryDetailsService")
public class MtInventoryDetailsServiceImpl implements MtInventoryDetailsService {
@Resource
private MtInventoryDetailsMapper mtInventoryDetailsDao;
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
@Override
public MtInventoryDetails queryById(Integer id) {
return this.mtInventoryDetailsDao.queryById(id);
}
/**
* 分页查询
*
* @param mtInventoryDetails 筛选条件
* @param page 分页对象
* @return 查询结果
*/
@Override
public IPage<MtInventoryDetails> queryByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, MtInventoryDetails mtInventoryDetails) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
mtInventoryDetails.setStoreId(storeId);
IPage<MtInventoryDetails> MtInventoryDetailsIPage = mtInventoryDetailsDao.queryAllByLimit(page, mtInventoryDetails);
return MtInventoryDetailsIPage;
}
/**
* 新增数据
*
* @param mtInventoryDetails 实例对象
* @return 实例对象
*/
@Override
public MtInventoryDetails insert(MtInventoryDetails mtInventoryDetails) {
this.mtInventoryDetailsDao.insert(mtInventoryDetails);
return mtInventoryDetails;
}
/**
* 修改数据
*
* @param mtInventoryDetails 实例对象
* @return 实例对象
*/
@Override
public MtInventoryDetails update(MtInventoryDetails mtInventoryDetails) {
this.mtInventoryDetailsDao.update(mtInventoryDetails);
return this.queryById(mtInventoryDetails.getId());
}
/**
* 通过主键删除数据
*
* @param id 主键
* @return 是否成功
*/
@Override
public boolean deleteById(Integer id) {
return this.mtInventoryDetailsDao.deleteById(id) > 0;
}
}

90
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java Normal file
View File

@ -0,0 +1,90 @@
package com.fuint.business.convenienceSore.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.mapper.MtInventoryMapper;
import com.fuint.business.convenienceSore.service.MtInventoryService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import javax.annotation.Resource;
/**
* 商品盘点表(MtInventory)表服务实现类
*
* @author makejava
* @since 2023-10-28 14:45:20
*/
@Service("mtInventoryService")
public class MtInventoryServiceImpl implements MtInventoryService {
@Resource
private MtInventoryMapper mtInventoryDao;
/**
* 通过ID查询单条数据
*
* @param inventoryId 主键
* @return 实例对象
*/
@Override
public MtInventory queryById(Integer inventoryId) {
return this.mtInventoryDao.queryById(inventoryId);
}
/**
* 分页查询
*
* @param mtInventory 筛选条件
* @param page
* 分页对象
* @return 查询结果
*/
@Override
public IPage<MtInventory> queryByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, MtInventory mtInventory) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
mtInventory.setStoreId(storeId);
IPage<MtInventory> MtInventoryIPage = mtInventoryDao.queryAllByLimit(page, mtInventory);
return MtInventoryIPage;
}
/**
* 新增数据
*
* @param mtInventory 实例对象
* @return 实例对象
*/
@Override
public MtInventory insert(MtInventory mtInventory) {
this.mtInventoryDao.insert(mtInventory);
return mtInventory;
}
/**
* 修改数据
*
* @param mtInventory 实例对象
* @return 实例对象
*/
@Override
public MtInventory update(MtInventory mtInventory) {
this.mtInventoryDao.update(mtInventory);
return this.queryById(mtInventory.getInventoryId());
}
/**
* 通过主键删除数据
*
* @param inventoryId 主键
* @return 是否成功
*/
@Override
public boolean deleteById(Integer inventoryId) {
return this.mtInventoryDao.deleteById(inventoryId) > 0;
}
}

29
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
View File

@ -2,13 +2,14 @@ package com.fuint.business.convenienceSore.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.dto.MtPurchaseDto;
import com.fuint.business.convenienceSore.entity.MtPurchase;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.entity.Supplier;
import com.fuint.business.convenienceSore.entity.*;
import com.fuint.business.convenienceSore.mapper.MtPurchaseDetailsMapper;
import com.fuint.business.convenienceSore.mapper.MtPurchaseMapper;
import com.fuint.business.convenienceSore.service.MtPurchaseService;
import com.fuint.business.convenienceSore.service.StockStatisticService;
import com.fuint.business.convenienceSore.service.StockTrackService;
import com.fuint.business.convenienceSore.service.SupplierService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.business.convenienceSore.vo.MtPurchaseVO;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.petrolStationManagement.entity.OilInventory;
@ -41,6 +42,10 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
private SupplierService supplierService;
@Resource
private ILJStaffService iljStaffService;
@Resource
private StockTrackService stockService;
@Resource
private StockStatisticService stockStatisticService;
/**
@ -186,7 +191,23 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
// 1.查询所有的数据
MtPurchaseDetails mtPurchaseDetails = new MtPurchaseDetails();
mtPurchaseDetails.setPurchaseId(id);
// List<OilInventoryOrderVO> allList = detailsMapper.getAllList2(mtPurchaseDetails);
List<MtPurchaseDetailsVO> allList2 = detailsMapper.getAllList2(mtPurchaseDetails);
for (MtPurchaseDetailsVO mtPurchaseDetailsVO : allList2) {
// 修改库存
int i = detailsMapper.editGoods(mtPurchaseDetailsVO);
if (i>0) {
// 添加库存跟踪信息
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtPurchaseDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtPurchaseDetailsVO.getStoreId());
stockTrack.setDocument("商品进货");
stockTrack.setChangeNumber(mtPurchaseDetailsVO.getQuantityPurchased());
stockTrack.setOddNumber(mtPurchaseDetailsVO.getOrderNumber());
stockService.insertStockTrack(stockTrack);
}
}
// 2.将数据填充到油罐里面
String status = "qrts";

81
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtReturnsServiceImpl.java
View File

@ -3,16 +3,23 @@ package com.fuint.business.convenienceSore.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.dto.MtReturnsDto;
import com.fuint.business.convenienceSore.entity.MtReturns;
import com.fuint.business.convenienceSore.entity.*;
import com.fuint.business.convenienceSore.mapper.MtPurchaseDetailsMapper;
import com.fuint.business.convenienceSore.mapper.MtPurchaseMapper;
import com.fuint.business.convenienceSore.mapper.MtReturnsDetailsMapper;
import com.fuint.business.convenienceSore.mapper.MtReturnsMapper;
import com.fuint.business.convenienceSore.service.MtReturnsService;
import com.fuint.business.convenienceSore.service.StockStatisticService;
import com.fuint.business.convenienceSore.service.StockTrackService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.business.convenienceSore.vo.MtPurchaseVO;
import com.fuint.business.convenienceSore.vo.MtReturnsDetailsVO;
import com.fuint.business.convenienceSore.vo.MtReturnsVO;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
@ -28,11 +35,21 @@ public class MtReturnsServiceImpl implements MtReturnsService {
@Resource
private MtReturnsMapper mtReturnsDao;
@Resource
private MtReturnsDetailsMapper returnsDetailsMapper;
@Resource
private MtPurchaseMapper mtPurchaseDao;
@Resource
private ILJStaffService iljStaffService;
@Resource
private MtPurchaseDetailsMapper detailsMapper;
@Resource
private StockTrackService stockService;
@Resource
private StockStatisticService stockStatisticService;
/**
* 通过ID查询单条数据
*
@ -127,16 +144,78 @@ public class MtReturnsServiceImpl implements MtReturnsService {
@Override
public boolean audit(Integer id) {
String oilIntake = "退货审核";
int audit = iljStaffService.auditPrem(oilIntake);
if (audit>0) {
// 根据id修改状态
String status = "ysh";
mtReturnsDao.editStateById(id,status);
// 增加审核人
boolean edit = edit(id);
return true;
}
return false;
}
@Override
public boolean abolition(Integer id) {
String oilIntake = "退货废止";
int audit = iljStaffService.auditPrem(oilIntake);
if (audit>0) {
String status = "yzf";
mtReturnsDao.editStateById(id,status);
boolean edit = edit(id);
return true;
}
return false;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean storage(Integer id) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
String oilIntake = "退货出库";
int audit = iljStaffService.auditPrem(oilIntake);
if (audit>0) {
// 1.查询所有的数据
MtReturnsDetails mtReturnsDetails = new MtReturnsDetails();
mtReturnsDetails.setReturnsId(id);
List<MtReturnsDetailsVO> allList2 = returnsDetailsMapper.getAllList2(mtReturnsDetails);
for (MtReturnsDetailsVO mtReturnsDetailsVO : allList2) {
// 修改库存
int i = returnsDetailsMapper.editGoods(mtReturnsDetailsVO);
if (i>0) {
// 添加库存跟踪信息
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
stockTrack.setDocument("商品退货");
stockTrack.setChangeNumber(-mtReturnsDetailsVO.getReturnQuantity());
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());
stockService.insertStockTrack(stockTrack);
}
}
String status = "qrts";
boolean edit = edit(id);
int i = mtReturnsDao.editStateById(id, status);
return true;
}
return false;
}
// 修改审核人
public boolean edit(Integer id){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
MtReturns mtReturns = new MtReturns();
mtReturns.setApprover(nowAccountInfo.getStaffId().toString());
mtReturns.setId(id);
int update = mtReturnsDao.update(mtReturns);
return update>0;
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryDetailsVO.java Normal file
View File

@ -0,0 +1,4 @@
package com.fuint.business.convenienceSore.vo;
public class MtInventoryDetailsVO {
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtInventoryVO.java Normal file
View File

@ -0,0 +1,4 @@
package com.fuint.business.convenienceSore.vo;
public class MtInventoryVO {
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtPurchaseDetailsVO.java
View File

@ -10,4 +10,8 @@ public class MtPurchaseDetailsVO extends MtPurchaseDetails {
private Integer supplierId; // 供应商
private Integer cvsGoodId; // 分类
private Integer stock; // 分类
/**
* 业务单号
*/
private String orderNumber;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtReturnsDetailsVO.java
View File

@ -10,4 +10,8 @@ public class MtReturnsDetailsVO extends MtReturnsDetails {
private Integer supplierId; // 供应商
private Integer cvsGoodId; // 分类
private Integer stock; // 分类
/**
* 业务单号
*/
private String orderNumber;
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java
View File

@ -122,18 +122,20 @@ public class OilTankServiceImpl implements OilTankService {
// 需要导出的数据
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
oilTank.setStoreId(nowAccountInfo.getStoreId());
List<OilTankExcel> oilTankExcels = oilTankDao.queryAllByLimit2(oilTank);
// 设置文件名字
String fileName = "存油统计"+System.currentTimeMillis() + ".xlsx";
// 设置响应头信息
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
try{
// 设置响应头信息
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
response.addHeader("Content-Disposition", "filename=" + fileName + ".xlsx");
// 写入文件数据
EasyExcel.write(response.getOutputStream(), OilTankExcel.class).sheet("download").doWrite(oilTankExcels);
}catch(Exception e) {