diff --git a/src/api/wms/instockRecord/types.ts b/src/api/wms/instockRecord/types.ts
index be457f7..5658e69 100644
--- a/src/api/wms/instockRecord/types.ts
+++ b/src/api/wms/instockRecord/types.ts
@@ -72,6 +72,11 @@ export interface InstockRecordVO {
*/
updateTime: string;
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType: string | number;
+
}
export interface InstockRecordForm extends BaseEntity {
@@ -142,6 +147,11 @@ export interface InstockRecordForm extends BaseEntity {
*/
erpSynchronousQty?: number;
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType?: string | number;
+
}
export interface InstockRecordQuery extends PageQuery {
@@ -198,6 +208,11 @@ export interface InstockRecordQuery extends PageQuery {
*/
erpSynchronousQty?: number;
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType?: string | number;
+
/**
* 日期范围参数
*/
diff --git a/src/api/wms/outstockRecord/types.ts b/src/api/wms/outstockRecord/types.ts
index 1807bb4..aa29c28 100644
--- a/src/api/wms/outstockRecord/types.ts
+++ b/src/api/wms/outstockRecord/types.ts
@@ -62,6 +62,12 @@ export interface OutstockRecordVO {
*/
erpSynchronousQty: number;
+
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType: string | number;
+
}
export interface OutstockRecordForm extends BaseEntity {
@@ -122,6 +128,12 @@ export interface OutstockRecordForm extends BaseEntity {
*/
erpSynchronousQty?: number;
+
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType?: string | number;
+
}
export interface OutstockRecordQuery extends PageQuery {
@@ -148,6 +160,11 @@ export interface OutstockRecordQuery extends PageQuery {
*/
erpSynchronousStatus?: string;
+ /**
+ * 特殊标识（0调拨，1退库）
+ */
+ specialType?: string | number;
+
/**
* 日期范围参数
*/
diff --git a/src/api/wms/wmsCheckTask/types.ts b/src/api/wms/wmsCheckTask/types.ts
index b8ffcfc..ca1fce6 100644
--- a/src/api/wms/wmsCheckTask/types.ts
+++ b/src/api/wms/wmsCheckTask/types.ts
@@ -59,6 +59,16 @@ export interface WmsCheckTaskVO {
*/
executeMonth?: number;
+ /**
+ * 物料类型名称
+ */
+ matrialTypeName: string;
+
+ /**
+ * 仓库名称
+ */
+ warehouseName: string;
+
}
export interface WmsCheckTaskForm extends BaseEntity {
@@ -113,6 +123,16 @@ export interface WmsCheckTaskForm extends BaseEntity {
executeMonth?: number;
+ /**
+ * 物料类型名称
+ */
+ matrialTypeName?: string;
+
+ /**
+ * 仓库名称
+ */
+ warehouseName?: string;
+
}
export interface WmsCheckTaskQuery extends PageQuery {
@@ -162,6 +182,16 @@ export interface WmsCheckTaskQuery extends PageQuery {
*/
wmsCheckTaskFrequency?: string;
+ /**
+ * 物料类型名称
+ */
+ matrialTypeName?: string;
+
+ /**
+ * 仓库名称
+ */
+ warehouseName?: string;
+
/**
* 日期范围参数
*/
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index b3cf853..dfad3b9 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -696,7 +696,7 @@ const state = reactive({
});
// 获取仓库
-getBaseWarehouseList().then(e => {
+getBaseWarehouseList(null).then(e => {
baseStoreList.value = e.data
})
diff --git a/src/views/wms/instockRecord/index.vue b/src/views/wms/instockRecord/index.vue
index 440d731..aacb110 100644
--- a/src/views/wms/instockRecord/index.vue
+++ b/src/views/wms/instockRecord/index.vue
@@ -82,7 +82,6 @@
-
@@ -96,11 +95,16 @@
-
+
{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
@@ -185,7 +189,7 @@ import { InstockRecordVO, InstockRecordQuery, InstockRecordForm } from '@/api/wm
import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { material_mategories, sys_common_status } = toRefs(proxy?.useDict('material_mategories', 'sys_common_status'));
+const { material_mategories, sys_common_status, wms_special_type } = toRefs(proxy?.useDict('material_mategories', 'sys_common_status', 'wms_special_type'));
const instockRecordList = ref([]);
const buttonLoading = ref(false);
@@ -221,10 +225,10 @@ const columns = ref([
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `erp同步状态`, visible: true },
{ key: 13, label: `erp同步数量`, visible: true },
- { key: 14, label: `修改人`, visible: true },
- { key: 15, label: `同步时间`, visible: true },
- { key: 16, label: `创建部门`, visible: true },
- { key: 17, label: `租户号`, visible: true },
+ // { key: 14, label: `修改人`, visible: true },
+ { key: 14, label: `同步时间`, visible: true },
+ // { key: 16, label: `创建部门`, visible: true },
+ // { key: 17, label: `租户号`, visible: true },
]);
const initFormData: InstockRecordForm = {
@@ -239,6 +243,7 @@ const initFormData: InstockRecordForm = {
materialCategoryName: undefined,//字段映射
erpSynchronousStatus: undefined,
erpSynchronousQty: undefined,
+ specialType: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -251,9 +256,10 @@ const data = reactive>({
materialCode: undefined,
materialName: undefined,
materialCategoryId: undefined,
- materialCategoryName: undefined,//字段映射
+ materialCategoryName: undefined,//字段映射
erpSynchronousStatus: undefined,
erpSynchronousQty: undefined,
+ specialType: undefined,
params: {
}
},
diff --git a/src/views/wms/outstockRecord/index.vue b/src/views/wms/outstockRecord/index.vue
index fadc4dc..aaa1b69 100644
--- a/src/views/wms/outstockRecord/index.vue
+++ b/src/views/wms/outstockRecord/index.vue
@@ -84,6 +84,11 @@
+
+
+
+
+
@@ -187,7 +192,7 @@ import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_common_status, wms_return_flag, } = toRefs(proxy?.useDict('sys_common_status' ,'wms_return_flag'));
+const { sys_common_status, wms_return_flag, wms_special_type } = toRefs(proxy?.useDict('sys_common_status' ,'wms_return_flag', 'wms_special_type'));
const outstockRecordList = ref([]);
const buttonLoading = ref(false);
@@ -220,6 +225,7 @@ const columns = ref([
{ key: 9, label: `提交时间`, visible: true },
{ key: 10, label: `erp同步状态`, visible: true },
{ key: 11, label: `erp同步数量`, visible: true },
+ { key: 12, label: `特殊标识`, visible: true },
// { key: 12, label: `${comment}`, visible: true },
// { key: 13, label: `${comment}`, visible: true },
// { key: 14, label: `${comment}`, visible: true },
@@ -239,6 +245,7 @@ const initFormData: OutstockRecordForm = {
createBy: undefined,
erpSynchronousStatus: undefined,
erpSynchronousQty: undefined,
+ specialType: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -248,8 +255,9 @@ const data = reactive>({
outstockCode: undefined,
locationCode: undefined,
materialCategoryId: undefined,
- materialCategoryName: undefined,//字段映射
+ materialCategoryName: undefined,//字段映射
erpSynchronousStatus: undefined,
+ specialType: undefined,
params: {
}
},