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-26 18:01:14 +08:00
parent f697d2bba8
commit 98a517e02b
12 changed files with 460 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,21 +4,48 @@ import request from '@/utils/request'
/**
* 订单
*/
export function getPurchasePageApi(query) {
// 新增
export function addPurchaseApi(data) {
return request({
url: '/business/convenience/supplier/list',
url: '/business/convenience/mtPurchase',
method: 'post',
data: data
})
}
// 修改
export function editPurchaseApi(data) {
return request({
url: '/business/convenience/mtPurchase',
method: 'put',
data: data
})
}
/**
* 订单详情
*/
export function getPurchaseDetailsPageApi(query) {
return request({
url: '/business/convenience/mtPurchaseDetails/getListByPage',
method: 'get',
params: query
})
}
/**
* 订单详情
*/
// 新增供应商
export function addSupplier(data) {
export function delDetailsApi(query) {
return request({
url: '/business/convenience/supplier',
url: '/business/convenience/mtPurchaseDetails',
method: 'delete',
params: query
})
}
export function batchProcessingApi(data) {
return request({
url: '/business/convenience/mtPurchaseDetails/batchProcessing',
method: 'post',
data: data
})

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

@ -68,24 +68,38 @@
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
<el-table-column label="商品名称" align="center" prop="tankName"/>
<el-table-column label="分类名称" align="center" prop="numberName"/>
<el-table-column label="供应商 " align="center" prop="currentAveragePrice" />
<el-table-column label="单位" align="center" prop="currentInventoryVolume"/>
<el-table-column label="当前库存" align="center" prop="currentInventoryVolume"/>
<el-table-column label="进货数量" align="center" prop="inventoryVolume">
<el-table-column label="商品名称" align="center" prop="commodityName"/>
<el-table-column label="分类名称" prop="cvsGoodId" align="center">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
</template>
</el-table-column>
<el-table-column label="进货单价" align="center" prop="inventoryVolume">
<el-table-column label="供应商" prop="supplierId" align="center">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>
</template>
</el-table-column>
<el-table-column label="小计金额" align="center" prop="inventoryVolume">
<el-table-column label="单位" align="center" prop="unit">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<span>{{ scope.row.unit == null?"-":scope.row.unit}}</span>
</template>
</el-table-column>
<el-table-column label="当前库存" align="center" prop="stock"/>
<el-table-column label="进货数量" align="center" prop="quantityPurchased">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.quantityPurchased" @change="change(scope.row,1)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="进货单价" align="center" prop="unitPrice">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.unitPrice" @change="change(scope.row,2)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="小计金额" align="center" prop="subtotalAmount">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.subtotalAmount" @change="change(scope.row,3)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column v-if="state =='await' || state=='ysh'"label="操作" align="center" class-name="small-padding fixed-width">
@ -119,27 +133,25 @@
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="商品分类">
<el-select v-model="commodityForm.cvsGoodId" placeholder="请选择商品分类" style="width:100%" @change="chooseOilNumber()">
<!-- <el-option-->
<!-- v-for="option in selectOilTypeByPrice"-->
<!-- :key="option.numberId"-->
<!-- :label="option.oilType +' '+option.oilName"-->
<!-- :value="option.numberId"-->
<!-- ></el-option>-->
<el-select
v-model="commodityForm.cvsGoodId"
placeholder="全部"
clearable
>
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-select v-model="commodityForm.cvsGoodId" placeholder="请选择供应商" style="width:100%" @change="chooseOilNumber()">
<!-- <el-option-->
<!-- v-for="option in selectOilTypeByPrice"-->
<!-- :key="option.numberId"-->
<!-- :label="option.oilType +' '+option.oilName"-->
<!-- :value="option.numberId"-->
<!-- ></el-option>-->
</el-select>
</el-form-item>
<el-form-item label="供应商" prop="supplierId">
<el-select
v-model="commodityForm.supplierId"
placeholder="全部"
clearable
>
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="详细信息">
@ -163,13 +175,24 @@
type="selection"
width="55">
</el-table-column>
<el-table-column label="商品名称" align="center" prop="tankName"/>
<el-table-column label="商品编码" align="center" prop="oilNumber"/>
<el-table-column label="类别" align="center" prop="oilNumber"/>
<el-table-column label="供应商" align="center" prop="oilNumber"/>
<el-table-column label="单位" align="center" prop="oilNumber"/>
<el-table-column label="当前库存" align="center" prop="oilNumber"/>
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品编码" align="center" prop="goodsNo"/>
<el-table-column label="分类名称" prop="cvsGoodId" align="center">
<template slot-scope="scope">
<span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
</template>
</el-table-column>
<el-table-column label="供应商" prop="supplierId" align="center">
<template slot-scope="scope">
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="当前库存" align="center" prop="stock"/>
</el-table>
</el-main>
</el-container>
<div slot="footer" class="dialog-footer">
@ -178,16 +201,30 @@
</div>
</el-dialog>
</div>
</template>
<script>
import {getAuditPremApi} from "@/api/oilConfig/staff";
import {abolitionInventoryApi, auditInventoryApi, storageInventoryApi} from "@/api/oilConfig/oilInventory";
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";
import {selectParentById, selectTree} from "@/api/convenienceStore/goods";
import {listSupplier} from "@/api/convenienceStore/supplier";
import {
getPurchaseDetailsPageApi,
delDetailsApi,
editPurchaseApi,
addPurchaseApi,
batchProcessingApi
} from "@/api/convenienceStore/purchase";
export default {
name: "details",
@ -196,13 +233,16 @@ export default {
return {
detailsList: [],
commodityList: [],
purchaseId:null,
commodityForm:{
cvsGoodId: "",
cvsGood: "",
supplierId: "",
supplier: "",
detailed: ""
detailed: "",
page: 1,
pageSize: 10,
isRecovery:0,
},
purchaseForm: {
orderNumber: "",
@ -212,6 +252,13 @@ export default {
productQuantity: 0, //商品数量
quantityPurchased: 0 //进货数量
} ,
// 商品分类列表
cvsGoodList:[],
// 供应商列表
supplierList:[],
state:'await',
saveFlag:false,
@ -229,6 +276,7 @@ export default {
open: false,
// 总条数
total: 0,
// 查询参数
queryParams: {
supplierId: '',
@ -254,8 +302,26 @@ export default {
if (this.purchaseForm.orderNumber == null) {
this.refresh();
}
this.getDetailsList();
this.getQueryList();
},
methods: {
getDetailsList() {
let this_ = this
getPurchaseDetailsPageApi().then(res=>{
this_.detailsList = res.data.records;
this.total = res.data.total;
})
},
getCommodityList() {
let this_ = this
listLJGoods(this_.commodityForm).then(res=>{
this_.commodityList = res.data.records;
// this.total = response.data.total;
})
},
// 页面跳转
goToAbout() {
this.$router.push('/convenienceStore/purchase/index');
@ -263,44 +329,60 @@ export default {
commodityAdd() {
this.open = true;
},
commodityDel() {
commodityDel(data) {
if (data.id != null) {
delDetailsApi(data).then(res=>{
})
}
const index = this.detailsList.indexOf(data); // 查找要删除的对象的索引
if (index !== -1) {
this.detailsList.splice(index, 1); // 使用splice方法删除对象
}
},
// 查询商品
inquire() {
this.getCommodityList();
},
// 改变数字时
change(data) {
// // 库存差异升数
// data.stockDifference = data.inventoryVolume - data.currentInventoryVolume
// // 盈亏金额
// data.profitLossAmount = data.inventoryVolume * data.stockDifference
//
change(data,flag) {
let quantityPurchased = new BigNumber( data.quantityPurchased);
let unitPrice = new BigNumber( data.unitPrice);
let subtotalAmount = new BigNumber(data.subtotalAmount);
data.subtotalAmount = quantityPurchased.times(unitPrice)
if (flag == 3) {
data.unitPrice = subtotalAmount.dividedBy(quantityPurchased);
}
// this.sumMethod(this.detailsList);
// this.sumMethod(this.orderList)
// 进行保存
// this.orderForm = data
// this.detailsList = data
// this.edit()
},
// 计算header数据
sumMethod(data) {
// console.log("sumMethod",data)
// let this_ = this
// this_.inventoryVolume = new BigNumber(0),
// this_.stockDifference = new BigNumber(0),
// this_.profitLossAmount = new BigNumber(0),
// data.forEach(da => {
// if (da.inventoryVolume != null) {
// this_.inventoryVolume= this_.inventoryVolume.plus(da.inventoryVolume)
// }
// if (da.stockDifference != null) {
// this_.stockDifference= this_.stockDifference.plus(da.stockDifference)
// }
// if (da.profitLossAmount != null) {
// this_.profitLossAmount= this_.profitLossAmount.plus(da.profitLossAmount)
// }
// })
console.log("sumMethod",data)
let this_ = this
this_.purchaseForm.totalAmount = data.length
this_.purchaseForm.productQuantity = new BigNumber(0),
this_.purchaseForm.quantityPurchased = new BigNumber(0),
data.forEach(da => {
if (da.unitPrice != null) {
this_.purchaseForm.productQuantity= this_.purchaseForm.productQuantity.plus(da.unitPrice)
}
if (da.subtotalAmount != null) {
this_.purchaseForm.quantityPurchased= this_.purchaseForm.quantityPurchased.plus(da.subtotalAmount)
}
})
},
addCommodity () {
@ -309,22 +391,34 @@ export default {
console.log("this.multipleSelection",this.multipleSelection)
this.multipleSelection.forEach(mul=>{
let now = {
tankId: mul.id,
tankName: mul.tankName,
numberId: mul.numberId,
numberName: mul.oilNumber,
inventoryVolume:mul.storedQuantity,
currentAveragePrice: mul.discountedPrice,
currentInventoryVolume: mul.storedQuantity
goodsId: mul.id,
commodityName: mul.name,
supplierId: mul.supplierId,
cvsGoodId: mul.cvsGoodId,
unit:mul.unit,
stock:mul.stock,
quantityPurchased: 0,
unitPrice: 0,
subtotalAmount: 0
}
this_.orderList.push(now)
this_.detailsList.push(now)
})
this_.open = false
this.numberOfTanks = this.numberOfTanks+1
console.log("this.multipleSelection",this.multipleSelection)
this_.sumMethod(this_.orderList);
this_.sumMethod(this_.detailsList);
},
// 查询搜索列表信息
getQueryList(){
selectTree().then(response => {
this.cvsGoodList = response.data.records
});
listSupplier().then(response => {
this.supplierList = response.data.records
})
},
cancel() {
this.open = false;
},
@ -374,7 +468,32 @@ export default {
});
},
save(){
async save(){
let this_ = this
if (this_.purchaseId == null) {
// 新增
await addPurchaseApi(this_.purchaseForm).then(res=>{
this_.purchaseId = res.data.id
}).catch(res=>{
return;
})
}else {
// 修改
this_.purchaseForm.id = this_.purchaseId
await editPurchaseApi(this_.purchaseForm).then(res=> {
}).catch(res=>{
return;
})
}
// 批量保存订单
console.log("::::::::::",this_.detailsList)
this_.detailsList.fill(this_.purchaseId)
console.log("**********",this_.detailsList)
await batchProcessingApi(this_.detailsList).then(res=>{
this.$modal.msgSuccess("保存成功");
}).catch()
},
// 保存并审核

23
fuintAdmin/src/views/convenienceStore/purchase/index.vue
View File

@ -132,8 +132,8 @@ export default {
approvalStatus: "",
status: '',
dateRange: '',
page:null,
pageSize:null
page: null,
pageSize: null,
},
// 遮罩层
loading: false,
@ -149,12 +149,12 @@ export default {
// 获取列表
getList(){
this.loading = true;
getInventoryApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.inventoryList = response.data.records;
this.total = response.data.total;
})
this.loading = false;
// this.loading = true;
// getInventoryApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
// this.inventoryList = response.data.records;
// this.total = response.data.total;
// })
// this.loading = false;
},
detailsAdd() {
@ -164,9 +164,10 @@ export default {
dispose(data) {
this.$router.push({
path: '/purchase/details',
params: {
inventoryId: data.id
},
name: 'purchase-details', // 将组件名称更改为避免冲突
// params: {
// inventoryId: data.id
// },
});
},

40
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseDetailsController.java
View File

@ -3,12 +3,14 @@ package com.fuint.business.convenienceSore.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.service.MtPurchaseDetailsService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 进货详情表(MtPurchaseDetails)表控制层
@ -40,6 +42,16 @@ public class MtPurchaseDetailsController extends BaseController {
return getSuccessResult(list);
}
@GetMapping("/getListByPage")
public ResponseObject getListByPage(MtPurchaseDetails mtPurchaseDetails,
@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<MtPurchaseDetailsVO> list = mtPurchaseDetailsService.getListByPage(page,mtPurchaseDetails);
return getSuccessResult(list);
}
/**
* 通过主键查询单条数据
*
@ -47,8 +59,8 @@ public class MtPurchaseDetailsController extends BaseController {
* @return 单条数据
*/
@GetMapping("{id}")
public ResponseEntity<MtPurchaseDetails> queryById(@PathVariable("id") Integer id) {
return ResponseEntity.ok(this.mtPurchaseDetailsService.queryById(id));
public ResponseObject queryById(@PathVariable("id") Integer id) {
return getSuccessResult(this.mtPurchaseDetailsService.queryById(id));
}
/**
@ -58,8 +70,20 @@ public class MtPurchaseDetailsController extends BaseController {
* @return 新增结果
*/
@PostMapping
public ResponseEntity<MtPurchaseDetails> add(MtPurchaseDetails mtPurchaseDetails) {
return ResponseEntity.ok(this.mtPurchaseDetailsService.insert(mtPurchaseDetails));
public ResponseObject add(MtPurchaseDetails mtPurchaseDetails) {
return getSuccessResult(this.mtPurchaseDetailsService.insert(mtPurchaseDetails));
}
/**
* 批量处理数据
*
* @param mtPurchaseDetails 实体
* @return 新增结果
*/
@PostMapping("batchProcessing")
public ResponseObject batchProcessing(List<MtPurchaseDetails> mtPurchaseDetails) {
return getSuccessResult(this.mtPurchaseDetailsService.batchProcessing(mtPurchaseDetails));
}
/**
@ -69,8 +93,8 @@ public class MtPurchaseDetailsController extends BaseController {
* @return 编辑结果
*/
@PutMapping
public ResponseEntity<MtPurchaseDetails> edit(MtPurchaseDetails mtPurchaseDetails) {
return ResponseEntity.ok(this.mtPurchaseDetailsService.update(mtPurchaseDetails));
public ResponseObject edit(MtPurchaseDetails mtPurchaseDetails) {
return getSuccessResult(this.mtPurchaseDetailsService.update(mtPurchaseDetails));
}
/**
@ -80,8 +104,8 @@ public class MtPurchaseDetailsController extends BaseController {
* @return 删除是否成功
*/
@DeleteMapping
public ResponseEntity<Boolean> deleteById(Integer id) {
return ResponseEntity.ok(this.mtPurchaseDetailsService.deleteById(id));
public ResponseObject deleteById(Integer id) {
return getSuccessResult(this.mtPurchaseDetailsService.deleteById(id));
}
}

131
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtPurchase.java
View File

@ -1,5 +1,8 @@
package com.fuint.business.convenienceSore.entity;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
@ -9,7 +12,8 @@ import java.io.Serializable;
* @author makejava
* @since 2023-10-26 11:49:52
*/
public class MtPurchase implements Serializable {
@Data
public class MtPurchase extends BaseEntity {
private static final long serialVersionUID = -59077196480001564L;
/**
* 进货id（主键）
@ -36,9 +40,9 @@ public class MtPurchase implements Serializable {
*/
private Double totalAmount;
/**
* 进货单价
* 商品数量
*/
private Double unitPrice;
private Double productQuantity;
/**
* 进货数量
*/
@ -47,127 +51,6 @@ public class MtPurchase implements Serializable {
* 店铺ID
*/
private Integer storeId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人
*/
private Integer createBy;
/**
* 更新人
*/
private Integer updateBy;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public String getApprovalStatus() {
return approvalStatus;
}
public void setApprovalStatus(String approvalStatus) {
this.approvalStatus = approvalStatus;
}
public Date getOrderDate() {
return orderDate;
}
public void setOrderDate(Date orderDate) {
this.orderDate = orderDate;
}
public String getApprover() {
return approver;
}
public void setApprover(String approver) {
this.approver = approver;
}
public Double getTotalAmount() {
return totalAmount;
}
public void setTotalAmount(Double totalAmount) {
this.totalAmount = totalAmount;
}
public Double getUnitPrice() {
return unitPrice;
}
public void setUnitPrice(Double unitPrice) {
this.unitPrice = unitPrice;
}
public Integer getQuantityPurchased() {
return quantityPurchased;
}
public void setQuantityPurchased(Integer quantityPurchased) {
this.quantityPurchased = quantityPurchased;
}
public Integer getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
this.storeId = storeId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getCreateBy() {
return createBy;
}
public void setCreateBy(Integer createBy) {
this.createBy = createBy;
}
public Integer getUpdateBy() {
return updateBy;
}
public void setUpdateBy(Integer updateBy) {
this.updateBy = updateBy;
}
}

112
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtPurchaseDetails.java
View File

@ -1,5 +1,8 @@
package com.fuint.business.convenienceSore.entity;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
@ -9,7 +12,8 @@ import java.io.Serializable;
* @author makejava
* @since 2023-10-26 11:50:36
*/
public class MtPurchaseDetails implements Serializable {
@Data
public class MtPurchaseDetails extends BaseEntity {
private static final long serialVersionUID = -65129453439834782L;
/**
* 进货详情id（主键）
@ -18,7 +22,7 @@ public class MtPurchaseDetails implements Serializable {
/**
* 关联商品id
*/
private Integer productId;
private Integer goodsId;
/**
* 关联订单id
*/
@ -39,111 +43,7 @@ public class MtPurchaseDetails implements Serializable {
* 店铺ID
*/
private Integer storeId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人
*/
private Integer createBy;
/**
* 更新人
*/
private Integer updateBy;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getProductId() {
return productId;
}
public void setProductId(Integer productId) {
this.productId = productId;
}
public Integer getPurchaseId() {
return purchaseId;
}
public void setPurchaseId(Integer purchaseId) {
this.purchaseId = purchaseId;
}
public Integer getQuantityPurchased() {
return quantityPurchased;
}
public void setQuantityPurchased(Integer quantityPurchased) {
this.quantityPurchased = quantityPurchased;
}
public Double getUnitPrice() {
return unitPrice;
}
public void setUnitPrice(Double unitPrice) {
this.unitPrice = unitPrice;
}
public Double getSubtotalAmount() {
return subtotalAmount;
}
public void setSubtotalAmount(Double subtotalAmount) {
this.subtotalAmount = subtotalAmount;
}
public Integer getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
this.storeId = storeId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getCreateBy() {
return createBy;
}
public void setCreateBy(Integer createBy) {
this.createBy = createBy;
}
public Integer getUpdateBy() {
return updateBy;
}
public void setUpdateBy(Integer updateBy) {
this.updateBy = updateBy;
}
}

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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 org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
@ -33,6 +34,8 @@ public interface MtPurchaseDetailsMapper {
*/
IPage<MtPurchaseDetails> queryAllByLimit(Page page, @Param("mtPurchaseDetails") MtPurchaseDetails mtPurchaseDetails);
IPage<MtPurchaseDetailsVO> getListByPage(Page page, @Param("mtPurchaseDetails") MtPurchaseDetails mtPurchaseDetails);
/**
* 统计总行数
*
@ -57,6 +60,8 @@ public interface MtPurchaseDetailsMapper {
*/
int insertBatch(@Param("entities") List<MtPurchaseDetails> entities);
int editBatch(@Param("list") List<MtPurchaseDetails> entities);
/**
* 批量新增或按主键更新数据（MyBatis原生foreach方法）
*

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

@ -4,7 +4,7 @@
<resultMap type="com.fuint.business.convenienceSore.entity.MtPurchaseDetails" id="MtPurchaseDetailsMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="productId" column="product_id" jdbcType="INTEGER"/>
<result property="goodsId" column="goods_id" jdbcType="INTEGER"/>
<result property="purchaseId" column="purchase_id" jdbcType="INTEGER"/>
<result property="quantityPurchased" column="quantity_purchased" jdbcType="INTEGER"/>
<result property="unitPrice" column="unit_price" jdbcType="NUMERIC"/>
@ -19,7 +19,7 @@
<!--查询单个-->
<select id="queryById" resultMap="MtPurchaseDetailsMap">
select
id, product_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by
id, goods_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by
from mt_purchase_details
where id = #{id}
</select>
@ -27,14 +27,14 @@
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="MtPurchaseDetailsMap">
select
id, product_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by
id, goods_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by
from mt_purchase_details
<where>
<if test="id != null">
and id = #{id}
</if>
<if test="productId != null">
and product_id = #{productId}
<if test="goodsId != null">
and goods_id = #{goodsId}
</if>
<if test="purchaseId != null">
and purchase_id = #{purchaseId}
@ -74,8 +74,8 @@
<if test="id != null">
and id = #{id}
</if>
<if test="productId != null">
and product_id = #{productId}
<if test="goodsId != null">
and goods_id = #{goodsId}
</if>
<if test="purchaseId != null">
and purchase_id = #{purchaseId}
@ -107,28 +107,65 @@
</where>
</select>
<select id="getListByPage" 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
from mt_purchase_details md
left join mt_goods mg ON md.goods_id = mg.id
<where>
<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>
<if test="mtPurchaseDetails.subtotalAmount != null">
and subtotal_amount = #{mtPurchaseDetails.subtotalAmount}
</if>
<if test="mtPurchaseDetails.storeId != null">
and md.store_id = #{mtPurchaseDetails.storeId}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase_details(product_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
values (#{productId}, #{purchaseId}, #{quantityPurchased}, #{unitPrice}, #{subtotalAmount}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
insert into mt_purchase_details(goods_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
values (#{goodsId}, #{purchaseId}, #{quantityPurchased}, #{unitPrice}, #{subtotalAmount}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase_details(product_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
insert into mt_purchase_details(goods_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.productId}, #{entity.purchaseId}, #{entity.quantityPurchased}, #{entity.unitPrice}, #{entity.subtotalAmount}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
(#{entity.goodsId}, #{entity.purchaseId}, #{entity.quantityPurchased}, #{entity.unitPrice}, #{entity.subtotalAmount}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase_details(product_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
insert into mt_purchase_details(goods_id, purchase_id, quantity_purchased, unit_price, subtotal_amount, store_id, create_time, update_time, create_by, update_by)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.productId}, #{entity.purchaseId}, #{entity.quantityPurchased}, #{entity.unitPrice}, #{entity.subtotalAmount}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
(#{entity.goodsId}, #{entity.purchaseId}, #{entity.quantityPurchased}, #{entity.unitPrice}, #{entity.subtotalAmount}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
on duplicate key update
product_id = values(product_id),
goods_id = values(goods_id),
purchase_id = values(purchase_id),
quantity_purchased = values(quantity_purchased),
unit_price = values(unit_price),
@ -144,8 +181,8 @@
<update id="update">
update mt_purchase_details
<set>
<if test="productId != null">
product_id = #{productId},
<if test="goodsId != null">
goods_id = #{goodsId},
</if>
<if test="purchaseId != null">
purchase_id = #{purchaseId},
@ -177,6 +214,45 @@
</set>
where id = #{id}
</update>
<update id="editBatch">
<foreach collection="list" item="user" separator=";">
update mt_purchase_details
<set>
<if test="user.goodsId != null">
goods_id = #{user.goodsId},
</if>
<if test="user.purchaseId != null">
purchase_id = #{user.purchaseId},
</if>
<if test="user.quantityPurchased != null">
quantity_purchased = #{user.quantityPurchased},
</if>
<if test="user.unitPrice != null">
unit_price = #{user.unitPrice},
</if>
<if test="user.subtotalAmount != null">
subtotal_amount = #{user.subtotalAmount},
</if>
<if test="user.storeId != null">
store_id = #{user.storeId},
</if>
<if test="user.createTime != null">
create_time = #{user.createTime},
</if>
<if test="user.updateTime != null">
update_time = #{user.updateTime},
</if>
<if test="user.createBy != null">
create_by = #{user.createBy},
</if>
<if test="user.updateBy != null">
update_by = #{user.updateBy},
</if>
</set>
where id = #{user.id}
</foreach>
</update>
<!--通过主键删除-->
<delete id="deleteById">

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

@ -9,7 +9,7 @@
<result property="orderDate" column="order_date" jdbcType="TIMESTAMP"/>
<result property="approver" column="approver" jdbcType="VARCHAR"/>
<result property="totalAmount" column="total_amount" jdbcType="NUMERIC"/>
<result property="unitPrice" column="unit_price" jdbcType="NUMERIC"/>
<result property="productQuantity" column="product_quantity" jdbcType="NUMERIC"/>
<result property="quantityPurchased" column="quantity_purchased" jdbcType="INTEGER"/>
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@ -21,7 +21,7 @@
<!--查询单个-->
<select id="queryById" resultMap="MtPurchaseMap">
select
id, order_number, approval_status, order_date, approver, total_amount, unit_price, quantity_purchased, store_id, create_time, update_time, create_by, update_by
id, order_number, approval_status, order_date, approver, total_amount, product_quantity, quantity_purchased, store_id, create_time, update_time, create_by, update_by
from mt_purchase
where id = #{id}
</select>
@ -29,7 +29,7 @@
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="MtPurchaseMap">
select
id, order_number, approval_status, order_date, approver, total_amount, unit_price, quantity_purchased, store_id, create_time, update_time, create_by, update_by
id, order_number, approval_status, order_date, approver, total_amount, product_quantity, quantity_purchased, store_id, create_time, update_time, create_by, update_by
from mt_purchase
<where>
<if test="id != null">
@ -50,8 +50,8 @@
<if test="totalAmount != null">
and total_amount = #{totalAmount}
</if>
<if test="unitPrice != null">
and unit_price = #{unitPrice}
<if test="productQuantity != null">
and product_quantity = #{productQuantity}
</if>
<if test="quantityPurchased != null">
and quantity_purchased = #{quantityPurchased}
@ -97,8 +97,8 @@
<if test="totalAmount != null">
and total_amount = #{totalAmount}
</if>
<if test="unitPrice != null">
and unit_price = #{unitPrice}
<if test="productQuantity != null">
and product_quantity = #{productQuantity}
</if>
<if test="quantityPurchased != null">
and quantity_purchased = #{quantityPurchased}
@ -123,23 +123,23 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, unit_price, quantity_purchased, store_id, create_time, update_time, create_by, update_by)
values (#{orderNumber}, #{approvalStatus}, #{orderDate}, #{approver}, #{totalAmount}, #{unitPrice}, #{quantityPurchased}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, product_quantity, quantity_purchased, store_id, create_time, update_time, create_by, update_by)
values (#{orderNumber}, #{approvalStatus}, #{orderDate}, #{approver}, #{totalAmount}, #{productQuantity}, #{quantityPurchased}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, unit_price, quantity_purchased, store_id, create_time, update_time, create_by, update_by)
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, product_quantity, quantity_purchased, 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.totalAmount}, #{entity.unitPrice}, #{entity.quantityPurchased}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
(#{entity.orderNumber}, #{entity.approvalStatus}, #{entity.orderDate}, #{entity.approver}, #{entity.totalAmount}, #{entity.productQuantity}, #{entity.quantityPurchased}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, unit_price, quantity_purchased, store_id, create_time, update_time, create_by, update_by)
insert into mt_purchase(order_number, approval_status, order_date, approver, total_amount, product_quantity, quantity_purchased, 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.totalAmount}, #{entity.unitPrice}, #{entity.quantityPurchased}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
(#{entity.orderNumber}, #{entity.approvalStatus}, #{entity.orderDate}, #{entity.approver}, #{entity.totalAmount}, #{entity.productQuantity}, #{entity.quantityPurchased}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach>
on duplicate key update
order_number = values(order_number),
@ -147,7 +147,7 @@
order_date = values(order_date),
approver = values(approver),
total_amount = values(total_amount),
unit_price = values(unit_price),
product_quantity = values(product_quantity),
quantity_purchased = values(quantity_purchased),
store_id = values(store_id),
create_time = values(create_time),
@ -175,8 +175,8 @@
<if test="totalAmount != null">
total_amount = #{totalAmount},
</if>
<if test="unitPrice != null">
unit_price = #{unitPrice},
<if test="productQuantity != null">
product_quantity = #{productQuantity},
</if>
<if test="quantityPurchased != null">
quantity_purchased = #{quantityPurchased},

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/MtPurchaseDetailsService.java
View File

@ -3,6 +3,9 @@ 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.MtPurchaseDetails;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import java.util.List;
/**
@ -30,6 +33,8 @@ public interface MtPurchaseDetailsService {
*/
IPage<MtPurchaseDetails> queryByPage(Page page, MtPurchaseDetails mtPurchaseDetails);
IPage<MtPurchaseDetailsVO> getListByPage(Page page, MtPurchaseDetails mtPurchaseDetails);
/**
* 新增数据
*
@ -38,6 +43,9 @@ public interface MtPurchaseDetailsService {
*/
MtPurchaseDetails insert(MtPurchaseDetails mtPurchaseDetails);
boolean batchProcessing(List<MtPurchaseDetails> mtPurchaseDetails);
/**
* 修改数据
*

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

@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.mapper.MtPurchaseDetailsMapper;
import com.fuint.business.convenienceSore.service.MtPurchaseDetailsService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 进货详情表(MtPurchaseDetails)表服务实现类
@ -47,6 +50,22 @@ public class MtPurchaseDetailsServiceImpl implements MtPurchaseDetailsService {
IPage<MtPurchaseDetails> mtPurchaseIPage = mtPurchaseDetailsDao.queryAllByLimit(page, mtPurchaseDetails);
return mtPurchaseIPage;
}
/**
* 分页查询
*
* @param mtPurchaseDetails 筛选条件
* @param page 分页对象
* @return 查询结果
*/
@Override
public IPage<MtPurchaseDetailsVO> getListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, MtPurchaseDetails mtPurchaseDetails) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
mtPurchaseDetails.setStoreId(storeId);
IPage<MtPurchaseDetailsVO> mtPurchaseIPage = mtPurchaseDetailsDao.getListByPage(page, mtPurchaseDetails);
return mtPurchaseIPage;
}
/**
@ -61,6 +80,26 @@ public class MtPurchaseDetailsServiceImpl implements MtPurchaseDetailsService {
return mtPurchaseDetails;
}
@Override
public boolean batchProcessing(List<MtPurchaseDetails> mtPurchaseDetails) {
List<MtPurchaseDetails> mtPurchaseDetailsIns = new ArrayList<>();
List<MtPurchaseDetails> mtPurchaseDetailsEdit = new ArrayList<>();
for (MtPurchaseDetails mtPurchaseDetail : mtPurchaseDetails) {
if (mtPurchaseDetail.getId() != null) {
mtPurchaseDetailsEdit.add(mtPurchaseDetail);
}else {
mtPurchaseDetailsIns.add(mtPurchaseDetail);
}
}
if (mtPurchaseDetailsIns.size()>0) {
mtPurchaseDetailsDao.insertBatch(mtPurchaseDetailsIns);
}
if (mtPurchaseDetailsEdit.size()>0) {
mtPurchaseDetailsDao.editBatch(mtPurchaseDetailsEdit);
}
return true;
}
/**
* 修改数据
*

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

@ -0,0 +1,13 @@
package com.fuint.business.convenienceSore.vo;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import lombok.Data;
@Data
public class MtPurchaseDetailsVO extends MtPurchaseDetails {
private String commodityName; // 商品名称·
private String unit; // 商品名称·
private Integer supplierId; // 供应商
private Integer cvsGoodId; // 分类
private Integer stock; // 分类
}