From 6774f62b8a8edeb3d096dccf8e36028860a9e4f4 Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Tue, 24 Oct 2023 19:32:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=81?= =?UTF-8?q?=E8=B4=A7=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/dock/index.ts | 5 +- src/api/wms/location/index.ts | 4 + src/api/wms/rule/index.ts | 1 + src/api/wms/supplier/index.ts | 6 +- src/api/wms/warehouse/index.ts | 5 +- .../supplieDeliveryStrategy/AddForm.vue | 376 +++++++++++++----- .../supplieDeliveryStrategy/index.vue | 85 +++- 7 files changed, 362 insertions(+), 120 deletions(-) diff --git a/src/api/wms/dock/index.ts b/src/api/wms/dock/index.ts index 894986ba7..0cf190ad5 100644 --- a/src/api/wms/dock/index.ts +++ b/src/api/wms/dock/index.ts @@ -21,7 +21,10 @@ export interface DockVO { export const getDockPage = async (params) => { return await request.get({ url: `/wms/dock/page`, params }) } - +// 查询月台列表 +export const getDockList = async (params) => { + return await request.get({ url: `/wms/dock/list`, params }) +} // 查询月台详情 export const getDock = async (id: number) => { return await request.get({ url: `/wms/dock/get?id=` + id }) diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 09dd937d4..e3c982ad1 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -28,6 +28,10 @@ export interface LocationVO { export const getLocationPage = async (params) => { return await request.get({ url: `/wms/location/page`, params }) } +// 查询库位所有列表 +export const getLocationList = async (params) => { + return await request.get({ url: `/wms/location/list`, params }) +} // 查询库位详情 export const getLocation = async (id: number) => { diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts index 81fc49f20..dced53321 100644 --- a/src/api/wms/rule/index.ts +++ b/src/api/wms/rule/index.ts @@ -6,6 +6,7 @@ export interface RuleVO { code: string name: string description: string + status: number condition: string configuration: string } diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts index ed39172a4..1e95560af 100644 --- a/src/api/wms/supplier/index.ts +++ b/src/api/wms/supplier/index.ts @@ -21,10 +21,14 @@ export interface SupplierVO { remark: string } -// 查询供应商列表 +// 查询供应商列表分页 export const getSupplierPage = async (params) => { return await request.get({ url: `/wms/supplier/page`, params }) } +// 查询供应商列表 +export const getSupplierList = async (params) => { + return await request.get({ url: `/wms/supplier/list`, params }) +} // 查询供应商详情 export const getSupplier = async (id: number) => { diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index 0b1b9c326..12be52437 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -15,7 +15,10 @@ export interface WarehouseVO { export const getWarehousePage = async (params) => { return await request.get({ url: `/wms/warehouse/page`, params }) } - +// 查询仓库所有列表 +export const getWarehouseList = async (params) => { + return await request.get({ url: `/wms/warehouse/list`, params }) +} // 查询仓库详情 export const getWarehouse = async (id: number) => { return await request.get({ url: `/wms/warehouse/get?id=` + id }) diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue index 0002fedc2..efcce05eb 100644 --- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue @@ -6,21 +6,21 @@
规则
- + - + - - + + - - + + @@ -39,43 +39,41 @@
规则条件
- + - - - - + + + + + -
- - - -
+ + + +
-
- - - - + + + + - - + + - - - - - + + + +
- - + +
@@ -86,31 +84,61 @@
规则配置
- + - - - + + + + + - - - - + + + - - - - - + + + + - - - - - + + + + + + + + + + @@ -127,6 +155,14 @@ From aea52b62e9332ee7a89156abd9a032356a4b463b Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Wed, 25 Oct 2023 08:49:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 454 ++++++++++++++++++ .../arrivalInspectionStrategy/index.vue | 127 +++++ .../purchaseReceiptStrategy/AddForm.vue | 454 ++++++++++++++++++ .../purchaseReceiptStrategy/index.vue | 127 +++++ 4 files changed, 1162 insertions(+) create mode 100644 src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue create mode 100644 src/views/wms/strategy/arrivalInspectionStrategy/index.vue create mode 100644 src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue create mode 100644 src/views/wms/strategy/purchaseReceiptStrategy/index.vue diff --git a/src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue new file mode 100644 index 000000000..efcce05eb --- /dev/null +++ b/src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/views/wms/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/strategy/arrivalInspectionStrategy/index.vue new file mode 100644 index 000000000..4f7376531 --- /dev/null +++ b/src/views/wms/strategy/arrivalInspectionStrategy/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue new file mode 100644 index 000000000..efcce05eb --- /dev/null +++ b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/views/wms/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/strategy/purchaseReceiptStrategy/index.vue new file mode 100644 index 000000000..a38bb5fd3 --- /dev/null +++ b/src/views/wms/strategy/purchaseReceiptStrategy/index.vue @@ -0,0 +1,127 @@ + + + + +