diff --git a/src/api/wms/instockPrint/types.ts b/src/api/wms/instockPrint/types.ts
index d1bf4be..5c13ec4 100644
--- a/src/api/wms/instockPrint/types.ts
+++ b/src/api/wms/instockPrint/types.ts
@@ -81,6 +81,15 @@ export interface InstockPrintVO {
*/
createTime?: string;
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv?: string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus?: string;
}
@@ -167,6 +176,15 @@ export interface InstockPrintForm extends BaseEntity {
*/
createTime?: string;
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv?: string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus?: string;
}
export interface InstockPrintQuery extends PageQuery {
@@ -254,6 +272,17 @@ export interface InstockPrintQuery extends PageQuery {
actualInboundTime?: string;
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv?: string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus?: string;
+
+
/**
* 日期范围参数
*/
diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue
index a8d9224..3e1885a 100644
--- a/src/views/wms/baseMaterialInfo/index.vue
+++ b/src/views/wms/baseMaterialInfo/index.vue
@@ -85,7 +85,7 @@
-
+
@@ -148,7 +148,6 @@
-
@@ -326,7 +325,7 @@ const columns = ref([
{ key: 10, label: `质检要求`, visible: true },
{ key: 11, label: `最大库存`, visible: true },
{ key: 12, label: `最小库存`, visible: true },
- { key: 13, label: `安全库存`, visible: true },
+ // { key: 13, label: `安全库存`, visible: true },
]);
const initFormData: BaseMaterialInfoForm = {
diff --git a/src/views/wms/instockDetail/index.vue b/src/views/wms/instockDetail/index.vue
index c4462b9..e04d36a 100644
--- a/src/views/wms/instockDetail/index.vue
+++ b/src/views/wms/instockDetail/index.vue
@@ -92,8 +92,6 @@
-->
-
-
diff --git a/src/views/wms/instockPrint/index.vue b/src/views/wms/instockPrint/index.vue
index 568131c..7957bc8 100644
--- a/src/views/wms/instockPrint/index.vue
+++ b/src/views/wms/instockPrint/index.vue
@@ -19,7 +19,7 @@
-->
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,15 +75,15 @@
- 新增
+
+
导出
diff --git a/src/views/wms/outstockRecord/index.vue b/src/views/wms/outstockRecord/index.vue
index 0424024..37aaef1 100644
--- a/src/views/wms/outstockRecord/index.vue
+++ b/src/views/wms/outstockRecord/index.vue
@@ -220,7 +220,7 @@ const columns = ref([
{ key: 4, label: `物料id`, visible: true },
{ key: 5, label: `库位编码`, visible: true },
{ key: 6, label: `出库数量`, visible: true },
- { key: 7, label: `物料大类`, visible: true },
+ { key: 7, label: `物料大类`, visible: false },
{ key: 8, label: `出库人`, visible: true },
{ key: 9, label: `提交时间`, visible: true },
{ key: 10, label: `erp同步状态`, visible: false },
diff --git a/src/views/wms/returnOrder/index.vue b/src/views/wms/returnOrder/index.vue
index edc9d64..7501649 100644
--- a/src/views/wms/returnOrder/index.vue
+++ b/src/views/wms/returnOrder/index.vue
@@ -404,7 +404,7 @@ const columns = ref([
{ key: 4, label: `实际退库人`, visible: true },
{ key: 5, label: `实际退库时间`, visible: true },
{ key: 6, label: `物料名称`, visible: true },
- { key: 7, label: `物料大类`, visible: true },
+ { key: 7, label: `物料大类`, visible: false },
{ key: 8, label: `批次条码`, visible: true },
{ key: 9, label: `计划数量`, visible: true },
{ key: 10, label: `仓库名称`, visible: true },