From bfcd7f5b405e431a5c07fe3fa77d74c892d4e66b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期四, 19 三月 2026 15:52:42 +0800
Subject: [PATCH] fix: 修复出入库冲突拦截，系统位置与实际位置的映射和修复
---
项目代码/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 21 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 22f2eea..8ab357a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -27,29 +27,33 @@
sortName: "id",
});
const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
+ palletCode: "",
+ locationCode: "",
+ stockStatus: "",
+ palletType: "",
+ warehouseId: "",
+ roadway: "",
+
});
const editFormOptions = ref([
[
{field:'palletCode',title:'鎵樼洏缂栧彿',type:'string'},
{field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
+ {field: "stockStatus",title:'搴撳瓨鐘舵��',type:'select',dataKey:'stockStatusEmun',data:[]}
]
]);
const searchFormFields = ref({
palletCode: "",
locationCode: "",
+ roadway: "",
+ warehouseId: "",
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode" ,type:'like'},
+ { title: "璐т綅缂栧彿", field: "locationCode",type:'like' },
+ { title: "宸烽亾缂栧彿", field: "roadway",type:'string' },
+ { title: "浠撳簱", field: "warehouseId",type:'select', dataKey: "warehousetype", data: [] }
],
]);
const columns = ref([
@@ -62,14 +66,27 @@
readonly: true,
require: true,
align: "left",
- },
+ },{
+ field: "warehouseId",
+ title: "浠撳簱缂栧彿",
+ type: "int",
+ width: 80,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 90,
align: "left",
- },
+ },{
+ field: "roadway",
+ title: "宸烽亾鍙�",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
{
field: "locationCode",
title: "璐т綅缂栧彿",
@@ -77,21 +94,36 @@
width: 150,
align: "left",
},
- // {
- // field: "isFull",
- // title: "鏄惁婊＄洏",
- // type: "string",
- // width: 150,
- // align: "left",
- // bind: { key: "yesno", data: [] },
- // },
+ {
+ field: "palletType",
+ title: "鎵樼洏绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "center",
+ sort:true,
+ formatter: (row) => {
+ if (row.warehouseId === 2) {
+ return "鎴愬搧";
+ } else {
+ return row.palletType == 1 ? "甯冩枡" : "鏉惧竷鏂�";
+ }
+ }
+ },{
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ sort:true,
+ bind: { key: "stockStatusEmun", data: [] },
+ },
{
field: "warehouseId",
title: "浠撳簱",
type: "select",
width: 100,
align: "left",
- bind: { key: "warehouses", data: [] },
+ bind: { key: "warehousetype", data: [] },
},
{
field: "creater",
--
Gitblit v1.9.3