From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WMS/WMSClient/src/views/stock/stockInfo.vue | 161 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 142 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
index 22f2eea..8ff1375 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/stockInfo.vue"
@@ -45,11 +45,25 @@
const searchFormFields = ref({
palletCode: "",
locationCode: "",
+ materielCode: "",
+ materielWide: "",
+ rfidCode: "",
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "鏉＄爜缂栧彿", field: "palletCode",type:"like" },
+ {title: "RFID缂栧彿", field:"rfidCode",type:"like"},
+ { title: "璐т綅缂栧彿", field: "locationCode",type:"like" },
+ {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
+ ],
+ [
+ {title: "鐗╂枡缂栧彿", field:"materielCode",type:"like"},
+ {title: "鐗╂枡骞呭", field:"materielWide",type:"int"},
+ {title: "搴撳瓨鐘舵��", field:"stockStatus",type:"select",dataKey:"stockStatusEmun",data:[]},
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ [
+ {title: "鏁村嵎/娈嬪嵎", field:"isFull",type:"select",dataKey:"isFullEnum",data:[{key:0,value:"鏁村嵎"},{key:1,value:"娈嬪嵎"}]},
],
]);
const columns = ref([
@@ -64,34 +78,143 @@
align: "left",
},
{
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "select",
width: 90,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
+ field: "palletCode",
+ title: "鏉＄爜缂栧彿",
+ type: "string",
+ width: 190,
+ align: "left",
+ },
+ {
+ field: "rfidCode",
+ title: "RFID缂栧彿",
+ type: "string",
+ width: 150,
align: "left",
},
{
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 150,
+ width: 190,
align: "left",
},
- // {
- // field: "isFull",
- // title: "鏄惁婊＄洏",
- // type: "string",
- // width: 150,
- // align: "left",
- // bind: { key: "yesno", data: [] },
- // },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "select",
+ {
+ field: "palletType",
+ title: "鎵樼洏绫诲瀷",
+ type: "string",
+ width: 110,
+ align: "left",
+ bind:{key: "locationTypeEnum", data: []}
+ },
+ {
+ field: "materielInvOrgId",
+ title: "搴撳瓨缁勭粐",
+ type: "string",
+ width: 110,
+ align: "left",
+ bind:{key: "materielInvOrgEnum", data: []}
+ },
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "stockAttribute",
+ title: "鐗╂枡绫诲瀷",
+ type: "string",
width: 100,
align: "left",
- bind: { key: "warehouses", data: [] },
+ bind: { key: "materielTypeEnum", data: [] },
+ },
+ {
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "string",
+ width: 170,
+ align: "left",
+ bind: { key: "stockStatusEmun", data: [] },
+ },
+ {
+ field: "isFull",
+ title: "鏁村嵎/娈嬪嵎",
+ type: "string",
+ width: 100,
+ align: "left",
+ bind: { key: "IsFullEnum", data: [{key: 0, value: "鏁村嵎"}, {key: 1, value: "娈嬪嵎"}] },
+ },
+ {
+ field: "stockLength",
+ title: "搴撳瓨鎬婚暱",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "materielWeight",
+ title: "鐗╂枡閲嶉噺",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "checkWeight",
+ title: "妫�娴嬮噸閲�",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "materielThickness",
+ title: "鐗╂枡鐩村緞",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "checkThickness",
+ title: "妫�娴嬬洿寰�",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "materielWide",
+ title: "鐗╂枡骞呭",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "checkWide",
+ title: "妫�娴嬪箙瀹�",
+ type: "string",
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 80,
+ align: "left",
},
{
field: "creater",
--
Gitblit v1.9.3