Skip to content

M
mini-wms
Commit 1f269b05 by zhangtw
Options

页面问题修复

parent 64b1e41d
正在显示 包含 59 行增加 和 48 行删除
ruoyi-admin-vue/src/api/inventory/inventory.js
......@@ -26,6 +26,15 @@ export function addInventory(data) {
})
}
// 批量新增库存
export function batchAddInventory(data){
return request({
url: '/inventory/inventory/batchAdd',
method: 'post',
data: data
})
}
// 修改库存
export function updateInventory(data) {
return request({
......
ruoyi-admin-vue/src/views/inventory/inbound_items/index.vue
......@@ -258,7 +258,6 @@
<script>
import { listInbound_items, delInbound_items , listInbound_itemsAndMname} from "@/api/inventory/inbound_items"
import { getDicts } from "@/api/system/dict/data";
import ImportExcel from "@/components/ImportExcel/index"
// 使用默认的dict实例，不需要单独实例化Dict类
// 使用默认的dict实例，无需导入DictMeta和DictData
......
ruoyi-admin-vue/src/views/inventory/materials/index.vue
......@@ -141,9 +141,9 @@
<!-- 表格列保持不变 -->
<el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column type="index" label="序号" align="center"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="120"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="SAP物料号" align="center" prop="sapNo" />
<!-- <el-table-column label="物料编码" align="center" prop="materialCode" width="120"/> -->
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="TS Code" align="center" prop="tsCode" />
<el-table-column label="物料分类" align="center" prop="categoryCode" >
<template slot-scope="scope">
......@@ -181,12 +181,12 @@
<el-table-column label="排序" align="center" prop="sortNo" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="修改时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding" fixed="right" width="200">
......@@ -227,22 +227,14 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="物料编码" prop="materialCode">
<!-- <el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码" />
</el-form-item>
</el-form-item> -->
<el-form-item label="SAP物料号" prop="sapNo">
<el-input v-model="form.sapNo" placeholder="请输入SAP物料号" />
</el-form-item>
<el-form-item label="物料分类" prop="categoryCode">
<el-select v-model="form.categoryCode" placeholder="请选择物料分类" clearable>
<el-option
v-for="item in categoryTreeOptions"
:key="item.categoryCode"
:label="item.categoryName"
:value="item.categoryCode"
>
</el-option>
</el-select>
<el-form-item label="TS Code" prop="tsCode">
<el-input v-model="form.tsCode" placeholder="请输入TS Code" />
</el-form-item>
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格型号" />
......@@ -259,25 +251,39 @@
<el-form-item label="特殊存储要求" prop="specialRequirements">
<el-input v-model="form.specialRequirements" placeholder="请输入特殊存储要求" />
</el-form-item>
<el-form-item label="最高库存" prop="maxStockLevel">
<el-input v-model="form.maxStockLevel" placeholder="请输入最高库存" />
</el-form-item>
<el-form-item label="风险等级" prop="riskLevel">
<el-input v-model="form.riskLevel" placeholder="请输入风险等级" />
</el-form-item>
<el-form-item label="是否序列号管理" prop="isSerialManaged">
<el-radio-group v-model="form.isSerialManaged">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="最高库存" prop="maxStockLevel">
<el-input v-model="form.maxStockLevel" placeholder="请输入最高库存" />
</el-form-item>
<el-form-item label="风险等级" prop="riskLevel">
<el-input v-model="form.riskLevel" placeholder="请输入风险等级" />
<el-form-item label="是否批次管理" prop="isBatchManaged">
<el-radio-group v-model="form.isBatchManaged">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="TS Code" prop="tsCode">
<el-input v-model="form.tsCode" placeholder="请输入TS Code" />
<el-form-item label="物料分类" prop="categoryCode">
<el-select v-model="form.categoryCode" placeholder="请选择物料分类" clearable>
<el-option
v-for="item in categoryTreeOptions"
:key="item.categoryCode"
:label="item.categoryName"
:value="item.categoryCode"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="危险类别ID" prop="hazardId">
<el-input v-model="form.hazardId" placeholder="请输入危险类别ID" />
......@@ -294,24 +300,19 @@
<el-form-item label="存储温度要求" prop="storageTemperature">
<el-input v-model="form.storageTemperature" placeholder="请输入存储温度要求" />
</el-form-item>
<el-form-item label="是否批次管理" prop="isBatchManaged">
<el-radio-group v-model="form.isBatchManaged">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="最低库存" prop="minStockLevel">
<el-input v-model="form.minStockLevel" placeholder="请输入最低库存" />
</el-form-item>
<el-form-item label="排序" prop="sortNo">
<el-input v-model="form.sortNo" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="是否激活" prop="isActive">
<el-radio-group v-model="form.isActive">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序" prop="sortNo">
<el-input v-model="form.sortNo" placeholder="请输入排序" />
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -423,8 +424,8 @@ export default {
shelfLifeDays: null,
storageTemperature: null,
specialRequirements: null,
isBatchManaged: 0,
isSerialManaged: 0,
isBatchManaged: 1,
isSerialManaged: 1,
minStockLevel: null,
maxStockLevel: null,
isUsed: 1,
......
ruoyi-admin-vue/src/views/inventory/materials_category/index.vue
......@@ -8,7 +8,7 @@
plain
size="medium"
icon="el-icon-plus"
@click="handleAdd"
@click="handleAdd(null)"
v-hasPermi="['inventory:materials_category:add']"
>新增</el-button>
......@@ -98,12 +98,12 @@
<el-table-column label="排序" align="center" prop="sortNo" width="80" />
<el-table-column label="创建时间" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="修改时间" align="center" prop="updateTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250" fixed="right">
......@@ -276,6 +276,7 @@ export default {
dialogFormData: {
immediate: true,
handler(val) {
console.log(val)
this.form = { ...val }
}
},
......@@ -528,9 +529,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
const _id = row ? row.id : this.ids;
console.log(_id)
getMaterials_category(_id).then(response => {
this.form = response.data;
this.dialogOpen = true;
......@@ -553,17 +552,19 @@ export default {
// 重新加载数据
Promise.all([
this.getCategoryOptions(),
new Promise(resolve => {
this.getList();
this.resetQuery();
// this.getList();
setTimeout(resolve, 100);
})
]).then(() => {
if (type === "add" && this.form.parentId) {
this.selectTreeNode(this.form.parentId);
} else if (this.currentNodeId) {
this.selectTreeNode(this.currentNodeId);
}
// if (type === "add" && this.form.parentId) {
// this.selectTreeNode(this.form.parentId);
// } else if (this.currentNodeId) {
// this.selectTreeNode(this.currentNodeId);
// }
});
this.$emit("form-submit", { type, data: this.form });
......@@ -574,8 +575,8 @@ export default {
/** 删除操作 */
handleDelete(row) {
const _code = row ? row.categoryCode : this.ids;
this.$modal.confirm(`是否确认删除物料分类编码为"${_code}"的数据项？`).then(() => {
const _ids = row ? row.id : this.ids;
this.$modal.confirm(`是否确认删除物料分类编码为"${row.categoryCode}"的数据项？`).then(() => {
delMaterials_category(_ids).then(() => {
this.getList();
this.getCategoryOptions();
......
ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/InboundOrdersServiceImpl.java
......@@ -126,6 +126,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
{
inboundOrderItems.setId(UUID.randomUUID().toString());
inboundOrderItems.setOrderId(orderId);
inboundOrderItems.setCreateTime(DateUtils.getNowDate());
list.add(inboundOrderItems);
}
if (list.size() > 0)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论