From 981a80940e47409300c09847684ca530f75b4a5f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 23:56:33 +0800
Subject: [PATCH] 优化WCS辅料出库逻辑
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 123 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 25 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index 7aae6b8..6029098 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -36,14 +36,21 @@
]);
const searchFormFields = ref({
palletCode: "",
- locationCode: "",
+ // locationCode: "",
+ materielCode:"",
+ batchNo:""
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
+ // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
- { title: "搴撳瓨鐘舵��", field: "stockStatus" ,type: "selectList",dataKey: "stockStatusEmun",data: [],},
+ { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
+ { title: "鎵规鍙�", field: "batchNo",type: "like"},
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouse",data: [],},
],
]);
const columns = ref([
@@ -66,24 +73,69 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 180,
+ width: 200,
align: "left",
},
{
field: "locationName",
title: "璐т綅鍚嶇О",
type: "string",
- width: 220,
+ width: 270,
align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 80,
+ align: "left",
+ bind: { key: "warehouse", data: [] },
},
{
field: "roadwayNo",
title: "宸烽亾缂栧彿",
type: "decimal",
- width: 90,
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "materielCode",
+ title: "鎵�鍚墿鏂欑紪鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "batchNo",
+ title: "鎵�鍚墿鏂欐壒娆�",
+ type: "string",
+ width: 200,
+ align: "left"
+ },
+ {
+ field: "materielInfo",
+ title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
+ type: "string",
+ width: 140,
+ align: "left",
+ },
+ {
+ field: "sumStock",
+ title: "鎬诲簱瀛�",
+ type: "string",
+ width: 140,
align: "left",
},
{
@@ -130,7 +182,7 @@
field: "locationType",
title: "璐т綅绫诲瀷",
type: "string",
- width: 120,
+ width: 100,
align: "left",
bind:{key: "locationTypeEnum", data: []}
},
@@ -138,7 +190,7 @@
field: "locationStatus",
title: "璐т綅鐘舵��",
type: "string",
- width: 200,
+ width: 120,
align: "left",
bind: { key: "locationStatusEnum", data: [] },
},
@@ -146,18 +198,9 @@
field: "enalbeStatus",
title: "绂佺敤鐘舵��",
type: "string",
- width: 180,
+ width: 80,
align: "left",
bind: { key: "enableStatusEnum", data: [] },
- },
- {
- field: "isFull",
- title: "鏄惁婊＄洏",
- type: "string",
- width: 150,
- align: "left",
- hidden: true,
- bind: { key: "yesno", data: [] },
},
{
field: "creater",
@@ -193,6 +236,7 @@
type: "string",
width: 100,
align: "left",
+ hidden:true
},
]);
const detail = ref({
@@ -215,33 +259,34 @@
type: "string",
width: 90,
align: "left",
+ hidden: true
},
{
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "string",
- width: 150,
+ width: 110,
align: "left",
},
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 130,
align: "left",
},
{
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "decimal",
- width: 90,
+ width: 130,
align: "left",
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 180,
align: "left",
},
{
@@ -250,19 +295,41 @@
type: "int",
width: 120,
align: "left",
+ hidden: true,
},
{
field: "stockQuantity",
title: "搴撳瓨鏁伴噺",
type: "string",
- width: 200,
+ width: 80,
align: "left",
},
{
field: "outboundQuantity",
title: "鍑哄簱鏁伴噺",
type: "string",
- width: 180,
+ width: 80,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 50,
+ align: "left",
+ },
+ {
+ field: "productionDate",
+ title: "鐢熶骇鏃ユ湡",
+ type: "string",
+ width: 80,
+ align: "left",
+ },
+ {
+ field: "effectiveDate",
+ title: "鏈夋晥鏃ユ湡",
+ type: "string",
+ width: 80,
align: "left",
},
{
@@ -271,6 +338,7 @@
type: "string",
width: 120,
align: "left",
+ bind: { key: "stockStatusEmun", data: [] }
},
{
field: "creater",
@@ -278,6 +346,7 @@
type: "string",
width: 90,
align: "left",
+ hidden: true
},
{
field: "createDate",
@@ -285,6 +354,7 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true
},
{
field: "modifier",
@@ -292,6 +362,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true
},
{
field: "modifyDate",
@@ -299,6 +370,7 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true
},
{
field: "remark",
@@ -306,6 +378,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true
},
],
sortName: "id",
--
Gitblit v1.9.3