zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库部分和接口

Browse Source
This commit is contained in:
张怡蓉
2025-12-30 09:28:36 +08:00
parent dc8f2d329a
commit f5f4d1007a
22 changed files with 705 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
ruoyi-ui/src/views/in/stockIn/add/index_new.vue
View File

@@ -6,21 +6,6 @@
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="订单号" prop="erpBill">
<el-input v-model="form.erpBill" placeholder="请输入订单号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="供应商" prop="supplierId">
<el-input
v-model="form.supplierName"
placeholder="请选择供应商"
@click.native="openSupplierSelector"
readonly
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单据类型" prop="inType"><!--单据类型-->
<el-select v-model="form.inType" placeholder="请选择单据类型" >
@@ -33,10 +18,34 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
<el-form-item label="供应商" prop="supplierId">
<el-input
v-model="form.supplierName"
placeholder="请选择供应商"
@click.native="openSupplierSelector"
readonly
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="项目号" prop="departmentNo">
<el-input v-model="form.departmentNo" placeholder="请输入项目号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="合同号" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入合同号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="销售订单号" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入销售订单号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="备注" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入备注"/>
</el-form-item>
</el-col>
@@ -62,72 +71,14 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" label="序号" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed label="品号" align="left" prop="productId" />
<el-table-column fixed label="品名" align="left" prop="productName" />
<el-table-column label="型号" align="left">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare1"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="净重" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare2"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="颜色" align="left">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare3"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="序列号" align="left">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare4"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="电压" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare5"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="功率" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare6"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="相位" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare7"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="毛重" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare8"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column fixed label="存货编码" align="left" prop="productId" />
<el-table-column fixed label="存货名称" align="left" prop="productName" />
<el-table-column fixed label="单位" align="left" prop="unit" />
<el-table-column fixed label="规格型号" align="left" prop="spec" />
<el-table-column fixed label="层级关系" align="left" prop="spare1" />
<el-table-column fixed label="上层物料" align="left" prop="spare2" />
<el-table-column fixed label="顶层物料" align="left" prop="spare3" />
<el-table-column label="数量" width="120" align="right">
<template slot-scope="scope">
<el-input-number
@@ -145,23 +96,48 @@
required="required"/>
</template>
</el-table-column>
<el-table-column label="机型" width="120" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.unit"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="分销" width="120" align="right">
<template slot-scope="scope">
<el-input
v-model="scope.row.spare9"
controls-position="right"
required="required"/>
</template>
</el-table-column>
<el-table-column label="描述" align="left" prop="remark">
<!-- <el-table-column label="单位" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.unit"-->
<!-- controls-position="right"-->
<!-- required="required"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="规格型号" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.spec"-->
<!-- controls-position="right"-->
<!-- required="required"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="层级关系" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.spare1"-->
<!-- controls-position="right"-->
<!-- required="required"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="上层物料" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.spare2"-->
<!-- controls-position="right"-->
<!-- required="required"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="顶层物料" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.spare3"-->
<!-- controls-position="right"-->
<!-- required="required"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" align="left" prop="remark">
<template slot-scope="scope">
<el-input
v-model="scope.row.remark"
@@ -363,27 +339,26 @@ export default {
return {
// 表单参数
form: {
warehouseId: undefined,
supplierId: undefined,
supplierName: undefined,
remark: undefined,
erpBill:undefined,
inType:undefined,
totalQuantity: 0,
// totalAmount: 0,
totalNetWeight:0,
netWeight:0,
grossWeight:0,
file: undefined,
warehouseId: null,
supplierId: null,
classNo: null,
remark: null,
erpBill:null,
departmentNo:null,
inType:null,
spare1:null,
spare2:null,
spare5:null
},
// 表单校验
rules: {
erpBill: [
{required: true, message: "请输入订单号", trigger: "change"}
],
supplierId: [
{required: true, message: "请选择供应商", trigger: "change"}
],
// departmentNo: [
// {required: true, message: "请输入项目号", trigger: "change"}
// ],
// supplierId: [
// {required: true, message: "请选择供应商", trigger: "change"}
// ],
inType:[
{required: true, message: "请选择单据类型", trigger: "change"}
]
@@ -424,13 +399,7 @@ export default {
productTotal: 0,
// 供应商加载状态
productLoading: false,
// 总数量
totalQuantity: 0,
// 总金额
// totalAmount: 0,
totalNetWeight:0,
netWeight:0,
grossWeight:0,
//物料查询参数
queryParamsPro: {
pageNum: 1,
@@ -461,7 +430,7 @@ export default {
};
},
created() {
this.getWarehouseList();
// this.getWarehouseList();
this.getSupplierList();
this.getProductList();
},
@@ -521,7 +490,7 @@ export default {
return;
}
this.form.supplierId = this.selectedSupplier.supplierNo;
this.form.supplierName = this.selectedSupplier.supplierName;
this.form.classNo = this.selectedSupplier.supplierName;
this.supplierDialog = false;
},
@@ -604,9 +573,7 @@ export default {
spare8: item.spare8,
spare9:"",
lotNo:"",
totalNetWeight: 0,
netWeight: 0,
grossWeight: 0
}));
this.productList.push(...newProducts);
this.productDialog = false;
@@ -708,6 +675,10 @@ export default {
remark: this.form.remark,
inType:this.form.inType,
erpBill:this.form.erpBill,
departmentNo:this.form.departmentNo,
spare1:this.form.spare1,
spare2:this.form.spare2,
spare5:this.form.spare5,
productVoList: this.productList.map(item => ({
productId: item.productId,
quantity: item.quantity,

82
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -31,25 +31,50 @@
/>
</el-select>
</el-form-item>
<el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
<el-form-item label="项目号" prop="departmentNo">
<el-input
v-model="queryParams.departmentNo"
placeholder="请输入项目号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="spare1">
<el-input
v-model="queryParams.erpBill"
placeholder="请输入订单号"
v-model="queryParams.spare1"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品名" prop="materialDesc"><!--品名-->
<el-form-item label="销售订单号" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入销售订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存货名称" prop="materialDesc"><!--品名-->
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入品名"
placeholder="请输入存货名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo"><!--品名-->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'创建时间'" prop="dateRange">
<el-form-item :label="'单据时间'" prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"
@@ -146,9 +171,8 @@
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库订单" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150" sortable/><!--入库订单-->
<el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
<el-table-column label="入库单据号" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
<el-table-column label="单据类型" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
@@ -164,11 +188,17 @@
</template>
</el-table-column>
<el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column label="供应商" align="left" prop="supplierName" sortable/><!--供应商-->
<el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
<el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
<el-table-column label="创建时间" align="left" prop="createDate" sortable/><!--建立时间-->
<el-table-column label="供应商代码" align="left" prop="supplierNo"/><!--仓库-->
<el-table-column label="供应商名称" align="left" prop="classNo" /><!--供应商-->
<el-table-column label="制单人" align="left" prop="createManId"/><!--创建人-->
<el-table-column label="项目号" align="left" prop="departmentNo"/><!--部门-->
<el-table-column label="单据时间" align="left" prop="createDate" sortable/><!--建立时间-->
<el-table-column label="确认时间" align="left" prop="finishDate" sortable/><!--完成日期-->
<el-table-column label="合同号" align="left" prop="spare1" sortable/><!--完成日期-->
<el-table-column label="销售单号" align="left" prop="spare2" sortable/><!--完成日期-->
<el-table-column label="审核时间" align="left" prop="spare3" sortable/><!--完成日期-->
<el-table-column label="审核人" align="left" prop="spare4" /><!--完成日期-->
<el-table-column label="备注" align="left" prop="spare5" /><!--完成日期-->
</el-table>
<pagination
@@ -183,23 +213,17 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" sortable/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
<el-table-column label="品号" align="left" prop="productId" sortable/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="存货编码" align="left" prop="productId" sortable/><!--品号-->
<el-table-column label="存货名称" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="计划数量" align="right" prop="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum" sortable/><!--实际数量-->
<el-table-column label="单位" align="left" prop="unit"/><!--机型-->
<el-table-column label="规格型号" align="left" prop="spec"/><!--规格-->
<el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
<el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
<el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="计划数量" align="left" prop="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
</el-table>
<pagination