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/ProStockView.vue | 230 +++++++++++++--------------------------------------------
1 files changed, 52 insertions(+), 178 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
index 7feab4e..250cbcd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
@@ -21,7 +21,7 @@
const table = ref({
key: "proStockId",
footer: "Foots",
- cnName: "鎴愬搧搴撳瓨瑙嗗浘",
+ cnName: "鎴愬搧(杈呮枡)搴撳瓨瑙嗗浘",
name: "proStockView",
url: "/proStockView/",
sortName: "proStockId",
@@ -37,24 +37,20 @@
const searchFormFields = ref({
palletCode: "",
// locationCode: "",
- materielCode:"",
- batchNo:"",
- specifyVer:""
+ productCode:"",
});
const searchFormOptions = ref([
[
- { title: "鑳舵鍙�", field: "palletCode",type: "like" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
// { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "productCode",type: "like" },
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
{ title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
- { title: "浜у搧缂栫爜", field: "productCode",type: "like"},
],
[
-
- { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"},
- { title: "鎸囨淳鐗堟湰", field: "specifyVer",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
- ]
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: []},
+ { title: "搴撳瓨灞炴��", field: "proStockAttribute" ,type: "selectList",dataKey: "proStockAttributeEnum",data: [],},
+ ],
]);
const columns = ref([
{
@@ -69,7 +65,7 @@
},
{
field: "palletCode",
- title: "鑳舵鍙�",
+ title: "鎵樼洏缂栧彿",
type: "string",
width: 150,
link: true,
@@ -101,7 +97,7 @@
field: "proStockAttribute",
title: "搴撳瓨灞炴��",
type: "string",
- width: 80,
+ width: 100,
align: "left",
bind: { key: "proStockAttributeEnum", data: [] },
},
@@ -115,66 +111,46 @@
// },
{
field: "productCode",
- title: "浜у搧缂栫爜",
+ title: "鐗╂枡缂栫爜",
type: "string",
- width: 120,
+ width: 100,
align: "left",
},
{
- field: "productVersion",
- title: "鐗堟湰",
+ field: "productName",
+ title: "鐗╂枡鍚嶇О",
type: "string",
- width: 100,
- align: "left"
- },
- {
- field: "specifyVer",
- title: "鎸囨淳鐗堟湰",
- type: "string",
- width: 100,
- align: "left"
- },
- {
- field: "dateCode",
- title: "浜у搧鍛ㄦ湡",
- type: "string",
- width: 100,
+ width: 200,
align: "left",
},
{
field: "lotNumber",
- title: "浜у搧鎵瑰彿",
+ title: "鐗╂枡鎵瑰彿",
type: "string",
- width: 140,
+ width: 110,
+ align: "left",
+ },
+ {
+ field: "productSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "string",
+ width: 200,
align: "left",
},
{
field: "sumStocks",
title: "搴撳瓨鏁伴噺",
type: "string",
- width: 140,
+ width: 100,
align: "left",
},
{
- field: "erpOrder",
- title: "ERP宸ュ崟",
+ field: "productUnit",
+ title: "鐗╂枡鍗曚綅",
type: "string",
- width: 200,
+ width: 100,
align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犲伐鍗�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
+ bind: { key: "materielUnitEnum", data: [] },
},
{
field: "row",
@@ -249,32 +225,10 @@
},
{
field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ title: "鍒涘缓鍏ュ簱鏃堕棿",
type: "datetime",
width: 160,
align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
},
]);
const detail = ref({
@@ -300,110 +254,54 @@
hidden: true
},
{
- field: "bagNo",
- title: "鍐呭寘鍙�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
field: "productCode",
- title: "浜у搧缂栫爜",
+ title: "鐗╂枡缂栫爜",
type: "string",
width: 140,
align: "left",
},
{
- field: "productVersion",
- title: "浜у搧鐗堟湰",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "dateCode",
- title: "鍛ㄦ湡",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犺鍗�",
+ field: "productName",
+ title: "鐗╂枡鍚嶇О",
type: "string",
width: 150,
align: "left",
},
{
- field: "erpOrder",
- title: "ERP宸ュ崟",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "stockPcsQty",
- title: "搴撳瓨PCS鏁�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
field: "lotNumber",
- title: "浜у搧鎵瑰彿",
- type: "string",
- width: 90,
- align: "left",
- },
- // {
- // field: "outboundQuantity",
- // title: "鍑哄簱PCS鏁伴噺",
- // type: "string",
- // width: 90,
- // align: "left",
- // },
- // {
- // field: "outSETQty",
- // title: "鍑哄簱SET鏁伴噺",
- // type: "string",
- // width: 90,
- // align: "left",
- // },
- {
- field: "xQty",
- title: "X鏁�",
+ title: "鐗╂枡鎵瑰彿",
type: "string",
width: 90,
align: "left",
},
{
- field: "xSite",
- title: "X浣�",
+ field: "productSpec",
+ title: "鐗╂枡瑙勬牸",
type: "string",
- width: 100,
+ width: 90,
align: "left",
},
{
- field: "proOutDetailStatus",
+ field: "stockQty",
+ title: "搴撳瓨鏁�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "productUnit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "proStockDetailStatus",
title: "搴撳瓨鐘舵��",
type: "int",
width: 120,
align: "left",
bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "weight",
- title: "鍐呭寘閲嶉噺",
- type: "string",
- width: 80,
- align: "left",
},
{
field: "creater",
@@ -415,33 +313,9 @@
},
{
field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ title: "鍒涘缓鍏ュ簱鏃堕棿",
type: "datetime",
width: 130,
- align: "left",
- hidden: true
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
align: "left",
hidden: true
},
--
Gitblit v1.9.3