mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(project): 优化项目详情查看逻辑并完善用户信息存储 

- 修改项目详情按钮点击事件，支持编辑和查看两种模式
- 根据项目状态决定打开编辑表单或详情抽屉
- 在订单详情中自动填充当前用户信息
- 修复分页排序参数处理逻辑
- 添加项目创建时默认填充当前用户为支持人员
- 扩展用户状态管理，增加邮箱和电话号码字段
- 登录时同步存储用户邮箱和电话号码信息
dev_1.0.0
chenhao 2025-11-26 10:10:15 +08:00
parent 9cbfbdbb55
commit 4576eaf1df
13 changed files with 1599 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
oms_web/oms_vue/src/api/sip/purchaseorder.js 100644
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询采购单主表列表
export function listPurchaseorder(query) {
return request({
url: '/sip/purchaseorder/list',
method: 'get',
params: query
})
}
// 查询采购单主表详细
export function getPurchaseorder(id) {
return request({
url: '/sip/purchaseorder/' + id,
method: 'get'
})
}
// 新增采购单主表
export function addPurchaseorder(data) {
return request({
url: '/sip/purchaseorder',
method: 'post',
data: data
})
}
// 修改采购单主表
export function updatePurchaseorder(data) {
return request({
url: '/sip/purchaseorder',
method: 'put',
data: data
})
}
// 删除采购单主表
export function delPurchaseorder(id) {
return request({
url: '/sip/purchaseorder/' + id,
method: 'delete'
})
}

148
oms_web/oms_vue/src/views/base/vendor/index.vue vendored
View File

@ -138,8 +138,8 @@
/>
<!-- 添加或修改制造商信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="200px" style="max-height: 70vh;overflow-y: auto;padding: 10px">
<el-row>
<el-col :span="12">
<el-form-item label="制造商编码" prop="vendorCode">
@ -186,6 +186,74 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="省份" prop="province">
<el-select v-model="form.province" placeholder="请选择省" style="width: 100%" @change="handleProvinceChange">
<el-option
v-for="item in provinceOptions"
:key="item.id"
:label="item.n"
:value="item.n"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="城市" prop="city">
<el-select v-model="form.city" placeholder="请选择市" style="width: 100%">
<el-option
v-for="item in cityOptions"
:key="item.id"
:label="item.n"
:value="item.n"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="付款方式" prop="payType">
<el-select v-model="form.payType" placeholder="请选择付款方式" style="width: 100%" @change="handlePayTypeChange">
<el-option label="入库付款" :value="0"></el-option>
<el-option label="出库付款" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.payType === 1">
<el-form-item label="延迟付款" prop="payConfigDay">
<el-input-number v-model="form.payConfigDay" :min="0" :max="365" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="统一社会信用代码" prop="socialCredit">
<el-input v-model="form.socialCredit" placeholder="请输入统一社会信用代码" />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="账户名称" prop="payName">
<el-input v-model="form.payName" placeholder="请输入账户名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="银行卡号" prop="payBankNumber">
<el-input v-model="form.payBankNumber" placeholder="请输入银行卡号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="开户行" prop="payBankOpenAddress">
<el-input v-model="form.payBankOpenAddress" placeholder="请输入开户行" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="银行行号" prop="bankNumber">
<el-input v-model="form.bankNumber" placeholder="请输入银行行号" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="默认仓库" prop="warehouseId">
<el-select v-model="form.warehouseId" placeholder="请选择默认仓库" style="width: 100%">
<el-option
@ -206,6 +274,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="生产地址" prop="generatedAddress">
<el-input v-model="form.generatedAddress" placeholder="请输入生成地址" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -218,6 +290,7 @@
<script>
import { listVendor, getVendor, delVendor, addVendor, updateVendor, exportVendor } from "@/api/base/vendor";
import {listAllWarehouse} from "@/api/base/warehouse";
import {listAreas} from "@/api/system/area";
export default {
name: "Vendor",
@ -244,6 +317,10 @@ export default {
open: false,
// 仓库选项
warehouseOptions: [],
// 省份选项
provinceOptions: [],
// 城市选项
cityOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -255,7 +332,18 @@ export default {
vendorStatus: null,
},
// 表单参数
form: {},
form: {
payType: 0,
payConfigDay: 0,
socialCredit: null,
payName: null,
payBankNumber: null,
payBankOpenAddress: null,
bankNumber: null,
province: null,
city: null,
generatedAddress: null,
},
// 表单校验
rules: {
vendorCode: [
@ -273,12 +361,19 @@ export default {
vendorStatus: [
{ required: true, message: "合作状态不能为空", trigger: "change" }
],
province: [
{ required: true, message: "省份不能为空", trigger: "change" }
],
city: [
{ required: true, message: "城市不能为空", trigger: "change" }
],
}
};
},
created() {
this.getList();
this.getWarehouseList();
this.getProvinceList();
},
methods: {
/** 查询制造商信息列表 */
@ -296,6 +391,22 @@ export default {
this.warehouseOptions = response.data;
});
},
/** 查询省份列表 */
getProvinceList() {
listAreas(0).then(response => {
this.provinceOptions = response;
});
},
/** 省份选择改变时 */
handleProvinceChange(provinceName) {
this.form.city = null; // Clear city selection when province changes
const selectedProvince = this.provinceOptions.find(p => p.n === provinceName);
if (selectedProvince) {
this.cityOptions = selectedProvince.s;
} else {
this.cityOptions = [];
}
},
// 取消按钮
cancel() {
this.open = false;
@ -313,8 +424,19 @@ export default {
vendorPhone: null,
vendorStatus: "0",
warehouseId: null,
warehouseIdList: []
warehouseIdList: [],
payType: 0,
payConfigDay: 0,
socialCredit: null,
payName: null,
payBankNumber: null,
payBankOpenAddress: null,
bankNumber: null,
province: null,
city: null,
generatedAddress: null,
};
this.cityOptions = []; // Clear city options on reset
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -348,6 +470,16 @@ export default {
if (this.form.warehouseId) {
this.form.warehouseId = Number(this.form.warehouseId);
}
if (this.form.payType === 1 && !this.form.payConfigDay) {
this.form.payConfigDay = 30; // 如果付款方式是出库付款且付款配置时间为空，则默认为30
}
// Populate city options if province is already set
if (this.form.province) {
const selectedProvince = this.provinceOptions.find(p => p.n === this.form.province);
if (selectedProvince) {
this.cityOptions = selectedProvince.s;
}
}
this.open = true;
this.title = "修改制造商信息";
});
@ -382,6 +514,14 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 付款方式改变时触发 */
handlePayTypeChange(val) {
if (val === 1) {
this.form.payConfigDay = 30; // 出库付款时默认为30天
} else {
this.form.payConfigDay = 0; // 其他情况设置为0
}
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;

460
oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue 100644
View File

@ -0,0 +1,460 @@
<template>
<div style="max-height: 70vh;overflow-y: auto; padding: 20px;">
<el-form ref="form" :model="form" :rules="rules" label-width="180px" >
<el-divider content-position="left">基础信息</el-divider>
<el-row>
<el-col :span="24">
<el-form-item label="采购方名称" prop="buyerName">
<el-input v-model="form.buyerName" placeholder="请输入采购方名称" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="公司地址" prop="buyerAddress">
<el-input v-model="form.buyerAddress" placeholder="请输入公司地址" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">制造商信息</el-divider>
<el-row>
<el-col :span="12">
<el-form-item label="制造商" prop="vendorId">
<el-select v-model="form.vendorId" placeholder="请选择制造商" style="width:100%" @change="handleVendorChange">
<el-option v-for="item in vendorOptions" :key="item.vendorId" :label="item.vendorName" :value="item.vendorId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="selectedVendor.vendorId">
<el-col :span="12">
<el-form-item label="制造商名称">
<span>{{ selectedVendor.vendorAddress }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人">
<span>{{ selectedVendor.vendorUser }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话">
<span>{{ selectedVendor.vendorPhone }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系邮箱">
<span>{{ selectedVendor.vendorEmail }}</span>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">订单信息</el-divider>
<el-row>
<el-col :span="12" v-show="form.purchaseNo">
<el-form-item label="采购编号" prop="purchaseNo">
<span>{{form.purchaseNo}}</span>
</el-form-item>
</el-col>
<el-col :span="12" v-show="form.createTime">
<el-form-item label="发起日期" prop="createTime">
<span>{{parseTime(form.createTime,'{y}-{m}-{d}')}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="币别" prop="currency">
<span>人民币(RMB)</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购员" prop="purchaserId">
<el-input v-model="form.purchaserName" placeholder="请选择采购员" @click.native="purchaserSelectOpen=true" :readonly="true" >
<el-button slot="append" icon="el-icon-search" @click="purchaserSelectOpen=true"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="purchaserMobile">
<span>{{ form.purchaserMobile }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系邮箱" prop="purchaserEmail">
<span>{{ form.purchaserEmail }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库仓" prop="warehouseId">
<span>{{ selectedVendor.warehouseName }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="payMethod">
<span>{{ selectedVendor.payType==='1'?'出库付款':'入库付款' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="汇智负责人" prop="ownerId">
<el-input v-model="form.ownerName" placeholder="请选择汇智负责人" :readonly="true" >
<el-button slot="append" icon="el-icon-search" @click="ownerSelectOpen=true"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">采购列表</el-divider>
<el-table :data="form.omsPurchaseOrderItemList" style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品类型">
<template slot-scope="scope">
<el-select v-model="scope.row.productType" placeholder="请选择">
<el-option
v-for="dict in productTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="产品编码" prop="productCode">
<template slot-scope="scope">
<el-input v-model="scope.row.productCode" placeholder="请选择产品" :readonly="true" @click.native="handleSelectProduct(scope.$index)"></el-input>
</template>
</el-table-column>
<el-table-column label="产品型号">
<template slot-scope="scope">
<span>{{ scope.row.productModel }}</span>
</template>
</el-table-column>
<el-table-column label="产品描述" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.productDescription }}</span>
</template>
</el-table-column>
<el-table-column label="数量">
<template slot-scope="scope">
<el-input v-model.number="scope.row.quantity" type="number" :min="1" @change="calculateRowTotal(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column label="单位">
<span>台</span>
</el-table-column>
<el-table-column label="单价">
<template slot-scope="scope">
<el-input v-model.number="scope.row.price" type="number" :precision="2" :step="0.1" :min="0" @change="calculateRowTotal(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column label="含税小计" prop="amountTotal"></el-table-column>
<el-table-column label="交货日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.deliveryDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-plus" @click="addRow(scope.$index)">增加下行</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="summary-footer" style="margin-top: 20px; text-align: right;">
<el-row :gutter="20">
<el-col :span="22" style="font-weight: bold;">不含税总计金额:</el-col>
<el-col :span="2">{{ totalAmountWithoutTax.toFixed(2) }}</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="22" style="font-weight: bold;">税额合计:</el-col>
<el-col :span="2">{{ totalTaxAmount.toFixed(2) }}</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="22" style="font-weight: bold;">含税总计金额:</el-col>
<el-col :span="2">{{ totalAmountWithTax.toFixed(2) }}</el-col>
</el-row>
</div>
</el-form>
<select-user :visible.sync="purchaserSelectOpen" @user-selected="handlePurchaserSelect"></select-user>
<select-user :visible.sync="ownerSelectOpen" @user-selected="handleOwnerSelect"></select-user>
<select-product :visible.sync="productSelectOpen" @product-selected="handleProductSelected" :product-type="currentProductType"></select-product>
</div>
</template>
<script>
import { getPurchaseorder, addPurchaseorder, updatePurchaseorder } from "@/api/sip/purchaseorder";
import { listAllVendor } from "@/api/base/vendor";
import SelectUser from "@/views/system/user/selectUser";
import SelectProduct from "@/views/system/product/selectProduct";
import { getDicts } from "@/api/system/dict/data";
import {preciseCurrencyRound} from "@/utils/ruoyi";
export default {
name: "PurchaseOrderDetail",
components: { SelectUser, SelectProduct },
data() {
return {
// 产品选择弹窗
productSelectOpen: false,
// 当前编辑的产品行索引
editingProductIndex: -1,
// 当前编辑的产品类型
currentProductType: null,
// 产品类型字典
productTypeOptions: [],
// 制造商选项
vendorOptions: [],
// 选中的制造商信息
selectedVendor: {},
// 采购员选择弹窗
purchaserSelectOpen: false,
// 汇智负责人选择弹窗
ownerSelectOpen: false,
// 表单参数
form: {
id: null,
purchaseNo: null,
buyerName: '紫光汇智信息技术有限公司',
buyerAddress: '重庆市南岸区广福大道12号行政中心B区3号楼14-17',
vendorId: null,
currency: 'RMB',
purchaserId: null,
purchaserName: null,
purchaserMobile: null,
purchaserEmail: null,
warehouseId: null,
payMethod: null,
ownerId: null,
ownerName: null,
remark: null,
totalAmount: null,
status: 0,
approveStatus: 0,
approveNode: null,
confirmStatus: 0,
omsPurchaseOrderItemList: [
{
productType: null,
productCode: null,
productModel: null,
productDescription: null,
quantity: 1,
price: 0,
taxRate: 0.13,
amountTotal: 0,
deliveryDate: null
}
]
},
// 表单校验
rules: {
buyerName: [
{required: true, message: "采购方名称不能为空", trigger: "blur"}
],
vendorId: [
{required: true, message: "制造商不能为空", trigger: "change"}
],
purchaserId: [
{required: true, message: "采购员不能为空", trigger: "change"}
],
}
};
},
computed: {
totalAmountWithTax() {
const total = this.form.omsPurchaseOrderItemList?.reduce((acc, cur) => acc + (cur.amountTotal || 0), 0);
return preciseCurrencyRound(total) || 0;
},
totalAmountWithoutTax() {
const total = this.form.omsPurchaseOrderItemList?.reduce((acc, cur) => {
const amount = cur.quantity * cur.price || 0;
const taxRate = cur.taxRate || 0;
return acc + (amount / (1 + taxRate));
}, 0);
return (preciseCurrencyRound(total)) || 0;
},
totalTaxAmount() {
return (preciseCurrencyRound((this.totalAmountWithTax - this.totalAmountWithoutTax )) ) || 0;
}
},
created() {
this.getVendorList().then(() => {
getDicts("product_type").then(response => {
this.productTypeOptions = response.data;
});
});
},
methods: {
loadPurchaseOrder(id) {
if (id){
getPurchaseorder(id).then(response => {
this.form = response.data;
console.log(this.form)
// 加载订单后，根据vendorId回显制造商信息
this.handleVendorChange(this.form.vendorId);
// 确保 omsPurchaseOrderItemList 至少有一个空行如果它是空的
if (this.form.omsPurchaseOrderItemList && this.form.omsPurchaseOrderItemList.length === 0) {
this.form.omsPurchaseOrderItemList.push(this.getNewPurchaseOrderItem());
}
});
}
},
/** 打开产品选择弹窗 */
handleSelectProduct(index) {
if (!this.form.omsPurchaseOrderItemList[index].productType) {
this.$modal.msgWarning("请先选择产品类型");
return;
}
this.editingProductIndex = index;
this.currentProductType = this.form.omsPurchaseOrderItemList[index].productType;
this.productSelectOpen = true;
},
/** 处理产品选择 */
handleProductSelected(product) {
if (this.editingProductIndex > -1) {
const item = this.form.omsPurchaseOrderItemList[this.editingProductIndex];
this.$set(item, 'productCode', product.productCode);
this.$set(item, 'productModel', product.model);
this.$set(item, 'productDescription', product.description);
this.$set(item, 'price', product.cataloguePrice);
this.calculateRowTotal(item)
}
this.productSelectOpen = false;
},
/** 获取新的采购订单项 */
getNewPurchaseOrderItem() {
return {
productType: null,
productCode: null,
productModel: null,
productDescription: null,
quantity: 1,
price: 0,
taxRate: 0.13,
amountTotal: 0,
deliveryDate: null
};
},
/** 增加采购订单项 */
addRow(index) {
this.form.omsPurchaseOrderItemList.splice(index + 1, 0, this.getNewPurchaseOrderItem());
},
/** 删除采购订单项 */
deleteRow(index) {
if (this.form.omsPurchaseOrderItemList.length > 1) {
this.form.omsPurchaseOrderItemList.splice(index, 1);
} else {
this.$modal.msgWarning("至少保留一个采购项");
}
},
/** 计算含税小计 */
calculateRowTotal(row) {
if (row.quantity != null && row.price != null) {
row.amountTotal = Math.round(row.quantity * row.price * 100) / 100;
} else {
row.amountTotal = 0;
}
},
/** 获取厂商列表 */
getVendorList() {
return listAllVendor().then(res => {
this.vendorOptions = res.data;
})
},
/** 制造商选择变化 */
handleVendorChange(vendorId) {
if (vendorId) {
this.selectedVendor = this.vendorOptions.find(item => item.vendorId === vendorId) || {};
this.form.warehouseId = this.selectedVendor.warehouseId
} else {
this.selectedVendor = {};
this.form.warehouseId = null;
}
},
/** 处理采购员选择 */
handlePurchaserSelect(user) {
console.log(user)
this.$set(this.form, 'purchaserId', user.userId);
this.$set(this.form, 'purchaserName', user.userName);
this.$set(this.form, 'purchaserMobile', user.phonenumber);
this.$set(this.form, 'purchaserEmail', user.email);
this.purchaserSelectOpen = false;
},
/** 处理汇智负责人选择 */
handleOwnerSelect(user) {
this.$set(this.form, 'ownerId', user.userId);
this.$set(this.form, 'ownerName', user.userName);
this.ownerSelectOpen = false;
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updatePurchaseorder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit('success');
this.$emit('close');
});
} else {
addPurchaseorder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$emit('success');
this.$emit('close');
});
}
}
});
},
resetForm() {
this.form = {
id: null,
purchaseNo: null,
buyerName: '紫光汇智信息技术有限公司',
buyerAddress: '重庆市南岸区广福大道12号行政中心B区3号楼14-17',
vendorId: null,
currency: 'RMB',
purchaserId: null,
purchaserName: null,
purchaserMobile: null,
purchaserEmail: null,
warehouseId: null,
payMethod: null,
ownerId: null,
ownerName: null,
remark: null,
totalAmount: null,
status: 0,
approveStatus: 0,
approveNode: null,
confirmStatus: 0,
omsPurchaseOrderItemList: [
{
productType: null,
productCode: null,
productModel: null,
productDescription: null,
quantity: 1,
price: 0,
taxRate: 0.13,
amountTotal: 0,
deliveryDate: null
}
]
};
this.selectedVendor = {};
this.purchaserSelectOpen = false;
this.ownerSelectOpen = false;
this.productSelectOpen = false;
this.editingProductIndex = -1;
this.currentProductType = null;
if (this.$refs.form) {
this.$refs.form.resetFields();
}
},
}
};
</script>

299
oms_web/oms_vue/src/views/purchaseorder/index.vue 100644
View File

@ -0,0 +1,299 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="采购单号" prop="purchaseNo">
<el-input
v-model="queryParams.purchaseNo"
placeholder="请输入采购单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购方名称" prop="buyerName">
<el-input
v-model="queryParams.buyerName"
placeholder="请输入采购方名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="制造商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
placeholder="请输入制造商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="汇智负责人" prop="ownerName">
<el-input
v-model="queryParams.ownerName"
placeholder="请输入汇智负责人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审批状态" prop="approveStatus">
<el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
<el-option
v-for="dict in dict.type.approve_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="供应商确认状态" prop="confirmStatus">
<el-select v-model="queryParams.confirmStatus" placeholder="请选择供应商确认状态" clearable>
<el-option
v-for="dict in dict.type.vendor_confirm_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="采购状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择采购状态" clearable>
<el-option
v-for="dict in dict.type.purchase_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['sip:purchaseorder:add']"
>新增
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="purchaseorderList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="采购编号" align="center" prop="purchaseNo"/>
<el-table-column label="采购方名称" align="center" prop="buyerName"/>
<el-table-column label="制造商名称" align="center" prop="vendorName"/>
<el-table-column label="联系人" align="center" prop="vendorUser"/>
<el-table-column label="联系电话" align="center" prop="vendorPhone"/>
<el-table-column label="含税总计金额" align="center" prop="totalAmount"/>
<el-table-column label="发起日期" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="汇智负责人" align="center" prop="ownerName"/>
<el-table-column label="审批状态" align="center" prop="approveStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
</template>
</el-table-column>
<el-table-column label="审批节点" align="center" prop="approveNode">
<template slot-scope="scope">
<span>{{ scope.row.approveNode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="供应商确认状态" align="center" prop="confirmStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.vendor_confirm_status" :value="scope.row.confirmStatus"/>
</template>
</el-table-column>
<el-table-column label="采购状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.purchase_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['sip:purchaseorder:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['sip:purchaseorder:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改采购单主表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="80vw" append-to-body>
<purchase-order-detail ref="purchaseOrderDetail" @close="open = false"
@success="getList">
</purchase-order-detail>
<template slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</template>
</el-dialog>
</div>
</template>
<script>
import {
listPurchaseorder,
getPurchaseorder,
delPurchaseorder,
addPurchaseorder,
updatePurchaseorder
} from "@/api/sip/purchaseorder";
import PurchaseOrderDetail from './components/PurchaseOrderDetail';
export default {
name: "Purchaseorder",
dicts: ['approve_status', 'vendor_confirm_status', 'purchase_status'],
components: {
PurchaseOrderDetail
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
currentOrderId: null,
// 采购单主表表格数据
purchaseorderList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
purchaseNo: null,
buyerName: null,
vendorName: null,
ownerName: null,
approveStatus: null,
confirmStatus: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {}
};
},
created() {
this.getList();
},
watch:{
// 监听currentOrderId变化
open(val) {
if (val) {
this.$nextTick(()=>{
this.$refs.purchaseOrderDetail?.loadPurchaseOrder(this.currentOrderId)
})
}else{
this.currentOrderId=null
this.$refs.purchaseOrderDetail?.resetForm()
}
}
},
methods: {
/** 查询采购单主表列表 */
getList() {
this.loading = true;
listPurchaseorder(this.queryParams).then(response => {
this.purchaseorderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
},
// 表单重置
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.open = true;
this.title = "添加采购单主表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentOrderId = row.id;
this.open = true;
this.title = "修改采购单主表";
},
/** 提交按钮 */
submitForm() {
this.$refs.purchaseOrderDetail.submitForm()
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除采购单主表编号为"' + ids + '"的数据项？').then(function () {
return delPurchaseorder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
}
}
};
</script>

98
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java 100644
View File

@ -0,0 +1,98 @@
package com.ruoyi.sip.controller.vue;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sip.domain.OmsPurchaseOrder;
import com.ruoyi.sip.service.IOmsPurchaseOrderService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 采购单主表Controller
*
* @author ruoyi
* @date 2025-11-24
*/
@RestController
@RequestMapping("/sip/purchaseorder")
public class OmsPurchaseOrderController extends BaseController
{
@Autowired
private IOmsPurchaseOrderService omsPurchaseOrderService;
/**
* 查询采购单主表列表
*/
@RequiresPermissions("sip:purchaseorder:list")
@GetMapping("/list")
public TableDataInfo list(OmsPurchaseOrder omsPurchaseOrder)
{
startPage();
List<OmsPurchaseOrder> list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
return getDataTable(list);
}
/**
* 导出采购单主表列表
*/
@RequiresPermissions("sip:purchaseorder:export")
@Log(title = "采购单主表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OmsPurchaseOrder omsPurchaseOrder)
{
List<OmsPurchaseOrder> list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
ExcelUtil<OmsPurchaseOrder> util = new ExcelUtil<OmsPurchaseOrder>(OmsPurchaseOrder.class);
util.exportExcel(response, list, "采购单主表数据");
}
/**
* 获取采购单主表详细信息
*/
@RequiresPermissions("sip:purchaseorder:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(omsPurchaseOrderService.selectOmsPurchaseOrderById(id));
}
/**
* 新增采购单主表
*/
@RequiresPermissions("sip:purchaseorder:add")
@Log(title = "采购单主表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OmsPurchaseOrder omsPurchaseOrder)
{
return toAjax(omsPurchaseOrderService.insertOmsPurchaseOrder(omsPurchaseOrder));
}
/**
* 修改采购单主表
*/
@RequiresPermissions("sip:purchaseorder:edit")
@Log(title = "采购单主表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OmsPurchaseOrder omsPurchaseOrder)
{
return toAjax(omsPurchaseOrderService.updateOmsPurchaseOrder(omsPurchaseOrder));
}
/**
* 删除采购单主表
*/
@RequiresPermissions("sip:purchaseorder:remove")
@Log(title = "采购单主表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(omsPurchaseOrderService.deleteOmsPurchaseOrderByIds(ids));
}
}

91
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java 100644
View File

@ -0,0 +1,91 @@
package com.ruoyi.sip.domain;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 采购单主表对象 oms_purchase_order
*
* @author ruoyi
* @date 2025-11-24
*/
@Data
@ToString
public class OmsPurchaseOrder extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 采购单号（系统生成） */
private String purchaseNo;
/** 采购方名称 */
private String buyerName;
/** 采购方地址 */
private String buyerAddress;
/** 制造商ID */
private Long vendorId;
private String vendorName;
private String vendorUser;
private String vendorPhone;
/** 币别（固定人民币） */
private String currency;
/** 采购员ID */
private Long purchaserId;
/** 采购员姓名 */
private String purchaserName;
/** 采购员电话 */
private String purchaserMobile;
/** 采购员邮箱 */
private String purchaserEmail;
/** 入库仓库ID */
private Long warehouseId;
/** 付款方式 */
private String payMethod;
/** 汇智负责人ID */
private Long ownerId;
/** 汇智负责人姓名 */
private String ownerName;
/** 含税总金额 */
private BigDecimal totalAmount;
/** 采购状态（0待入库 1部分入库 2已完成） */
private Integer status;
/** 审批状态（0草稿 1审批中 2已通过 3驳回） */
private Integer approveStatus;
/** 当前审批节点 */
private String approveNode;
/** 确认状态（0待确认 1已确认） */
private Integer confirmStatus;
/** 删除标志（0正常 1删除） */
private Integer delFlag;
/** 采购单明细表信息 */
private List<OmsPurchaseOrderItem> omsPurchaseOrderItemList;
}

57
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderItem.java 100644
View File

@ -0,0 +1,57 @@
package com.ruoyi.sip.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 采购单明细表对象 oms_purchase_order_item
*
* @author ruoyi
* @date 2025-11-24
*/
@Data
@ToString
public class OmsPurchaseOrderItem extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 关联采购单ID */
private Long purchaseId;
/** 产品CODE */
private String productCode;
/** 0:待入库 1:已完成 */
private Long innerStatus;
/** 数量 */
private BigDecimal quantity;
/** 单价 */
private BigDecimal price;
/** 税率百分比 */
private BigDecimal taxRate;
/** 税额 */
private BigDecimal taxTotal;
/** 含税金额 */
private BigDecimal amountTotal;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date deliveryDate;
private String productType;
private String productModel;
private String productDescription;
}

28
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java
View File

@ -62,6 +62,34 @@ public class VendorInfo extends BaseEntity
private String warehouseId;
private String ownWarehouseId;
//付款方式
private Integer payType;
//付款配置天数
private Integer payConfigDay;
//账户名称
private String payName;
//银行卡号
private String payBankNumber;
//开户行
private String payBankOpenAddress;
//银行行号
private String bankNumber;
//统一社会信用代码
private String socialCredit;
/** 省份 */
@Excel(name = "省份")
private String province;
/** 城市 */
@Excel(name = "城市")
private String city;
/** 生成地址 */
@Excel(name = "生成地址")
private String generatedAddress;
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private List<String> warehouseIdList;

2
ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/mapper/TodoMapper.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.sip.flowable.mapper;
import com.ruoyi.sip.flowable.domain.Todo;
import com.sun.xml.internal.bind.v2.TODO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

91
ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapper.java 100644
View File

@ -0,0 +1,91 @@
package com.ruoyi.sip.mapper;
import java.util.List;
import com.ruoyi.sip.domain.OmsPurchaseOrder;
import com.ruoyi.sip.domain.OmsPurchaseOrderItem;
/**
* 采购单主表Mapper接口
*
* @author ruoyi
* @date 2025-11-24
*/
public interface OmsPurchaseOrderMapper
{
/**
* 查询采购单主表
*
* @param id 采购单主表主键
* @return 采购单主表
*/
public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id);
/**
* 查询采购单主表列表
*
* @param omsPurchaseOrder 采购单主表
* @return 采购单主表集合
*/
public List<OmsPurchaseOrder> selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder);
/**
* 新增采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder);
/**
* 修改采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder);
/**
* 删除采购单主表
*
* @param id 采购单主表主键
* @return 结果
*/
public int deleteOmsPurchaseOrderById(Long id);
/**
* 批量删除采购单主表
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOmsPurchaseOrderByIds(Long[] ids);
/**
* 批量删除采购单明细表
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOmsPurchaseOrderItemByPurchaseIds(Long[] ids);
/**
* 批量新增采购单明细表
*
* @param omsPurchaseOrderItemList 采购单明细表列表
* @return 结果
*/
public int batchOmsPurchaseOrderItem(List<OmsPurchaseOrderItem> omsPurchaseOrderItemList);
/**
* 通过采购单主表主键删除采购单明细表信息
*
* @param id 采购单主表ID
* @return 结果
*/
public int deleteOmsPurchaseOrderItemByPurchaseId(Long id);
int selectMaxOrderCode(String string);
List<OmsPurchaseOrderItem> listItemByPurchaseId(Long id);
}

61
ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPurchaseOrderService.java 100644
View File

@ -0,0 +1,61 @@
package com.ruoyi.sip.service;
import java.util.List;
import com.ruoyi.sip.domain.OmsPurchaseOrder;
/**
* 采购单主表Service接口
*
* @author ruoyi
* @date 2025-11-24
*/
public interface IOmsPurchaseOrderService
{
/**
* 查询采购单主表
*
* @param id 采购单主表主键
* @return 采购单主表
*/
public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id);
/**
* 查询采购单主表列表
*
* @param omsPurchaseOrder 采购单主表
* @return 采购单主表集合
*/
public List<OmsPurchaseOrder> selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder);
/**
* 新增采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder);
/**
* 修改采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder);
/**
* 批量删除采购单主表
*
* @param ids 需要删除的采购单主表主键集合
* @return 结果
*/
public int deleteOmsPurchaseOrderByIds(Long[] ids);
/**
* 删除采购单主表信息
*
* @param id 采购单主表主键
* @return 结果
*/
public int deleteOmsPurchaseOrderById(Long id);
}

183
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java 100644
View File

@ -0,0 +1,183 @@
package com.ruoyi.sip.service.impl;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.sip.domain.Cnarea;
import com.ruoyi.sip.domain.VendorInfo;
import com.ruoyi.sip.service.ICnareaService;
import com.ruoyi.sip.service.IVendorInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.sip.domain.OmsPurchaseOrderItem;
import com.ruoyi.sip.mapper.OmsPurchaseOrderMapper;
import com.ruoyi.sip.domain.OmsPurchaseOrder;
import com.ruoyi.sip.service.IOmsPurchaseOrderService;
import javax.annotation.Resource;
/**
* 采购单主表Service业务层处理
*
* @author ruoyi
* @date 2025-11-24
*/
@Service
public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService
{
@Resource
private OmsPurchaseOrderMapper omsPurchaseOrderMapper;
@Autowired
private ICnareaService cnareaService;
@Autowired
private IVendorInfoService vendorInfoService;
/**
* 查询采购单主表
*
* @param id 采购单主表主键
* @return 采购单主表
*/
@Override
public OmsPurchaseOrder selectOmsPurchaseOrderById(Long id)
{
OmsPurchaseOrder omsPurchaseOrder = omsPurchaseOrderMapper.selectOmsPurchaseOrderById(id);
List<OmsPurchaseOrderItem> omsPurchaseOrderItems = omsPurchaseOrderMapper.listItemByPurchaseId(id);
omsPurchaseOrder.setOmsPurchaseOrderItemList(omsPurchaseOrderItems);
return omsPurchaseOrder;
}
/**
* 查询采购单主表列表
*
* @param omsPurchaseOrder 采购单主表
* @return 采购单主表
*/
@Override
public List<OmsPurchaseOrder> selectOmsPurchaseOrderList(OmsPurchaseOrder omsPurchaseOrder)
{
return omsPurchaseOrderMapper.selectOmsPurchaseOrderList(omsPurchaseOrder);
}
/**
* 新增采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
@Transactional
@Override
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
{
omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
int rows = omsPurchaseOrderMapper.insertOmsPurchaseOrder(omsPurchaseOrder);
insertOmsPurchaseOrderItem(omsPurchaseOrder);
return rows;
}
/**
* 生成订单编号
*
* @param province 省份代码
* @return 订单编号
*/
private String generatePurchaseNo(Long vendorId) {
VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorId(vendorId);
if (vendorInfo==null || StringUtils.isEmpty(vendorInfo.getProvince())) {
throw new ServiceException("制造商所属省为空,无法生成订单编号");
}
// 获取当前时间，格式为yyyyMMdd
String currentDate = DateUtils.dateTimeNow("yyyyMMdd");
Cnarea cnarea = new Cnarea();
cnarea.setName(vendorInfo.getProvince());
cnarea.setLevel("1");
List<Cnarea> cnareas = cnareaService.queryAll(cnarea);
if (CollUtil.isEmpty(cnareas)) {
throw new ServiceException("省市未配置,生成订单编号出错,请联系管理员");
}
String shortCode = cnareas.get(0).getShortCode();
StringBuilder result = new StringBuilder();
result.append("ZGCV-").append(currentDate).append(shortCode);
// 查询当天已有的订单数量，用于生成顺序编码
int count = omsPurchaseOrderMapper.selectMaxOrderCode(result.toString());
// 生成顺序编码，不足三位补零
String sequence = String.format("%03d", count + 1);
result.append(sequence);
// 拼接订单编号
return result.toString();
}
/**
* 修改采购单主表
*
* @param omsPurchaseOrder 采购单主表
* @return 结果
*/
@Transactional
@Override
public int updateOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
{
omsPurchaseOrder.setUpdateTime(DateUtils.getNowDate());
omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseId(omsPurchaseOrder.getId());
insertOmsPurchaseOrderItem(omsPurchaseOrder);
return omsPurchaseOrderMapper.updateOmsPurchaseOrder(omsPurchaseOrder);
}
/**
* 批量删除采购单主表
*
* @param ids 需要删除的采购单主表主键
* @return 结果
*/
@Transactional
@Override
public int deleteOmsPurchaseOrderByIds(Long[] ids)
{
omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseIds(ids);
return omsPurchaseOrderMapper.deleteOmsPurchaseOrderByIds(ids);
}
/**
* 删除采购单主表信息
*
* @param id 采购单主表主键
* @return 结果
*/
@Transactional
@Override
public int deleteOmsPurchaseOrderById(Long id)
{
omsPurchaseOrderMapper.deleteOmsPurchaseOrderItemByPurchaseId(id);
return omsPurchaseOrderMapper.deleteOmsPurchaseOrderById(id);
}
/**
* 新增采购单明细表信息
*
* @param omsPurchaseOrder 采购单主表对象
*/
public void insertOmsPurchaseOrderItem(OmsPurchaseOrder omsPurchaseOrder)
{
List<OmsPurchaseOrderItem> omsPurchaseOrderItemList = omsPurchaseOrder.getOmsPurchaseOrderItemList();
Long id = omsPurchaseOrder.getId();
if (StringUtils.isNotNull(omsPurchaseOrderItemList))
{
List<OmsPurchaseOrderItem> list = new ArrayList<OmsPurchaseOrderItem>();
for (OmsPurchaseOrderItem omsPurchaseOrderItem : omsPurchaseOrderItemList)
{
omsPurchaseOrderItem.setPurchaseId(id);
list.add(omsPurchaseOrderItem);
}
if (list.size() > 0)
{
omsPurchaseOrderMapper.batchOmsPurchaseOrderItem(list);
}
}
}
}

42
ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml
View File

@ -17,11 +17,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="payType" column="pay_type" />
<result property="payConfigDay" column="pay_config_day" />
<result property="socialCredit" column="social_credit" />
<result property="payName" column="pay_name" />
<result property="payBankNumber" column="pay_bank_number" />
<result property="payBankOpenAddress" column="pay_bank_open_address" />
<result property="bankNumber" column="bank_number" />
<result property="province" column="province" />
<result property="city" column="city" />
<result property="generatedAddress" column="generated_address" />
</resultMap>
<sql id="selectVendorInfoVo">
select t1.vendor_id, t1.vendor_code, t1.vendor_name, t1.vendor_address, t1.vendor_user, t1.vendor_email, t1.vendor_phone, t1.vendor_status
, t1.create_by, t1.update_by, t1.create_time, t1.update_time,t1.warehouse_id,t1.own_warehouse_id
, t1.pay_type, t1.pay_config_day, t1.social_credit, t1.pay_name, t1.pay_bank_number, t1.pay_bank_open_address, t1.bank_number
, t1.province, t1.city, t1.generated_address
,t2.warehouse_name
from oms_vendor_info t1
left join oms_warehouse_info t2 on t1.warehouse_id = t2.id
@ -65,6 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="payType != null">pay_type,</if>
<if test="payConfigDay != null">pay_config_day,</if>
<if test="socialCredit != null and socialCredit != ''">social_credit,</if>
<if test="payName != null and payName != ''">pay_name,</if>
<if test="payBankNumber != null and payBankNumber != ''">pay_bank_number,</if>
<if test="payBankOpenAddress != null and payBankOpenAddress != ''">pay_bank_open_address,</if>
<if test="bankNumber != null and bankNumber != ''">bank_number,</if>
<if test="province != null and province != ''">province,</if>
<if test="city != null and city != ''">city,</if>
<if test="generatedAddress != null and generatedAddress != ''">generated_address,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="vendorId != null">#{vendorId},</if>
@ -81,6 +103,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="payType != null">#{payType},</if>
<if test="payConfigDay != null">#{payConfigDay},</if>
<if test="socialCredit != null and socialCredit != ''">#{socialCredit},</if>
<if test="payName != null and payName != ''">#{payName},</if>
<if test="payBankNumber != null and payBankNumber != ''">#{payBankNumber},</if>
<if test="payBankOpenAddress != null and payBankOpenAddress != ''">#{payBankOpenAddress},</if>
<if test="bankNumber != null and bankNumber != ''">#{bankNumber},</if>
<if test="province != null and province != ''">#{province},</if>
<if test="city != null and city != ''">#{city},</if>
<if test="generatedAddress != null and generatedAddress != ''">#{generatedAddress},</if>
</trim>
</insert>
@ -100,6 +132,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="payType != null">pay_type = #{payType},</if>
<if test="payConfigDay != null">pay_config_day = #{payConfigDay},</if>
<if test="socialCredit != null and socialCredit != ''">social_credit = #{socialCredit},</if>
<if test="payName != null and payName != ''">pay_name = #{payName},</if>
<if test="payBankNumber != null and payBankNumber != ''">pay_bank_number = #{payBankNumber},</if>
<if test="payBankOpenAddress != null and payBankOpenAddress != ''">pay_bank_open_address = #{payBankOpenAddress},</if>
<if test="bankNumber != null and bankNumber != ''">bank_number = #{bankNumber},</if>
<if test="province != null and province != ''">province = #{province},</if>
<if test="city != null and city != ''">city = #{city},</if>
<if test="generatedAddress != null and generatedAddress != ''">generated_address = #{generatedAddress},</if>
</trim>
where vendor_id = #{vendorId}
</update>