diff --git a/src/api/wms/outstockDetail/types.ts b/src/api/wms/outstockDetail/types.ts
index 124beed..54556e4 100644
--- a/src/api/wms/outstockDetail/types.ts
+++ b/src/api/wms/outstockDetail/types.ts
@@ -37,6 +37,22 @@ export interface OutstockDetailVO {
*/
materialCode: string;
+
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv: string ;
+
+ /**
+ * 完成数量
+ */
+ completeQty: number | string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus: string;
+
}
export interface OutstockDetailForm extends BaseEntity {
@@ -72,6 +88,22 @@ export interface OutstockDetailForm extends BaseEntity {
materialCategoryName?: string;
+
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv?: string ;
+
+ /**
+ * 完成数量
+ */
+ completeQty?: number | string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus?: string;
+
}
export interface OutstockDetailQuery extends PageQuery {
@@ -108,6 +140,23 @@ export interface OutstockDetailQuery extends PageQuery {
materialCategoryName?: string;
+
+ /**
+ * 是否为AGV任务(0是,1否)
+ */
+ isAgv?: string ;
+
+ /**
+ * 完成数量
+ */
+ completeQty?: number | string;
+
+ /**
+ * AGV状态(0待拾取 / 1运输中 / 2完成)
+ */
+ agvStatus?: string;
+
+
/**
* 日期范围参数
*/
diff --git a/src/views/wms/outstockDetail/index.vue b/src/views/wms/outstockDetail/index.vue
index 04e1563..4b25521 100644
--- a/src/views/wms/outstockDetail/index.vue
+++ b/src/views/wms/outstockDetail/index.vue
@@ -4,24 +4,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -55,11 +55,17 @@
-
+
-
+
+
+
+
+
+
+
@@ -124,6 +130,12 @@ import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {
+ agv_status,
+ is_agv
+} = toRefs(proxy?.useDict('agv_status', 'is_agv'));
+
+
const outstockDetailList = ref([]);
const buttonLoading = ref(false);
const loading = ref(true);
@@ -151,6 +163,8 @@ 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: 8, label: `AGV状态`, visible: true },
]);
const initFormData: OutstockDetailForm = {
@@ -159,7 +173,10 @@ const initFormData: OutstockDetailForm = {
outstockId: undefined,
materialId: undefined,
outstockQty: undefined,
- materialCategoryId: undefined
+ materialCategoryId: undefined,
+ agvStatus: undefined,
+ completeQty: undefined,
+ isAgv: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -173,33 +190,50 @@ const data = reactive>({
outstockQty: undefined,
materialCategoryId: undefined,
materialCategoryName: undefined,//字段映射
+ agvStatus: undefined,
+ completeQty: undefined,
+ isAgv: undefined,
params: {
}
},
rules: {
- outstockDetailId: [
- { required: true, message: "表主键不能为空", trigger: "blur" }
- ],
- outstockCode: [
- { required: true, message: "出库单号不能为空", trigger: "blur" }
- ],
- outstockId: [
- { required: true, message: "出库单 主键不能为空", trigger: "blur" }
- ],
- materialId: [
- { required: true, message: "物料id不能为空", trigger: "blur" }
- ],
- outstockQty: [
- { required: true, message: "出库数量不能为空", trigger: "blur" }
- ],
- materialCategoryId: [
- { required: true, message: "物料大类不能为空", trigger: "blur" }
- ]
+ // outstockDetailId: [
+ // { required: true, message: "表主键不能为空", trigger: "blur" }
+ // ],
+ // outstockCode: [
+ // { required: true, message: "出库单号不能为空", trigger: "blur" }
+ // ],
+ // outstockId: [
+ // { required: true, message: "出库单 主键不能为空", trigger: "blur" }
+ // ],
+ // materialId: [
+ // { required: true, message: "物料id不能为空", trigger: "blur" }
+ // ],
+ // outstockQty: [
+ // { required: true, message: "出库数量不能为空", trigger: "blur" }
+ // ],
+ // materialCategoryId: [
+ // { required: true, message: "物料大类不能为空", trigger: "blur" }
+ // ]
}
});
const { queryParams, form, rules } = toRefs(data);
+
+// 获取路由实例
+const route = useRoute();// 获取路由实例
+// 初始化时获取路由参数并设置到查询表单
+let routeIsAgvValue = '';
+if (route.query.isAgv) {
+ // 确保值是字符串类型,如果是数组则取第一个元素
+ const isAgvValue = Array.isArray(route.query.isAgv)
+ ? route.query.isAgv[0]
+ : route.query.isAgv;
+ queryParams.value.isAgv = isAgvValue;
+ routeIsAgvValue = isAgvValue; // 保存路由参数值
+}
+
/** 查询出库单-物料列表 */
const getList = async () => {
loading.value = true;
@@ -235,6 +269,7 @@ const cancel = () => {
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
+ queryParams.value.isAgvValue = routeIsAgvValue;
outstockDetailFormRef.value?.resetFields();
}