diff --git a/package.json b/package.json
index fea5625..6daa693 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,10 @@
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
+    "kr-print-designer": "^1.1.8",
     "less-loader": "^6.0.0",
     "mavon-editor": "^2.9.1",
+    "moment": "^2.30.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
@@ -76,6 +78,8 @@
     "sass": "1.32.13",
     "sass-loader": "10.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "4.1.3",
     "vue-template-compiler": "2.6.12"
   },
diff --git a/src/api/productManagement/workoder_v2.js b/src/api/productManagement/workoder_v2.js
index a2e9102..56ab8e1 100644
--- a/src/api/productManagement/workoder_v2.js
+++ b/src/api/productManagement/workoder_v2.js
@@ -67,6 +67,14 @@ export function updateSort(query) {
     params: query,
   })
 }
+export function updateSort2(query) {
+  // 更新排序
+  return request({
+    url: '/mes/pro/workorder_v2/updateSort2',
+    method: 'get',
+    params: query,
+  })
+}
 
 
 // 生成工作工单
diff --git a/src/api/wms/area.js b/src/api/wms/area.js
new file mode 100644
index 0000000..2ad2441
--- /dev/null
+++ b/src/api/wms/area.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询库区列表
+export function listWmsArea(query, pageReq) {
+	return request({
+		url: '/wms/area/list',
+		method: 'post',
+		data: query,
+		params: pageReq
+	})
+}
+
+// 查询库区详细
+export function getWmsArea(id) {
+	return request({
+		url: '/wms/area/' + id,
+		method: 'get'
+	})
+}
+
+// 新增库区
+export function addWmsArea(data) {
+	return request({
+		url: '/wms/area',
+		method: 'post',
+		data: data
+	})
+}
+
+// 修改库区
+export function updateWmsArea(data) {
+	return request({
+		url: '/wms/area',
+		method: 'put',
+		data: data
+	})
+}
+
+// 删除库区
+export function delWmsArea(id) {
+	return request({
+		url: '/wms/area/' + id,
+		method: 'delete'
+	})
+}
+
+// 导出库区
+export function exportWmsArea(query) {
+	return request({
+		url: '/wms/area/export',
+		method: 'get',
+		params: query
+	})
+}
\ No newline at end of file
diff --git a/src/api/wms/carrier.js b/src/api/wms/carrier.js
new file mode 100644
index 0000000..24ef00c
--- /dev/null
+++ b/src/api/wms/carrier.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询承运商列表
+export function listWmsCarrier(query, pageReq) {
+  return request({
+    url: '/wms/carrier/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询承运商详细
+export function getWmsCarrier(id) {
+  return request({
+    url: '/wms/carrier/' + id,
+    method: 'get'
+  })
+}
+
+// 新增承运商
+export function addWmsCarrier(data) {
+  return request({
+    url: '/wms/carrier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改承运商
+export function updateWmsCarrier(data) {
+  return request({
+    url: '/wms/carrier',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除承运商
+export function delWmsCarrier(id) {
+  return request({
+    url: '/wms/carrier/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出承运商
+export function exportWmsCarrier(query) {
+  return request({
+    url: '/wms/carrier/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/customer.js b/src/api/wms/customer.js
new file mode 100644
index 0000000..4bb612e
--- /dev/null
+++ b/src/api/wms/customer.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询客户列表
+export function listWmsCustomer(query, pageReq) {
+  return request({
+    url: '/wms/customer/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询客户详细
+export function getWmsCustomer(id) {
+  return request({
+    url: '/wms/customer/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户
+export function addWmsCustomer(data) {
+  return request({
+    url: '/wms/customer',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户
+export function updateWmsCustomer(data) {
+  return request({
+    url: '/wms/customer',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户
+export function delWmsCustomer(id) {
+  return request({
+    url: '/wms/customer/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出客户
+export function exportWmsCustomer(query) {
+  return request({
+    url: '/wms/customer/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/customerTransaction.js b/src/api/wms/customerTransaction.js
new file mode 100644
index 0000000..8993287
--- /dev/null
+++ b/src/api/wms/customerTransaction.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询客户账户流水列表
+export function listWmsCustomerTransaction(query, pageReq) {
+  return request({
+    url: '/wms/customerTransaction/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询客户账户流水详细
+export function getWmsCustomerTransaction(id) {
+  return request({
+    url: '/wms/customerTransaction/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户账户流水
+export function addWmsCustomerTransaction(data) {
+  return request({
+    url: '/wms/customerTransaction',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户账户流水
+export function updateWmsCustomerTransaction(data) {
+  return request({
+    url: '/wms/customerTransaction',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户账户流水
+export function delWmsCustomerTransaction(id) {
+  return request({
+    url: '/wms/customerTransaction/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出客户账户流水
+export function exportWmsCustomerTransaction(query) {
+  return request({
+    url: '/wms/customerTransaction/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/delivery.js b/src/api/wms/delivery.js
new file mode 100644
index 0000000..b2e3070
--- /dev/null
+++ b/src/api/wms/delivery.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询发货记录列表
+export function listWmsDelivery(query, pageReq) {
+  return request({
+    url: '/wms/delivery/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询发货记录详细
+export function getWmsDelivery(id) {
+  return request({
+    url: '/wms/delivery/' + id,
+    method: 'get'
+  })
+}
+
+// 新增发货记录
+export function addWmsDelivery(data) {
+  return request({
+    url: '/wms/delivery',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发货记录
+export function updateWmsDelivery(data) {
+  return request({
+    url: '/wms/delivery',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发货记录
+export function delWmsDelivery(id) {
+  return request({
+    url: '/wms/delivery/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出发货记录
+export function exportWmsDelivery(query) {
+  return request({
+    url: '/wms/delivery/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventory.js b/src/api/wms/inventory.js
new file mode 100644
index 0000000..735a969
--- /dev/null
+++ b/src/api/wms/inventory.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询库存列表
+export function listWmsInventory(query, pageReq) {
+  return request({
+    url: '/wms/inventory/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询预警库存列表
+export function listWarnInventory(pageReq) {
+  return request({
+    url: '/wms/inventory/warnList',
+    method: 'post',
+    params: pageReq
+  })
+}
+
+// 查询库存详细
+export function getWmsInventory(id) {
+  return request({
+    url: '/wms/inventory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存
+export function addWmsInventory(data) {
+  return request({
+    url: '/wms/inventory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function updateWmsInventory(data) {
+  return request({
+    url: '/wms/inventory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存
+export function delWmsInventory(id) {
+  return request({
+    url: '/wms/inventory/' + id,
+    method: 'delete'
+  })
+}
+// 删除库存
+export function delWmsInventoryByItem(id) {
+  return request({
+    url: '/wms/inventory/item/' + id,
+    method: 'delete'
+  })
+}
+
+// 删除库存
+export function delWmsInventoryByWarehouse(id) {
+  return request({
+    url: '/wms/inventory/warehouse/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存
+export function exportWmsInventory(query) {
+  return request({
+    url: '/wms/inventory/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventoryCheck.js b/src/api/wms/inventoryCheck.js
new file mode 100644
index 0000000..f0b1608
--- /dev/null
+++ b/src/api/wms/inventoryCheck.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询库存盘点单据列表
+export function listWmsInventoryCheck(query, pageReq) {
+  return request({
+    url: '/wms/inventoryCheck/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存盘点单据详细
+export function getWmsInventoryCheck(id) {
+  return request({
+    url: '/wms/inventoryCheck/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存盘点单据
+export function addWmsInventoryCheck(data) {
+  return request({
+    url: '/wms/inventoryCheck',
+    method: 'post',
+    data: data
+  })
+}
+
+export function addOrUpdateWmsInventoryCheck(data) {
+  return request({
+    url: '/wms/inventoryCheck/add-or-update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存盘点单据
+export function updateWmsInventoryCheck(data) {
+  return request({
+    url: '/wms/inventoryCheck',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存盘点单据
+export function delWmsInventoryCheck(id) {
+  return request({
+    url: '/wms/inventoryCheck/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存盘点单据
+export function exportWmsInventoryCheck(query) {
+  return request({
+    url: '/wms/inventoryCheck/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventoryCheckDetail.js b/src/api/wms/inventoryCheckDetail.js
new file mode 100644
index 0000000..3618df7
--- /dev/null
+++ b/src/api/wms/inventoryCheckDetail.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询库存盘点单据详情列表
+export function listWmsInventoryCheckDetail(query, pageReq) {
+  return request({
+    url: '/wms/inventoryCheckDetail/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存盘点单据详情详细
+export function getWmsInventoryCheckDetail(id) {
+  return request({
+    url: '/wms/inventoryCheckDetail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存盘点单据详情
+export function addWmsInventoryCheckDetail(data) {
+  return request({
+    url: '/wms/inventoryCheckDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存盘点单据详情
+export function updateWmsInventoryCheckDetail(data) {
+  return request({
+    url: '/wms/inventoryCheckDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存盘点单据详情
+export function delWmsInventoryCheckDetail(id) {
+  return request({
+    url: '/wms/inventoryCheckDetail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存盘点单据详情
+export function exportWmsInventoryCheckDetail(query) {
+  return request({
+    url: '/wms/inventoryCheckDetail/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventoryHistory.js b/src/api/wms/inventoryHistory.js
new file mode 100644
index 0000000..b855fda
--- /dev/null
+++ b/src/api/wms/inventoryHistory.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询库存记录列表
+export function listWmsInventoryHistory(query, pageReq) {
+  return request({
+    url: '/wms/inventoryHistory/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存记录详细
+export function getWmsInventoryHistory(id) {
+  return request({
+    url: '/wms/inventoryHistory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存记录
+export function addWmsInventoryHistory(data) {
+  return request({
+    url: '/wms/inventoryHistory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存记录
+export function updateWmsInventoryHistory(data) {
+  return request({
+    url: '/wms/inventoryHistory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存记录
+export function delWmsInventoryHistory(id) {
+  return request({
+    url: '/wms/inventoryHistory/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存记录
+export function exportWmsInventoryHistory(query) {
+  return request({
+    url: '/wms/inventoryHistory/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventoryMovement.js b/src/api/wms/inventoryMovement.js
new file mode 100644
index 0000000..a5a5fa8
--- /dev/null
+++ b/src/api/wms/inventoryMovement.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询库存移动列表
+export function listWmsInventoryMovement(query, pageReq) {
+  return request({
+    url: '/wms/inventoryMovement/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存移动详细
+export function getWmsInventoryMovement(id) {
+  return request({
+    url: '/wms/inventoryMovement/' + id,
+    method: 'get'
+  })
+}
+
+export function addOrUpdateWmsInventoryMovement(data) {
+  return request({
+    url: '/wms/inventoryMovement/add-or-update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增库存移动
+export function addWmsInventoryMovement(data) {
+  return request({
+    url: '/wms/inventoryMovement',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存移动
+export function updateWmsInventoryMovement(data) {
+  return request({
+    url: '/wms/inventoryMovement',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存移动
+export function delWmsInventoryMovement(id) {
+  return request({
+    url: '/wms/inventoryMovement/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存移动
+export function exportWmsInventoryMovement(query) {
+  return request({
+    url: '/wms/inventoryMovement/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventoryMovementDetail.js b/src/api/wms/inventoryMovementDetail.js
new file mode 100644
index 0000000..9d48fc7
--- /dev/null
+++ b/src/api/wms/inventoryMovementDetail.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询库存移动详情列表
+export function listWmsInventoryMovementDetail(query, pageReq) {
+  return request({
+    url: '/wms/inventoryMovementDetail/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存移动详情详细
+export function getWmsInventoryMovementDetail(id) {
+  return request({
+    url: '/wms/inventoryMovementDetail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存移动详情
+export function addWmsInventoryMovementDetail(data) {
+  return request({
+    url: '/wms/inventoryMovementDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存移动详情
+export function updateWmsInventoryMovementDetail(data) {
+  return request({
+    url: '/wms/inventoryMovementDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存移动详情
+export function delWmsInventoryMovementDetail(id) {
+  return request({
+    url: '/wms/inventoryMovementDetail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存移动详情
+export function exportWmsInventoryMovementDetail(query) {
+  return request({
+    url: '/wms/inventoryMovementDetail/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventorySettlement.js b/src/api/wms/inventorySettlement.js
new file mode 100644
index 0000000..25aa2e0
--- /dev/null
+++ b/src/api/wms/inventorySettlement.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询库存结算单列表
+export function listWmsInventorySettlement(query, pageReq) {
+  return request({
+    url: '/wms/inventorySettlement/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存结算单详细
+export function getWmsInventorySettlement(id) {
+  return request({
+    url: '/wms/inventorySettlement/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存结算单
+export function addWmsInventorySettlement(data) {
+  return request({
+    url: '/wms/inventorySettlement',
+    method: 'post',
+    data: data
+  })
+}
+export function addOrUpdateWmsInventorySettlement(data) {
+  return request({
+    url: '/wms/inventorySettlement/add-or-update',
+    method: 'post',
+    data: data
+  })
+}
+// 修改库存结算单
+export function updateWmsInventorySettlement(data) {
+  return request({
+    url: '/wms/inventorySettlement',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存结算单
+export function delWmsInventorySettlement(id) {
+  return request({
+    url: '/wms/inventorySettlement/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存结算单
+export function exportWmsInventorySettlement(query) {
+  return request({
+    url: '/wms/inventorySettlement/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/inventorySettlementDetail.js b/src/api/wms/inventorySettlementDetail.js
new file mode 100644
index 0000000..7b00b2a
--- /dev/null
+++ b/src/api/wms/inventorySettlementDetail.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询库存结算明细列表
+export function listWmsInventorySettlementDetail(query, pageReq) {
+  return request({
+    url: '/wms/inventorySettlementDetail/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询库存信息
+export function listByTime(query) {
+  return request({
+    url: '/wms/inventorySettlementDetail/listByTime',
+    method: 'post',
+    data: query,
+  })
+}
+
+// 查询库存结算明细详细
+export function getWmsInventorySettlementDetail(id) {
+  return request({
+    url: '/wms/inventorySettlementDetail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存结算明细
+export function addWmsInventorySettlementDetail(data) {
+  return request({
+    url: '/wms/inventorySettlementDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存结算明细
+export function updateWmsInventorySettlementDetail(data) {
+  return request({
+    url: '/wms/inventorySettlementDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存结算明细
+export function delWmsInventorySettlementDetail(id) {
+  return request({
+    url: '/wms/inventorySettlementDetail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出库存结算明细
+export function exportWmsInventorySettlementDetail(query) {
+  return request({
+    url: '/wms/inventorySettlementDetail/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/item.js b/src/api/wms/item.js
new file mode 100644
index 0000000..2618511
--- /dev/null
+++ b/src/api/wms/item.js
@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询物料列表
+export function listWmsItem(query, pageReq) {
+  return request({
+    url: '/wms/item/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+// 查询过期物料列表
+export function listExpiryItem(pageReq) {
+  return request({
+    url: '/wms/item/expiryList',
+    method: 'post',
+    params: pageReq
+  })
+}
+// 查询物料列表
+export function allWmsItem(query) {
+  return request({
+    url: '/wms/item/all',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询物料详细
+export function getWmsItem(id) {
+  return request({
+    url: '/wms/item/' + id,
+    method: 'get'
+  })
+}
+
+// 新增物料
+export function addWmsItem(data) {
+  return request({
+    url: '/wms/item',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料
+export function updateWmsItem(data) {
+  return request({
+    url: '/wms/item',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料
+export function delWmsItem(id) {
+  return request({
+    url: '/wms/item/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出物料
+export function exportWmsItem(query) {
+  return request({
+    url: '/wms/item/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/itemType.js b/src/api/wms/itemType.js
new file mode 100644
index 0000000..bbd6338
--- /dev/null
+++ b/src/api/wms/itemType.js
@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询物料类型表列表
+export function listWmsItemType(query, pageReq) {
+  return request({
+    url: '/wms/itemType/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+// 查询部门下拉树结构
+export function itemTypeTreeselect() {
+  return request({
+    url: '/wms/itemType/treeselect',
+    method: 'get'
+  })
+}
+// 查询物料类型表列表
+export function listWmsItemTypeNoPage(query, pageReq) {
+  return request({
+    url: '/wms/itemType/noPageList',
+    method: 'get',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询物料类型表详细
+export function getWmsItemType(itemTypeId) {
+  return request({
+    url: '/wms/itemType/' + itemTypeId,
+    method: 'get'
+  })
+}
+
+// 新增物料类型表
+export function addWmsItemType(data) {
+  return request({
+    url: '/wms/itemType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料类型表
+export function updateWmsItemType(data) {
+  return request({
+    url: '/wms/itemType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料类型表
+export function delWmsItemType(itemTypeId) {
+  return request({
+    url: '/wms/itemType/' + itemTypeId,
+    method: 'delete'
+  })
+}
+
+// 导出物料类型表
+export function exportWmsItemType(query) {
+  return request({
+    url: '/wms/itemType/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/rack.js b/src/api/wms/rack.js
new file mode 100644
index 0000000..7eebce8
--- /dev/null
+++ b/src/api/wms/rack.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询货架列表
+export function listWmsRack(query, pageReq) {
+  return request({
+    url: '/wms/rack/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询货架详细
+export function getWmsRack(id) {
+  return request({
+    url: '/wms/rack/' + id,
+    method: 'get'
+  })
+}
+
+// 新增货架
+export function addWmsRack(data) {
+  return request({
+    url: '/wms/rack',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改货架
+export function updateWmsRack(data) {
+  return request({
+    url: '/wms/rack',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除货架
+export function delWmsRack(id) {
+  return request({
+    url: '/wms/rack/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出货架
+export function exportWmsRack(query) {
+  return request({
+    url: '/wms/rack/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/receiptOrder.js b/src/api/wms/receiptOrder.js
new file mode 100644
index 0000000..004502e
--- /dev/null
+++ b/src/api/wms/receiptOrder.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询入库单列表
+export function listWmsReceiptOrder(query, pageReq) {
+  return request({
+    url: '/wms/receiptOrder/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询入库单详细
+export function getWmsReceiptOrder(id) {
+  return request({
+    url: '/wms/receiptOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入库单
+export function addWmsReceiptOrder(data) {
+  return request({
+    url: '/wms/receiptOrder',
+    method: 'post',
+    data: data
+  })
+}
+// 新增或编辑入库单
+export function addOrUpdateWmsReceiptOrder(data) {
+  return request({
+    url: '/wms/receiptOrder/add-or-update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库单
+export function updateWmsReceiptOrder(data) {
+  return request({
+    url: '/wms/receiptOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库单
+export function delWmsReceiptOrder(id) {
+  return request({
+    url: '/wms/receiptOrder/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出入库单
+export function exportWmsReceiptOrder(query) {
+  return request({
+    url: '/wms/receiptOrder/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/receiptOrderDetail.js b/src/api/wms/receiptOrderDetail.js
new file mode 100644
index 0000000..589ca41
--- /dev/null
+++ b/src/api/wms/receiptOrderDetail.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询入库单详情列表
+export function listWmsReceiptOrderDetail(query, pageReq) {
+  return request({
+    url: '/wms/receiptOrderDetail/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询入库单详情详细
+export function getWmsReceiptOrderDetail(id) {
+  return request({
+    url: '/wms/receiptOrderDetail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入库单详情
+export function addWmsReceiptOrderDetail(data) {
+  return request({
+    url: '/wms/receiptOrderDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库单详情
+export function updateWmsReceiptOrderDetail(data) {
+  return request({
+    url: '/wms/receiptOrderDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库单详情
+export function delWmsReceiptOrderDetail(id) {
+  return request({
+    url: '/wms/receiptOrderDetail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出入库单详情
+export function exportWmsReceiptOrderDetail(query) {
+  return request({
+    url: '/wms/receiptOrderDetail/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/shipmentOrder.js b/src/api/wms/shipmentOrder.js
new file mode 100644
index 0000000..5608d4d
--- /dev/null
+++ b/src/api/wms/shipmentOrder.js
@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 查询出库单列表
+export function listWmsShipmentOrder(query, pageReq) {
+  return request({
+    url: '/wms/shipmentOrder/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询出库单详细
+export function getWmsShipmentOrder(id) {
+  return request({
+    url: '/wms/shipmentOrder/' + id,
+    method: 'get'
+  })
+}
+
+export function addOrUpdateWmsShipmentOrder(data) {
+  return request({
+    url: '/wms/shipmentOrder/add-or-update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增出库单
+export function addWmsShipmentOrder(data) {
+  return request({
+    url: '/wms/shipmentOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改出库单
+export function updateWmsShipmentOrder(data) {
+  return request({
+    url: '/wms/shipmentOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除出库单
+export function delWmsShipmentOrder(id) {
+  return request({
+    url: '/wms/shipmentOrder/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出出库单
+export function exportWmsShipmentOrder(query) {
+  return request({
+    url: '/wms/shipmentOrder/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 单个订单分配仓库
+export function allocatedInventory(params) {
+  return request({
+    url: '/wms/shipmentOrder/allocated',
+    params,
+    method: 'post'
+  })
+}
diff --git a/src/api/wms/shipmentOrderDetail.js b/src/api/wms/shipmentOrderDetail.js
new file mode 100644
index 0000000..db9040e
--- /dev/null
+++ b/src/api/wms/shipmentOrderDetail.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询出库单详情列表
+export function listWmsShipmentOrderDetail(query, pageReq) {
+  return request({
+    url: '/wms/shipmentOrderDetail/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询出库单详情详细
+export function getWmsShipmentOrderDetail(id) {
+  return request({
+    url: '/wms/shipmentOrderDetail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增出库单详情
+export function addWmsShipmentOrderDetail(data) {
+  return request({
+    url: '/wms/shipmentOrderDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改出库单详情
+export function updateWmsShipmentOrderDetail(data) {
+  return request({
+    url: '/wms/shipmentOrderDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除出库单详情
+export function delWmsShipmentOrderDetail(id) {
+  return request({
+    url: '/wms/shipmentOrderDetail/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出出库单详情
+export function exportWmsShipmentOrderDetail(query) {
+  return request({
+    url: '/wms/shipmentOrderDetail/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/supplier.js b/src/api/wms/supplier.js
new file mode 100644
index 0000000..c84393a
--- /dev/null
+++ b/src/api/wms/supplier.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询供应商列表
+export function listWmsSupplier(query, pageReq) {
+  return request({
+    url: '/wms/supplier/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询供应商详细
+export function getWmsSupplier(id) {
+  return request({
+    url: '/wms/supplier/' + id,
+    method: 'get'
+  })
+}
+
+// 新增供应商
+export function addWmsSupplier(data) {
+  return request({
+    url: '/wms/supplier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供应商
+export function updateWmsSupplier(data) {
+  return request({
+    url: '/wms/supplier',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商
+export function delWmsSupplier(id) {
+  return request({
+    url: '/wms/supplier/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出供应商
+export function exportWmsSupplier(query) {
+  return request({
+    url: '/wms/supplier/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/supplierTransaction.js b/src/api/wms/supplierTransaction.js
new file mode 100644
index 0000000..e6a9404
--- /dev/null
+++ b/src/api/wms/supplierTransaction.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询供应商账户流水列表
+export function listWmsSupplierTransaction(query, pageReq) {
+  return request({
+    url: '/wms/supplierTransaction/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询供应商账户流水详细
+export function getWmsSupplierTransaction(id) {
+  return request({
+    url: '/wms/supplierTransaction/' + id,
+    method: 'get'
+  })
+}
+
+// 新增供应商账户流水
+export function addWmsSupplierTransaction(data) {
+  return request({
+    url: '/wms/supplierTransaction',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供应商账户流水
+export function updateWmsSupplierTransaction(data) {
+  return request({
+    url: '/wms/supplierTransaction',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商账户流水
+export function delWmsSupplierTransaction(id) {
+  return request({
+    url: '/wms/supplierTransaction/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出供应商账户流水
+export function exportWmsSupplierTransaction(query) {
+  return request({
+    url: '/wms/supplierTransaction/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/warehouse.js b/src/api/wms/warehouse.js
new file mode 100644
index 0000000..66ecea3
--- /dev/null
+++ b/src/api/wms/warehouse.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询仓库列表
+export function listWmsWarehouse(query, pageReq) {
+  return request({
+    url: '/wms/warehouse/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询仓库详细
+export function getWmsWarehouse(id) {
+  return request({
+    url: '/wms/warehouse/' + id,
+    method: 'get'
+  })
+}
+
+// 新增仓库
+export function addWmsWarehouse(data) {
+  return request({
+    url: '/wms/warehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓库
+export function updateWmsWarehouse(data) {
+  return request({
+    url: '/wms/warehouse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库
+export function delWmsWarehouse(id) {
+  return request({
+    url: '/wms/warehouse/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出仓库
+export function exportWmsWarehouse(query) {
+  return request({
+    url: '/wms/warehouse/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/wms/wave.js b/src/api/wms/wave.js
new file mode 100644
index 0000000..7cdd921
--- /dev/null
+++ b/src/api/wms/wave.js
@@ -0,0 +1,127 @@
+import request from '@/utils/request'
+
+// 查询波次列表
+export function listWave(query, pageReq) {
+  return request({
+    url: '/wms/wave/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询波次详细
+export function getWave(id) {
+  return request({
+    url: '/wms/wave/shipment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增波次
+export function addWave(data) {
+  return request({
+    url: '/wms/wave/shipment/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改波次
+export function updateWave(data) {
+  return request({
+    url: '/wms/wave',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除波次
+export function delWave(id) {
+  return request({
+    url: '/wms/wave/shipment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出波次
+export function exportWave(query) {
+  return request({
+    url: '/wms/wave/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 波次单分配仓库
+export function waveAllocatedInventory(params) {
+  return request({
+    url: '/wms/wave/shipment/allocated/',
+    method: 'post',
+    params
+  })
+}
+// 应用波次作业的仓库
+export function confirmWave(data) {
+  return request({
+    url: '/wms/wave/shipment/confirmWave' ,
+    method: 'post',
+    data: data
+  })
+}
+// 取消波次作业
+export function cancelAllocatedInventory(id) {
+  return request({
+    url: '/wms/wave/shipment/cancelAllocatedInventory/'+ id ,
+    method: 'post'
+  })
+}
+
+
+export function getReceiptWave(id) {
+  return request({
+    url: '/wms/wave/receipt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增波次
+export function addWaveForReceipt(data) {
+  return request({
+    url: '/wms/wave/receipt/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除波次
+export function delWaveForReceipt(id) {
+  return request({
+    url: '/wms/wave/receipt/' + id,
+    method: 'delete'
+  })
+}
+
+// 波次单分配仓库
+export function waveAllocatedInventoryForReceipt(params) {
+  return request({
+    url: '/wms/wave/receipt/allocated/',
+    method: 'post',
+    params
+  })
+}
+// 应用波次作业的仓库
+export function confirmWaveForReceipt(data) {
+  return request({
+    url: '/wms/wave/receipt/confirmWave' ,
+    method: 'post',
+    data: data
+  })
+}
+// 取消波次作业
+export function cancelAllocatedInventoryForReceipt(id) {
+  return request({
+    url: '/wms/wave/receipt/cancelAllocatedInventory/'+ id ,
+    method: 'post'
+  })
+}
diff --git a/src/components/DictRadio/index.vue b/src/components/DictRadio/index.vue
new file mode 100644
index 0000000..4a331a9
--- /dev/null
+++ b/src/components/DictRadio/index.vue
@@ -0,0 +1,50 @@
+<template>
+  <el-radio-group
+    v-model="radioValue"
+    @change="change"
+    v-bind="$props"
+  >
+    <el-radio-button
+      v-for="dict in dictList"
+      :key="dict.value"
+      :label="dict.value"
+    >{{ dict.label }}
+    </el-radio-button
+    >
+  </el-radio-group>
+</template>
+
+<script>
+export default {
+  props: ['radioData', 'size', 'value', 'showAll'],
+  data() {
+    return {
+      // value:this.value
+    }
+  },
+  computed: {
+    radioValue: {
+      get() {
+        return this.value;
+      },
+      set(v) {
+        this.$emit('input', v);
+      }
+    },
+    dictList() {
+      if (this.showAll === "all") {
+        let list = this.radioData;
+        list.splice(0, 0, {label: "全部", value: null})
+        return list
+      } else {
+        return this.radioData
+      }
+    }
+  },
+  methods: {
+    change(val) {
+      this.$emit('change', val)
+    },
+  }
+}
+</script>
diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue
new file mode 100644
index 0000000..feae9d2
--- /dev/null
+++ b/src/components/DictSelect/index.vue
@@ -0,0 +1,37 @@
+<template>
+  <el-select v-model="model" v-bind="$props" @change="valueChange" :disabled="disabled">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+export default {
+  props: ["size", "value","options","disabled"],
+  data() {
+    return {
+      // value:this.value
+    }
+  },
+  methods: {
+    valueChange(val){
+      this.$emit("change",val)
+    }
+  },
+  computed: {
+    model: {
+      get() {
+        return this.value+'';
+      },
+      set(v) {
+        this.$emit("input", v);
+      },
+    },
+  },
+};
+</script>
diff --git a/src/components/InOutTypeSelect.vue b/src/components/InOutTypeSelect.vue
new file mode 100644
index 0000000..7623c53
--- /dev/null
+++ b/src/components/InOutTypeSelect.vue
@@ -0,0 +1,88 @@
+<template>
+	<div class="item-select-wrapper">
+		<el-cascader :options="options" :clearable="clearable" placeholder="请选择操作类型" v-model="value1" :size="size"
+			:show-all-levels="false">
+		</el-cascader>
+	</div>
+</template>
+
+<script>
+	const optionsMap = [{
+			name: "入库",
+			dictName: "wms_receipt_type",
+		},
+		{
+			name: "出库",
+			dictName: "wms_shipment_type",
+		},
+		{
+			name: "移库",
+			dictName: "wms_movement_type",
+		},
+		{
+			name: "盘点",
+			dictName: "wms_check_type",
+		}
+	]
+	const dictNames = optionsMap.map(item => item.dictName)
+	const names = optionsMap.map(item => item.name)
+	export default {
+		name: 'InOutTypeSelect',
+		dicts: dictNames,
+		props: {
+			value: {
+				type: [String, Number],
+				default: null
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			clearable: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			value1: {
+				get() {
+					return this.value
+				},
+				set(v) {
+					// 取数组的第二个元素
+					let type = v[1] || v[0] || null
+					this.$emit('input', type)
+				}
+			},
+			options: {
+				get() {
+					let options = []
+					let dict = this.dict.type
+					for (let i = 0; i < dictNames.length; i++) {
+						let dictName = dictNames[i]
+						let name = names[i]
+						let option = {
+							value: name,
+							label: name,
+							children: dict[dictName].map(item => {
+								return {
+									value: item.value,
+									label: item.label
+								}
+							})
+						}
+						options.push(option)
+					}
+					return options
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
\ No newline at end of file
diff --git a/src/components/ItemSelect.vue b/src/components/ItemSelect.vue
new file mode 100644
index 0000000..e71cd81
--- /dev/null
+++ b/src/components/ItemSelect.vue
@@ -0,0 +1,69 @@
+<template>
+	<div class="item-select-wrapper">
+		<el-select v-model="value1" filterable="filterable" remote="remote" clearable="clearable" :remote-method="doSearch" :loading="loading" :size="size">
+			<el-option v-for="item in options" :key="item.id" :label="item.itemName" :value="item.id">
+				<div>{{ item.itemName }}</div>
+				<div class="info">{{ item.itemNo }}</div>
+			</el-option>
+		</el-select>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsItem
+	} from '@/api/wms/item'
+
+	export default {
+		name: 'ItemSelect',
+		props: {
+			value: {
+				type: [String, Number],
+				default: null
+			},
+			size: {
+				type: String,
+				default: 'small'
+			}
+		},
+		data() {
+			return {
+				options: [],
+				loading: false
+			}
+		},
+		computed: {
+			value1: {
+				get() {
+					return this.value
+				},
+				set(v) {
+					this.$emit('input', v)
+				}
+			}
+		},
+		created() {
+			this.doSearch();
+		},
+		methods: {
+			doSearch(search) {
+				listWmsItem({
+					search
+				}, {
+					page: 0,
+					size: 20
+				}).then(res => {
+					const {
+						content,
+						totalElements
+					} = res
+					this.options = content
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
\ No newline at end of file
diff --git a/src/components/ItemSelect/ItemSelect.vue b/src/components/ItemSelect/ItemSelect.vue
new file mode 100644
index 0000000..0ad7337
--- /dev/null
+++ b/src/components/ItemSelect/ItemSelect.vue
@@ -0,0 +1,70 @@
+<template>
+	<div class="item-select-wrapper">
+		<el-select v-model="value1" filterable="filterable" remote="remote" clearable="clearable"
+			:remote-method="doSearch" :loading="loading" :size="size">
+			<el-option v-for="item in options" :key="item.id" :label="item.itemName" :value="item.id">
+				<div>{{ item.itemName }}</div>
+				<div class="info">{{ item.itemNo }}</div>
+			</el-option>
+		</el-select>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsItem
+	} from '@/api/wms/item'
+
+	export default {
+		name: 'ItemSelect',
+		props: {
+			value: {
+				type: [String, Number],
+				default: null
+			},
+			size: {
+				type: String,
+				default: 'small'
+			}
+		},
+		data() {
+			return {
+				options: [],
+				loading: false
+			}
+		},
+		computed: {
+			value1: {
+				get() {
+					return this.value
+				},
+				set(v) {
+					this.$emit('input', v)
+				}
+			}
+		},
+		created() {
+			this.doSearch();
+		},
+		methods: {
+			doSearch(search) {
+				listWmsItem({
+					search
+				}, {
+					page: 0,
+					size: 20
+				}).then(res => {
+					const {
+						content,
+						totalElements
+					} = res
+					this.options = content
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
\ No newline at end of file
diff --git a/src/components/NumberRange.vue b/src/components/NumberRange.vue
new file mode 100644
index 0000000..ab93b8c
--- /dev/null
+++ b/src/components/NumberRange.vue
@@ -0,0 +1,71 @@
+<template>
+	<div class="number-range-wrapper">
+		<el-input class="start" :value="value1[0]" @input="changeVal(0, $event)" placeholder="起始值"></el-input>
+		<div class="c-line"><span>-</span></div>
+		<el-input class="end" :value="value1[1]" @input="changeVal(1, $event)" placeholder="结束值"></el-input>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'NumberRange',
+	props: {
+		value: {
+			type: Array,
+			default: [],
+		},
+	},
+	computed: {
+		value1: {
+			get() {
+				return this.value || []
+			},
+			set(v) {
+				this.$emit('input', v)
+			},
+		},
+	},
+	methods: {
+		changeVal(idx, v) {
+			const val = [...this.value1]
+			val[idx] = v ? Number(v) : null
+			this.value1 = val
+		},
+	},
+}
+</script>
+
+<style scoped>
+.number-range-wrapper {
+	max-width: 240px;
+	display: inline-flex;
+	align-items: stretch;
+	line-height: 1;
+}
+.c-line {
+	border-top: 1px solid #dcdfe6;
+	border-bottom: 1px solid #dcdfe6;
+	padding: 0 8px;
+	margin: 0 -1px;
+	color: #dcdfe6;
+	z-index: 1;
+	background-color: white;
+	display: inline-flex;
+	align-items: center;
+	user-select: none;
+}
+.start .el-input__inner {
+	border-top-right-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+.start .el-input__inner:hover {
+	z-index: 2;
+}
+.end .el-input__inner {
+	border-top-left-radius: 0 !important;
+	border-bottom-left-radius: 0 !important;
+}
+.end .el-input__inner:hover {
+	z-index: 2;
+}
+</style>
diff --git a/src/components/WmsAreaCascader/index.vue b/src/components/WmsAreaCascader/index.vue
new file mode 100644
index 0000000..72dccd9
--- /dev/null
+++ b/src/components/WmsAreaCascader/index.vue
@@ -0,0 +1,59 @@
+<template>
+	<el-cascader
+		placeholder="请选择仓库信息"
+		:options="options"
+		:props="{ checkStrictly: true }"
+		v-model="selections"
+		clearable
+    filterable>
+	</el-cascader>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+	props: ['value','size'],
+	data(){
+		return{
+			options:[]
+		}
+	},
+	computed:{
+		...mapGetters(['areaList','warehouseList']),
+		selections:{
+			get(){
+				return this.value;
+			},
+			set(v){
+				this.$emit('input',v);
+			}
+		}
+	},
+	created(){
+		this.setOption()
+	},
+	methods:{
+		setOption(){
+			let areaMap = new Map()
+			let warehouseMap=new Map()
+
+			this.areaList.forEach(area=>{
+				let children=warehouseMap.get(area.warehouseId)
+				if(children){
+					children.push({value:area.id,label:area.areaName,children:areaMap.get(area.id)})
+				}else{
+					children=[{value:area.id,label:area.areaName,children:areaMap.get(area.id)}]
+				}
+				warehouseMap.set(area.warehouseId,children)
+			})
+			this.warehouseList.forEach(warehouse=>{
+				this.options.push({value:warehouse.id,label:warehouse.warehouseName,children:warehouseMap.get(warehouse.id)})
+			})
+		}
+	}
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/components/WmsCarrierSelect/index.vue b/src/components/WmsCarrierSelect/index.vue
new file mode 100644
index 0000000..fcd8ec4
--- /dev/null
+++ b/src/components/WmsCarrierSelect/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-select placeholder="请选择承运商" clearable v-model=" carrier">
+    <el-option
+      v-for="customer in carrierList"
+      :key="customer.id"
+      :label="customer.carrierName"
+      :value="customer.id"
+    ></el-option>
+  </el-select>
+</template>
+<script>
+import {mapGetters} from 'vuex';
+
+export default {
+  props: ['value', 'size'],
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapGetters(['carrierList']),
+    carrier: {
+      get() {
+        return this.value;
+      },
+      set(v) {
+        this.$emit('input', v);
+      }
+    }
+  },
+  created() {
+  },
+  methods: {}
+}
+</script>
diff --git a/src/components/WmsCustomerSelect/index.vue b/src/components/WmsCustomerSelect/index.vue
new file mode 100644
index 0000000..dd97ae2
--- /dev/null
+++ b/src/components/WmsCustomerSelect/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <el-select placeholder="请选择客户" clearable v-model="customer">
+    <el-option
+      v-for="customer in customerList"
+      :key="customer.id"
+      :label="customer.customerName"
+      :value="customer.id"
+    ></el-option>
+  </el-select>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  props: ['value','size'],
+  data() {
+    return {
+
+    }
+  },
+  computed: {
+    ...mapGetters(['customerList']),
+    customer: {
+      get() {
+        return this.value;
+      },
+      set(v) {
+        this.$emit('input', v);
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/components/WmsInsufficientStockDialog/index.vue b/src/components/WmsInsufficientStockDialog/index.vue
new file mode 100644
index 0000000..f581ce5
--- /dev/null
+++ b/src/components/WmsInsufficientStockDialog/index.vue
@@ -0,0 +1,103 @@
+<template>
+
+	<el-dialog :visible.sync="dialogVisible" title="库存一览" width="600px" @close="handleDialogClose">
+		<div ref="reportHTML" v-html="msg" class="web-con"></div>
+		<el-table :data="wmsInventoryList" v-loading="loading">
+			<el-table-column width="100" property="itemName" label="物料名称"></el-table-column>
+			<el-table-column width="150" property="itemTypeName" label="物料类别"></el-table-column>
+			<el-table-column property="warehouseName" label="仓库/库区"></el-table-column>
+			<el-table-column width="100" property="quantity" label="库存"></el-table-column>
+		</el-table>
+		<span slot="footer" class="dialog-footer">
+			<el-button type="primary" @click="handleDialogConfirm">确 定</el-button>
+		</span>
+	</el-dialog>
+
+</template>
+
+<script>
+	import { mapGetters } from 'vuex'
+	import { listWmsInventory } from "@/api/wms/inventory";
+
+	export default {
+		props: {
+			value: {
+				type: [String, Number, Array],
+				default: null
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			prodId: {
+				type: [Number, String],
+				default: null
+			},
+			msg: {
+				type: String,
+				default: ""
+			}
+		},
+		data() {
+			return {
+				wmsInventoryList: [],
+				loading: true,
+				dialogVisible: true,
+				selectedValue: ''
+			}
+		},
+		computed: {
+			...mapGetters(['rackList', 'areaList', 'warehouseList']),
+			selections: {
+				get() {
+					return this.value
+				},
+				set(v) {
+					this.$emit('input', v)
+				}
+			}
+		},
+		created() {
+			this.setOptions()
+		},
+		methods: {
+			setOptions() {
+				this.loading = true
+				listWmsInventory({ itemId: this.prodId }, {}).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryList = content
+
+					content.forEach(item => {
+						if (!item.warehouseName) {
+							item.warehouseName = "暂未分配仓库"
+						}
+						if (item.areaName) {
+							if (item.areaName) {
+								item.warehouseName = `${item.warehouseName}/${item.areaName}`;
+							}
+						}
+					});
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			handleDialogClose() {
+				this.selectedValue = this.selections;
+			},
+			showDialog() {
+				this.dialogVisible = true;
+			},
+			handleDialogConfirm() {
+				// 处理对话框确认按钮的逻辑
+				// 可以在这里获取选中的值并进行相应的处理
+				// 例如，将选中的值赋给输入框的绑定值
+				this.selectedValue = this.selections;
+				this.dialogVisible = false; // 关闭对话框
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/components/WmsSupplierSelect/index.vue b/src/components/WmsSupplierSelect/index.vue
new file mode 100644
index 0000000..ab2f4ba
--- /dev/null
+++ b/src/components/WmsSupplierSelect/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <el-select placeholder="请选择供应商" clearable v-model="supplier">
+      <el-option
+            v-for="supplier in supplierList"
+            :key="supplier.id"
+            :label="supplier.supplierName"
+            :value="supplier.id"
+          ></el-option>
+  </el-select>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  props: ['value','size'],
+  data() {
+    return {
+      
+    }
+  },
+  computed: {
+    ...mapGetters(['supplierList']),
+    supplier: {
+      get() {
+        return this.value;
+      },
+      set(v) {
+        this.$emit('input', v);
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/components/WmsTable/index.vue b/src/components/WmsTable/index.vue
new file mode 100644
index 0000000..74dfdf9
--- /dev/null
+++ b/src/components/WmsTable/index.vue
@@ -0,0 +1,39 @@
+<template>
+	<el-table ref="multipleTable" v-bind="$props" @selection-change="handleSelectionChange" @row-click="handleRowClick">
+		<slot />
+	</el-table>
+</template>
+
+<script>
+	export default {
+		props: ['data'],
+		data() {
+			return {
+				selectionData: []
+			}
+		},
+		methods: {
+			// 向父组件共享数据
+			handleSelectionChange(val) {
+				this.$emit('selection-change', val)
+			},
+
+			handleRowClick(row, column, event) {
+				// selectionData -- 已选的数据
+				let index = this.selectionData.findIndex(item => {
+					// 判断已选数组中是否已存在该条数据
+					return item.id == row.id
+				})
+				if (index == -1) {
+					// 如果未存在，设置已选状态，并在list中添加这条数据
+					this.$refs.multipleTable.toggleRowSelection(row, true); //设置复选框为选中状态
+					this.selectionData.push(row)
+				} else {
+					// 如果已存在，设置未选状态，并在list中删除这条数据
+					this.$refs.multipleTable.toggleRowSelection(row, false); //设置复选框为未选状态
+					this.selectionData.splice(index, 1)
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/components/WmsWarehouseCascader/index.vue b/src/components/WmsWarehouseCascader/index.vue
new file mode 100644
index 0000000..1e9d6d7
--- /dev/null
+++ b/src/components/WmsWarehouseCascader/index.vue
@@ -0,0 +1,72 @@
+<template>
+	<el-cascader placeholder="请选择仓库信息" :options="options" v-model="selections" :props="{ checkStrictly: true }" clearable :size="size" :disabled="disabled" filterable></el-cascader>
+</template>
+
+<script>
+	import { mapGetters } from 'vuex'
+
+	export default {
+		props: {
+			value: {
+				type: [String, Number, Array],
+				default: null
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				options: []
+			}
+		},
+		computed: {
+			...mapGetters(['rackList', 'areaList', 'warehouseList']),
+			selections: {
+				get() {
+					return this.value
+				},
+				set(v) {
+					this.$emit('input', v)
+				}
+			}
+		},
+		created() {
+			this.setOptions()
+		},
+		methods: {
+			setOptions() {
+				let areaMap = new Map()
+				let warehouseMap = new Map()
+				// this.rackList.forEach(rack => {
+				//   let children = areaMap.get(rack.areaId)
+				//   if (!children) {
+				//     children = []
+				//     areaMap.set(rack.areaId, children)
+				//   }
+				//   children.push({ value: rack.id, label: rack.rackName })
+				// })
+				this.areaList.forEach(area => {
+					let children = warehouseMap.get(area.warehouseId)
+					if (!children) {
+						children = []
+						warehouseMap.set(area.warehouseId, children)
+					}
+					children.push({ value: area.id, label: area.areaName, children: areaMap.get(area.id) })
+				})
+				this.options = this.warehouseList.map(warehouse => {
+					return {
+						value: warehouse.id,
+						label: warehouse.warehouseName,
+						children: warehouseMap.get(warehouse.id)
+					}
+				})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/components/main.js b/src/components/main.js
new file mode 100644
index 0000000..833d4c3
--- /dev/null
+++ b/src/components/main.js
@@ -0,0 +1,119 @@
+import Vue from 'vue'
+
+import Cookies from 'js-cookie'
+
+import Element from 'element-ui'
+import './assets/styles/element-variables.scss'
+
+import '@/assets/styles/index.scss' // global css
+import '@/assets/styles/ruoyi.scss' // ruoyi css
+import App from './App'
+import store from './store'
+import router from './router'
+import directive from './directive' // directive
+import plugins from './plugins' // plugins
+import { download } from '@/utils/request'
+
+import './assets/icons' // icon
+import './permission' // permission control
+import { getDicts } from "@/api/system/dict/data";
+import { getConfigKey } from "@/api/system/config";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+// 分页组件
+import Pagination from "@/components/Pagination";
+// 自定义表格工具组件
+import RightToolbar from "@/components/RightToolbar"
+// 富文本组件
+import Editor from "@/components/Editor"
+// 文件上传组件
+import FileUpload from "@/components/FileUpload"
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
+// 图片预览组件
+import ImagePreview from "@/components/ImagePreview"
+// 字典标签组件
+import DictTag from '@/components/DictTag'
+// 头部标签组件
+import VueMeta from 'vue-meta'
+// 字典数据组件
+import DictData from '@/components/DictData'
+//wms table组件
+import WmsTable from '@/components/WmsTable'
+
+import WmsSupplierSelect from '@/components/WmsSupplierSelect'
+import WmsCustomerSelect from '@/components/WmsCustomerSelect'
+import KrPrintDesigner from "kr-print-designer";
+import "kr-print-designer/lib/kr-print-designer.css";
+
+import DictRadio from '@/components/DictRadio'
+
+import DictSelect from '@/components/DictSelect'
+
+import WmsWarehouseCascader from '@/components/WmsWarehouseCascader'
+import vuePlugsPrint from '@/utils/vuePlugsPrint'
+import WmsCarrierSelect from "@/components/WmsCarrierSelect/index.vue";
+
+// 全局方法挂载
+Vue.prototype.getDicts = getDicts
+Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.parseTime = parseTime
+Vue.prototype.resetForm = resetForm
+Vue.prototype.addDateRange = addDateRange
+Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.download = download
+Vue.prototype.handleTree = handleTree
+
+// 全局组件挂载
+Vue.component('DictTag', DictTag)
+Vue.component('Pagination', Pagination)
+Vue.component('RightToolbar', RightToolbar)
+Vue.component('Editor', Editor)
+Vue.component('FileUpload', FileUpload)
+Vue.component('ImageUpload', ImageUpload)
+Vue.component('ImagePreview', ImagePreview)
+Vue.component('WmsTable',WmsTable)
+Vue.component('WmsSupplierSelect',WmsSupplierSelect)
+Vue.component('WmsCustomerSelect',WmsCustomerSelect)
+Vue.component('WmsCarrierSelect',WmsCarrierSelect)
+Vue.component('DictRadio',DictRadio)
+Vue.component('DictSelect',DictSelect)
+Vue.component('WmsWarehouseCascader',WmsWarehouseCascader)
+
+Vue.use(KrPrintDesigner);
+Vue.use(vuePlugsPrint);
+Vue.use(directive)
+Vue.use(plugins)
+Vue.use(VueMeta)
+DictData.install()
+
+/**
+ * If you don't want to use mock-server
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
+ *
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online! ! !
+ */
+
+Vue.use(Element, {
+  size: Cookies.get('size') || 'medium' // set element-ui default size
+})
+
+Vue.config.productionTip = false
+
+new Vue({
+  el: '#app',
+  router,
+  store,
+  render: h => h(App)
+})
+
+var _hmt = _hmt || [];
+window._hmt = _hmt;
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?8611b8753c9d6bb71fd882dc61e4adf2";
+  var s = document.getElementsByTagName("script")[0];
+  s.parentNode.insertBefore(hm, s);
+})();
diff --git a/src/config/business.js b/src/config/business.js
new file mode 100644
index 0000000..91be40b
--- /dev/null
+++ b/src/config/business.js
@@ -0,0 +1,3 @@
+export const DICT_TYPES = [
+  'wms_receipt_type', 'wms_shipment_type', 'wms_movement_type','wms_check_type'
+]
diff --git a/src/constant/ReceiptOrderConstant.ts b/src/constant/ReceiptOrderConstant.ts
new file mode 100644
index 0000000..2967662
--- /dev/null
+++ b/src/constant/ReceiptOrderConstant.ts
@@ -0,0 +1,33 @@
+/**
+ * @file 入库单类型和状态的常量
+ * @description 入库单类型和状态的常量
+ * @createdBy Zhang Cheng
+ * @createdAt 2023/08/10
+ */
+
+export const ReceiptOrderConstant = {
+  // 字典 wms_receipt_type
+  Type: {
+    // 采购
+    PURCHASE: 1,
+    // 外协
+    OUTSOURCING: 2,
+    // 退货
+    RETURN: 3,
+    // 盘盈入库
+    CHECK_IN: 32
+  },
+  // 字典 wms_receipt_status
+  Status: {
+    // 未入库
+    NOT_IN: 0,
+    // 在途
+    IN_PATH: 1,
+    // 部分入库
+    PART_IN: 2,
+    // 全部入库
+    ALL_IN: 3,
+    // 作废
+    DROP: 2
+  }
+}
diff --git a/src/constant/ShipmentOrderConstant.ts b/src/constant/ShipmentOrderConstant.ts
new file mode 100644
index 0000000..9647a2f
--- /dev/null
+++ b/src/constant/ShipmentOrderConstant.ts
@@ -0,0 +1,30 @@
+/**
+ * @file 出库单类型和状态的常量
+ * @description 出库单类型和状态的常量
+ * @createdBy Zhang Cheng
+ * @createdAt 2023/08/10
+ */
+export const ShipmentOrderConstant = {
+  // 字典 wms_shipment_type
+  Type: {
+    // 销售订单
+    SALE: 11,
+    // 外包订单
+    OUTSOURCING: 12,
+    // 转运订单
+    TRANSFER: 13,
+    // 部门订单
+    DEPT: 14
+  },
+  // 字典 wms_shipment_status
+  Status: {
+    // 未出库
+    NOT_IN: 11,
+    // 部分出库
+    PART_IN: 12,
+    // 全部出库
+    ALL_IN: 13,
+    // 作废
+    DROP: 14
+  }
+}
diff --git a/src/main.js b/src/main.js
index 7e4645a..3bd07f6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,7 +15,7 @@ import store from './store'
 import router from './router'
 import permission from './directive/permission'
 import plugins from './plugins' // plugins
-import signalR from '@/utils/signalR'   // todo  websocket实时传输
+import signalR from '@/utils/signalR' // todo  websocket实时传输
 import { downFile } from '@/utils/request'
 
 import './assets/icons' // icon
@@ -36,13 +36,25 @@ import UploadImage from '@/components/UploadImage/index';
 // 上传文件
 import UploadFile from '@/components/FileUpload/index';
 // 字典数据组件
-import DictData from '@/components/DictData'
+import DictData from '@/components/DictData';
 
-import VXETable from 'vxe-table'
+// WMS相关组件
+import WmsTable from '@/components/WmsTable';
+import WmsSupplierSelect from '@/components/WmsSupplierSelect';
+import WmsCustomerSelect from '@/components/WmsCustomerSelect';
+import WmsWarehouseCascader from '@/components/WmsWarehouseCascader';
+import WmsCarrierSelect from "@/components/WmsCarrierSelect/index.vue";
+import DictRadio from '@/components/DictRadio';
+import DictSelect from '@/components/DictSelect';
+import KrPrintDesigner from "kr-print-designer";
+import "kr-print-designer/lib/kr-print-designer.css";
 
-import 'vxe-table/lib/style.css'
+// VXE-Table相关组件
+import VXETable from 'vxe-table';
 
-import dataV from '@jiaminghi/data-view'
+import 'vxe-table/lib/style.css';
+
+import dataV from '@jiaminghi/data-view';
 
 
 //需要按需引入，先引入vue并引入element-ui
@@ -62,15 +74,15 @@ Vue.prototype.handleDict = handleDict
 Vue.prototype.downFile = downFile
 
 Vue.prototype.msgSuccess = function (msg) {
-  this.$message({ showClose: true, message: msg, type: "success" });
+	this.$message({ showClose: true, message: msg, type: "success" });
 }
 
 Vue.prototype.msgError = function (msg) {
-  this.$message({ showClose: true, message: msg, type: "error" });
+	this.$message({ showClose: true, message: msg, type: "error" });
 }
 
 Vue.prototype.msgInfo = function (msg) {
-  this.$message.info(msg);
+	this.$message.info(msg);
 }
 
 
@@ -82,11 +94,20 @@ Vue.component('DictTag', DictTag)
 Vue.component('Editor', Editor)
 Vue.component('UploadImage', UploadImage)
 Vue.component('UploadFile', UploadFile)
+// WMS组件挂载
+Vue.component('WmsTable', WmsTable)
+Vue.component('WmsSupplierSelect', WmsSupplierSelect)
+Vue.component('WmsCustomerSelect', WmsCustomerSelect)
+Vue.component('WmsCarrierSelect', WmsCarrierSelect)
+Vue.component('DictRadio', DictRadio)
+Vue.component('DictSelect', DictSelect)
+Vue.component('WmsWarehouseCascader', WmsWarehouseCascader)
+Vue.use(KrPrintDesigner);
 
 Vue.use(permission)
 Vue.use(plugins)
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+	size: Cookies.get('size') || 'small' // set element-ui default size
 })
 
 Vue.use(VXETable)
@@ -99,11 +120,11 @@ DictData.install()
 Vue.config.productionTip = false
 
 signalR.init(process.env.VUE_APP_SOCKET_API);
-Vue.prototype.signalr = signalR  //todo   绑定在原型对象里
+Vue.prototype.signalr = signalR //todo   绑定在原型对象里
 
 new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
+	el: '#app',
+	router,
+	store,
+	render: h => h(App)
 })
\ No newline at end of file
diff --git a/src/store/getters.js b/src/store/getters.js
index 81861d6..7d44885 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,27 +1,61 @@
 const getters = {
-  sidebar: (state) => state.app.sidebar,
-  size: (state) => state.app.size,
-  device: (state) => state.app.device,
-  visitedViews: (state) => state.tagsView.visitedViews,
-  cachedViews: (state) => state.tagsView.cachedViews,
-  token: (state) => state.user.token,
-  avatar: (state) => state.user.avatar,
-  name: (state) => state.user.name,
-  userId: (state) => state.user.userInfo.userId,
-  introduction: (state) => state.user.introduction,
-  roles: (state) => state.user.roles,
-  permissions: (state) => state.user.permissions,
-  permission_routes: (state) => state.permission.routes,
-  userinfo: (state) => state.user.userInfo,
-  topbarRouters: (state) => state.permission.topbarRouters,
-  defaultRoutes: (state) => state.permission.defaultRoutes,
-  sidebarRouters: (state) => state.permission.sidebarRouters,
-  onlineUserNum: (state) => state.socket.onlineNum,
-  noticeList: (state) => state.socket.noticeList,
-  //质量管理模块
-  currentWorkOrder_first: (state) => state.quality.currentWorkOrder_first,
-  currentWorkOrder_again: (state) => state.quality.currentWorkOrder_again,
-  currentWorkOrder_thirty: (state) => state.quality.currentWorkOrder_thirty,
-  firstquality_time: (state) => state.quality.firstquality_time,
+	sidebar: (state) => state.app.sidebar,
+	size: (state) => state.app.size,
+	device: (state) => state.app.device,
+	visitedViews: (state) => state.tagsView.visitedViews,
+	cachedViews: (state) => state.tagsView.cachedViews,
+	token: (state) => state.user.token,
+	avatar: (state) => state.user.avatar,
+	name: (state) => state.user.name,
+	userId: (state) => state.user.userInfo.userId,
+	introduction: (state) => state.user.introduction,
+	roles: (state) => state.user.roles,
+	permissions: (state) => state.user.permissions,
+	permission_routes: (state) => state.permission.routes,
+	userinfo: (state) => state.user.userInfo,
+	topbarRouters: (state) => state.permission.topbarRouters,
+	defaultRoutes: (state) => state.permission.defaultRoutes,
+	sidebarRouters: (state) => state.permission.sidebarRouters,
+	onlineUserNum: (state) => state.socket.onlineNum,
+	noticeList: (state) => state.socket.noticeList,
+	//质量管理模块
+	currentWorkOrder_first: (state) => state.quality.currentWorkOrder_first,
+	currentWorkOrder_again: (state) => state.quality.currentWorkOrder_again,
+	currentWorkOrder_thirty: (state) => state.quality.currentWorkOrder_thirty,
+	firstquality_time: (state) => state.quality.firstquality_time,
+
+	// 字典相关
+	items: state => state.dict.items,
+	dictTypeMap: state => state.dict.dictTypeMap,
+	opTypes: state => {
+		const map = state.dict.dictTypeMap
+		let res = [];
+		['wms_receipt_type', 'wms_shipment_type', 'wms_movement_type', 'wms_check_type'].forEach(it => {
+			if (!map[it]) {
+				return
+			}
+			res = res.concat(map[it])
+		})
+		return res
+	},
+	opTypeMap: (state, getters) => {
+		const arr = getters.opTypes,
+			map = {};
+		arr.forEach(it => map[it.value] = it.label);
+		return map;
+	},
+	// wms相关
+	supplierList: state => state.wms.supplierList,
+	customerList: state => state.wms.customerList,
+	customerMap: state => state.wms.customerMap,
+	carrierList: state => state.wms.carrierList,
+	carrierMap: state => state.wms.carrierMap,
+	supplierMap: state => state.wms.supplierMap,
+	warehouseList: state => state.wms.warehouseList,
+	warehouseMap: state => state.wms.warehouseMap,
+	areaList: state => state.wms.areaList,
+	areaMap: state => state.wms.areaMap,
+	rackList: state => state.wms.rackList,
+	rackMap: state => state.wms.rackMap
 }
-export default getters
+export default getters
\ No newline at end of file
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..f0883d6
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,42 @@
+import { allWmsItem } from '@/api/wms/item'
+import { listByTypes } from '@/api/system/dict/data'
+import { DICT_TYPES } from '@/config/business'
+export default {
+  state: {
+    items: [],
+    dictTypeMap: {},
+  },
+  mutations: {
+    SET_ITEMS(state, list) {
+      state.items = list
+    },
+    SET_DICT_TYPE_MAP(state, list) {
+      const map = {};
+      list.forEach(it => {
+        const {dictType} = it;
+        let arr = map[dictType];
+        if (!arr) {
+          arr = [];
+          map[dictType] = arr;
+        }
+        arr.push(it);
+      })
+      state.dictTypeMap = map;
+    }
+  },
+  actions: {
+    loadItems({commit}) {
+      return allWmsItem()
+        .then(res => {
+          commit('SET_ITEMS', res);
+          return res
+        })
+    },
+    loadAllDict({ commit }) {
+      listByTypes(DICT_TYPES).then(res => {
+        const { rows } = res
+        commit('SET_DICT_TYPE_MAP', rows.map(it => ({value: it.dictValue, label: it.dictLabel, dictType: it.dictType})))
+      })
+    }
+  }
+}
diff --git a/src/store/modules/wms.js b/src/store/modules/wms.js
new file mode 100644
index 0000000..99ead3c
--- /dev/null
+++ b/src/store/modules/wms.js
@@ -0,0 +1,113 @@
+import { listWmsSupplier } from "@/api/wms/supplier";
+import { listWmsWarehouse } from "@/api/wms/warehouse";
+import { listWmsArea } from "@/api/wms/area";
+import { listWmsRack } from "@/api/wms/rack";
+import {listWmsCustomer} from "@/api/wms/customer";
+import {listWmsCarrier} from "@/api/wms/carrier";
+const state = {
+  supplierList: [],
+  customerList: [],
+  carrierList: [],
+  carrierMap: new Map(),
+  customerMap: new Map(),
+  supplierMap: new Map(),
+  warehouseList: [],
+  warehouseMap: new Map(),
+  areaList:[],
+  areaMap:new Map(),
+  rackList:[],
+  rackMap:new Map()
+}
+const mutations = {
+  SET_SUPPLIERS(state, list) {
+    state.supplierList = list;
+    state.supplierMap = new Map();
+    list.forEach((supplier) => {
+      state.supplierMap.set(supplier.id, supplier.supplierName)
+    })
+  },
+  SET_CUSTOMERS(state, list) {
+    state.customerList = list;
+    state.customerMap = new Map();
+    list.forEach((customer) => {
+      state.customerMap.set(customer.id, customer.customerName)
+    })
+  }, SET_CARRIER(state, list) {
+  state.carrierList = list;
+  state.carrierMap = new Map();
+  list.forEach((carrier) => {
+    state.carrierMap.set(carrier.id, carrier.carrierName)
+  })
+ },
+  SET_WAREHOUSE(state, list){
+    state.warehouseList = list;
+    state.warehouseMap = new Map();
+    list.forEach((warehouse) => {
+      state.warehouseMap.set(warehouse.id, warehouse.warehouseName)
+    })
+  },
+  SET_AREA(state, list){
+    state.areaList = list;
+    state.areaMap = new Map();
+    list.forEach((area) => {
+      state.areaMap.set(area.id, area.areaName)
+    })
+  },
+  SET_RACK(state, list){
+    state.rackList = list;
+    state.rackMap = new Map();
+    list.forEach((rack) => {
+      state.rackMap.set(rack.id, rack.rackName)
+    })
+  },
+}
+const actions = {
+  getSuppliers({ commit }) {
+    return listWmsSupplier({}, { page: 0, size: 1000 })
+      .then(res => {
+        const { content } =res
+        commit('SET_SUPPLIERS', content);
+      })
+  },
+  getCustomer({ commit }) {
+    return listWmsCustomer({}, { page: 0, size: 1000 })
+      .then(res => {
+        const { content } =res
+        commit('SET_CUSTOMERS', content);
+      })
+  },
+  getCarrier({commit}) {
+    return listWmsCarrier({}, {page: 0, size: 1000})
+      .then(res => {
+        const {content} = res
+        commit('SET_CARRIER', content);
+      })
+  },
+  getWarehouseList({ commit }) {
+    return listWmsWarehouse({}, { page: 0, size: 1000 })
+      .then(res => {
+        const { content } =res
+        commit('SET_WAREHOUSE', content);
+      })
+  },
+  getAreaList({ commit }) {
+    return listWmsArea({}, { page: 0, size: 1000 })
+      .then(res => {
+        const { content } =res
+        commit('SET_AREA', content);
+      })
+  },
+  getRackList({ commit }) {
+    return listWmsRack({}, { page: 0, size: 1000 })
+      .then(res => {
+        const { content } =res
+        commit('SET_RACK', content);
+      })
+  },
+}
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/src/utils/RandomUtils.js b/src/utils/RandomUtils.js
new file mode 100644
index 0000000..780a6dd
--- /dev/null
+++ b/src/utils/RandomUtils.js
@@ -0,0 +1,5 @@
+import moment from 'moment'
+
+export function randomId() {
+	return moment().format('YYYY-MM-DD-HHmmss');
+}
\ No newline at end of file
diff --git a/src/utils/printData.js b/src/utils/printData.js
new file mode 100644
index 0000000..0f16e7c
--- /dev/null
+++ b/src/utils/printData.js
@@ -0,0 +1,778 @@
+export const STOCK_OUT_TEMPLATE = {
+	"default": "true",
+	"title": "出库单",
+	"type": 1,
+	"width": 770,
+	"height": 500,
+	"pageWidth": 215,
+	"pageHeight": 140,
+	"tempItems": [{
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 770,
+		"height": 25,
+		"left": 0,
+		"top": 10,
+		"title": "出库单号",
+		"value": "{ 出库单号 } ",
+		"defaultValue": "出库单号",
+		"name": "shipmentOrderNo",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 12,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "center",
+			"ItemType": 1
+		},
+		"uuid": "7f7b0b45da"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 39,
+		"top": 40,
+		"title": "自定义文本",
+		"value": "客户：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "54ca3dc671"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 375,
+		"top": 40,
+		"title": "自定义文本",
+		"value": "订单号：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "dae9eb86e4"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 15,
+		"top": 67,
+		"title": "自定义文本",
+		"value": "出库类型：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "317ae87dea"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 387,
+		"top": 67,
+		"title": "自定义文本",
+		"value": "日期：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "d8cf0f23b0"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 268,
+		"height": 20,
+		"left": 81,
+		"top": 40,
+		"title": "客户",
+		"value": "{ 客户 } ",
+		"defaultValue": "客户",
+		"name": "customerName",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "a77126a142"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 299,
+		"height": 20,
+		"left": 425,
+		"top": 40,
+		"title": "订单号",
+		"value": "{ 订单号 } ",
+		"defaultValue": "订单号",
+		"name": "orderNo",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "d8f17a27f5"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 257,
+		"height": 20,
+		"left": 80,
+		"top": 67,
+		"title": "出库类型",
+		"value": "{ 出库类型 } ",
+		"defaultValue": "销售出库",
+		"name": "shipmentType",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "4be08abbb3"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 230,
+		"height": 20,
+		"left": 425,
+		"top": 67,
+		"title": "下单时间",
+		"value": "{ 下单时间 } ",
+		"defaultValue": "2020-08-27 12: 00: 00",
+		"name": "createTime",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "83ef9c90be"
+	}, {
+		"type": "braid-table",
+		"isEdit": 0,
+		"dragable": true,
+		"resizable": true,
+		"width": 740,
+		"height": 275,
+		"left": 15,
+		"top": 110,
+		"title": "出库商品明细",
+		"value": "{ details } ",
+		"tabelHtml": "",
+		"columnsAttr": [{
+			"title": "物料名",
+			"value": "{ 物料名 } ",
+			"name": "itemName"
+		}, {
+			"title": "物料编号",
+			"value": "{ 物料编号 } ",
+			"name": "itemNo"
+		}, {
+			"title": "物料类型",
+			"value": "{ 物料类型 } ",
+			"name": "itemType"
+		}, {
+			"title": "数量",
+			"value": "{ 数量 } ",
+			"name": "planQuantity"
+		}, {
+			"title": "仓库/库区",
+			"value": "{ 仓库/库区 } ",
+			"name": "place"
+		}],
+		"columns": [{
+			"title": "物料名",
+			"value": "{物料名}",
+			"name": "itemName"
+		}, {
+			"title": "物料编号",
+			"value": "{物料编号}",
+			"name": "itemNo"
+		}, {
+			"title": "物料类型",
+			"value": "{物料类型}",
+			"name": "itemType"
+		}, {
+			"title": "数量",
+			"value": "{数量}",
+			"name": "planQuantity"
+		}, {
+			"title": "仓库/库区",
+			"value": "{仓库/库区}",
+			"name": "place"
+		}],
+		"selectCol": ["itemName", "itemNo", "itemType", "planQuantity", "place"],
+		"name": "details",
+		"style": {
+			"zIndex": 0,
+			"Alignment": "left",
+			"FontSize": 9,
+			"FontColor": "#000000",
+			"BorderColor": "#000000",
+			"AutoHeight": true,
+			"BottomMargin": 0
+		},
+		"uuid": "8f1ee2cff3"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 435,
+		"top": 382,
+		"title": "自定义文本",
+		"value": "合计数量：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "15134dd251"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 15,
+		"top": 430,
+		"title": "自定义文本",
+		"value": "备注：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "6b5f65c726"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 180,
+		"height": 20,
+		"left": 492,
+		"top": 382,
+		"title": "合计数量",
+		"value": "{合计数量}",
+		"defaultValue": "123.00",
+		"name": "totalCount",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "7a425ef108"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 660,
+		"height": 20,
+		"left": 50,
+		"top": 430,
+		"title": "备注",
+		"value": "{备注}",
+		"defaultValue": "备注",
+		"name": "remark",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "a745e40eae"
+	}]
+}
+
+
+export const STOCK_IN_TEMPLATE = {
+	"default": "true",
+	"title": "入库单",
+	"type": 1,
+	"width": 770,
+	"height": 500,
+	"pageWidth": 215,
+	"pageHeight": 140,
+	"tempItems": [{
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 770,
+		"height": 25,
+		"left": 0,
+		"top": 10,
+		"title": "入库单号",
+		"value": "{ 入库单号 } ",
+		"defaultValue": "入库单号",
+		"name": "receiptOrderNo",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 12,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "center",
+			"ItemType": 1
+		},
+		"uuid": "7f7b0b45da"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 27,
+		"top": 40,
+		"title": "自定义文本",
+		"value": "供应商：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "54ca3dc671"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 375,
+		"top": 40,
+		"title": "自定义文本",
+		"value": "订单号：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "dae9eb86e4"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 15,
+		"top": 67,
+		"title": "自定义文本",
+		"value": "入库类型：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "317ae87dea"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 387,
+		"top": 67,
+		"title": "自定义文本",
+		"value": "日期：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "d8cf0f23b0"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 268,
+		"height": 20,
+		"left": 80,
+		"top": 40,
+		"title": "供应商",
+		"value": "{ 供应商 } ",
+		"defaultValue": "供应商",
+		"name": "supplierName",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "a77126a142"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 299,
+		"height": 20,
+		"left": 425,
+		"top": 40,
+		"title": "订单号",
+		"value": "{ 订单号 } ",
+		"defaultValue": "zj001",
+		"name": "orderNo",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "d8f17a27f5"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 257,
+		"height": 20,
+		"left": 80,
+		"top": 67,
+		"title": "入库类型",
+		"value": "{ 入库类型 } ",
+		"defaultValue": "销售出库",
+		"name": "receiptType",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 1
+		},
+		"uuid": "4be08abbb3"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 230,
+		"height": 20,
+		"left": 425,
+		"top": 67,
+		"title": "下单时间",
+		"value": "{ 下单时间 } ",
+		"defaultValue": "2020-08-27 12: 00: 00",
+		"name": "createTime",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "83ef9c90be"
+	}, {
+		"type": "braid-table",
+		"isEdit": 0,
+		"dragable": true,
+		"resizable": true,
+		"width": 740,
+		"height": 275,
+		"left": 15,
+		"top": 110,
+		"title": "入库商品明细",
+		"value": "{ details } ",
+		"tabelHtml": "",
+		"columnsAttr": [{
+			"title": "物料名",
+			"value": "{ 物料名 } ",
+			"name": "itemName"
+		}, {
+			"title": "物料编号",
+			"value": "{ 物料编号 } ",
+			"name": "itemNo"
+		}, {
+			"title": "物料类型",
+			"value": "{ 物料类型 } ",
+			"name": "itemType"
+		}, {
+			"title": "数量",
+			"value": "{ 数量 } ",
+			"name": "planQuantity"
+		}, {
+			"title": "仓库/库区",
+			"value": "{ 仓库/库区 } ",
+			"name": "place"
+		}],
+		"columns": [{
+			"title": "物料名",
+			"value": "{物料名}",
+			"name": "itemName"
+		}, {
+			"title": "物料编号",
+			"value": "{物料编号}",
+			"name": "itemNo"
+		}, {
+			"title": "物料类型",
+			"value": "{物料类型}",
+			"name": "itemType"
+		}, {
+			"title": "数量",
+			"value": "{数量}",
+			"name": "planQuantity"
+		}, {
+			"title": "仓库/库区",
+			"value": "{仓库/库区}",
+			"name": "place"
+		}],
+		"selectCol": ["itemName", "itemNo", "itemType", "planQuantity", "place"],
+		"name": "details",
+		"style": {
+			"zIndex": 0,
+			"Alignment": "left",
+			"FontSize": 9,
+			"FontColor": "#000000",
+			"BorderColor": "#000000",
+			"AutoHeight": true,
+			"BottomMargin": 0
+		},
+		"uuid": "8f1ee2cff3"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 435,
+		"top": 382,
+		"title": "自定义文本",
+		"value": "合计数量：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "15134dd251"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 110,
+		"height": 20,
+		"left": 15,
+		"top": 430,
+		"title": "自定义文本",
+		"value": "备注：",
+		"defaultValue": "自定义文本",
+		"name": "",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "6b5f65c726"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 180,
+		"height": 20,
+		"left": 492,
+		"top": 382,
+		"title": "合计数量",
+		"value": "{合计数量}",
+		"defaultValue": "123.00",
+		"name": "totalCount",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "7a425ef108"
+	}, {
+		"type": "braid-txt",
+		"isEdit": 1,
+		"dragable": true,
+		"resizable": true,
+		"width": 660,
+		"height": 20,
+		"left": 50,
+		"top": 430,
+		"title": "备注",
+		"value": "{备注}",
+		"defaultValue": "备注",
+		"name": "remark",
+		"style": {
+			"zIndex": 0,
+			"FontSize": 9,
+			"FontColor": "#  000000",
+			"Bold": false,
+			"Italic": false,
+			"Underline": false,
+			"Alignment": "left",
+			"ItemType": 0
+		},
+		"uuid": "a745e40eae"
+	}]
+}
\ No newline at end of file
diff --git a/src/views/components/ItemSelect.vue b/src/views/components/ItemSelect.vue
new file mode 100644
index 0000000..5ec6812
--- /dev/null
+++ b/src/views/components/ItemSelect.vue
@@ -0,0 +1,212 @@
+<template>
+  <div class="prod-sku-select-wrapper">
+    <div class="search">
+      <el-form inline="inline" label-width="64">
+        <el-form-item label="商品类型">
+          <div class="w200">
+            <treeselect
+              v-model="query.itemType"
+              :options="deptOptions"
+              :show-count="true"
+              clearable
+              placeholder="请选择分类"
+            />
+          </div>
+        </el-form-item>
+        <el-form-item label="快速筛选">
+          <el-input
+            class="w200"
+            v-model="query.search"
+            clearable
+            placeholder="编号、名称、ID"
+          ></el-input>
+        </el-form-item>
+        <el-button type="primary" @click="clickQuery">查询</el-button>
+      </el-form>
+    </div>
+    <div class="center">
+      <div class="left flex-one">
+        <div class="content">
+          <table class="common-table" v-if="list.length !== 0">
+            <tr>
+              <th>
+                <el-checkbox
+                  :value="leftAllChecked === 1"
+                  @input="leftAllChecked = $event"
+                  :indeterminate="leftAllChecked === 2"
+                  :disabled="editableList.length === 0"
+                ></el-checkbox>
+              </th>
+              <th>物料名称</th>
+              <th>物料编号</th>
+            </tr>
+
+            <tr v-for="p in list" :key="p.id">
+              <td>
+                <div class="text-center">
+                  <el-checkbox
+                    v-model="p.checked"
+                    :disabled="rightListKeySet.has(p.id)"
+                  ></el-checkbox>
+                </div>
+              </td>
+              <td>
+                <div class="text-center">
+                  {{ p.itemName }}
+                </div>
+              </td>
+              <td>
+                <div class="text-center">
+                  {{ p.itemNo }}
+                </div>
+              </td>
+            </tr>
+          </table>
+          <el-empty v-else :image-size="64"></el-empty>
+        </div>
+      </div>
+    </div>
+    <pagination v-show="total > 0" :total="total" :page.sync="pageReq.page" :limit.sync="pageReq.size"
+                @pagination="loadAll"/>
+
+  </div>
+</template>
+
+<script>
+import {listWmsItem} from "@/api/wms/item";
+import Treeselect from "@riophae/vue-treeselect";
+import {itemTypeTreeselect} from "@/api/wms/itemType";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "ItemSelect",
+  components: {Treeselect},
+  props: ['data'],
+  data() {
+    return {
+      //物料类别
+      deptOptions: [],
+      query: {
+        itemType: null,
+        search: null,
+      },
+      list: [],
+      total: 0,
+      pageReq: {
+        page: 1,
+        size: 10,
+      },
+      rightList: [],
+      rightListKeySet: new Set
+    };
+  },
+  computed: {
+    leftAllChecked: {
+      get() {
+        return this.editableList.length > 0 &&
+        this.editableList.every((it) => it.checked)
+          ? 1
+          : this.editableList.some((it) => it.checked)
+            ? 2
+            : 0;
+      },
+      set(v) {
+        this.editableList.forEach((it) => (it.checked = v));
+      },
+    },
+    editableList() {
+      return this.list.filter((it) => !this.rightListKeySet.has(it.id));
+    },
+    leftCheckedList() {
+      return this.list.filter((it) => it.checked);
+    }
+  },
+  watch: {
+    rightList: {
+      handler(newVal, oldVal) {
+        const set = new Set();
+        newVal.forEach((it) => set.add(it.id));
+        this.rightListKeySet = set;
+      },
+      deep: true
+    }
+  },
+  created() {
+    if (this.data) {
+      this.initDetailsList(this.data)
+    }
+    this.loadAll();
+    itemTypeTreeselect().then((response) => {
+      this.deptOptions = response.data;
+    });
+  },
+  methods: {
+    initDetailsList(list) {
+      this.rightList = list.map(it => {
+        return it.prod
+      })
+    },
+    loadAll() {
+      const pageReq = {...this.pageReq};
+      pageReq.page -= 1;
+      listWmsItem(this.query, pageReq).then((res) => {
+        const {content, totalElements} = res;
+        content.forEach((it) => (it.checked = false));
+        this.list = content;
+        this.total = totalElements;
+      });
+    },
+    clickQuery() {
+      this.pageReq.page = 1;
+      this.loadAll();
+    },
+    getRightList() {
+      this.moveRight();
+      return this.rightList;
+    },
+    moveRight() {
+      for (let it of this.leftCheckedList) {
+        if (!this.rightListKeySet.has(it.id)) {
+          it.checked = false;
+          this.rightList.push({...it, checked: false});
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="stylus">
+.prod-sku-select-wrapper
+  .center
+    display flex
+    align-items stretch
+
+    .left, .right
+
+      > div
+        padding 12px
+
+      .statistic
+        border-bottom 1px solid $gray-2
+
+      .header
+        background-color $gray-1
+        padding 12px
+
+      .prods
+        height 360px
+        overflow-y auto
+
+        > .prod
+          padding 12px
+
+        > .prod + .prod
+          border-top 1px solid var(--gray-2)
+
+    .ops
+      display flex
+      flex-direction column
+      justify-content center
+      margin 0 16px
+</style>
diff --git a/src/views/components/wms/BatchWarehouseDialog/index.vue b/src/views/components/wms/BatchWarehouseDialog/index.vue
new file mode 100644
index 0000000..ba6c1e7
--- /dev/null
+++ b/src/views/components/wms/BatchWarehouseDialog/index.vue
@@ -0,0 +1,57 @@
+<template>
+	<el-dialog :visible="visible" width="500px" title="批量设置仓库" @close="handleCancel">
+		<el-form :model="form" ref="form">
+			<el-form-item label="仓库/库区" prop="place" :rules="rules">
+				<WmsWarehouseCascader v-model="form.place" size="small"></WmsWarehouseCascader>
+			</el-form-item>
+		</el-form>
+		<div slot="footer" class="dialog-footer">
+			<el-button @click="handleCancel">取 消</el-button>
+			<el-button type="primary" @click="handleConfirm">确 定</el-button>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+	export default {
+		name: 'BatchWarehouseDialog',
+		props: {
+			visible: {
+				type: Boolean,
+				required: true
+			},
+			formData: {
+				type: Object,
+				required: true
+			},
+			rules: {
+				type: Array,
+				default: () => [
+					{ required: true, message: '请选择 仓库/库区', trigger: 'blur' }
+				]
+			}
+		},
+		computed: {
+			form: {
+				get() {
+					return this.formData;
+				},
+				set(value) {
+					this.$emit('update:formData', value);
+				}
+			}
+		},
+		methods: {
+			handleCancel() {
+				this.$emit('update:visible', false);
+			},
+			handleConfirm() {
+				this.$refs.form.validate(valid => {
+					if (valid) {
+						this.$emit('confirmed');
+					}
+				});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue
index 0a375d6..301145b 100644
--- a/src/views/productManagement/workorder2.vue
+++ b/src/views/productManagement/workorder2.vue
@@ -132,9 +132,9 @@
 				</el-row>
 				<el-row>
 					<el-col :span="8"><el-form-item label="车数" prop="vehicleNumber">
-							<el-input v-model="workorderItem.vehicleNumber" placeholder="毛坯号"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.vehicleNumber" placeholder="毛坯号" @input="vehicleNumberInput"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="挂具摆放数" prop="hangNumber">
-							<el-input v-model="workorderItem.hangNumber" placeholder="挂具摆放数"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.hangNumber" placeholder="挂具摆放数" @input="hangNumberInput"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="上件数" prop="previousNumber">
 							<el-input v-model="workorderItem.previousNumber" placeholder="上件数"></el-input> </el-form-item></el-col>
 				</el-row>
@@ -178,6 +178,7 @@
 		deleteworkorder,
 		updateworkorder,
 		updateSort,
+		updateSort2,
 		GenerateWorkorder,
 	} from '@/api/productManagement/workoder_v2.js'
 	import Sortable from 'sortablejs'
@@ -189,6 +190,7 @@
 			return {
 				mqttClient: null,
 				mqttClientId: emqxUtil.title + Math.random().toString(16).substring(2, 8),
+				sortable:null,
 				search: {
 					year: new Date().getFullYear(),
 					week: 1,
@@ -260,8 +262,8 @@
 		},
 		mounted() {
 			this.getList()
-			this.drag()
-
+			// this.drag()
+			this.rowDrop();
 		},
 		methods: {
 			//todo 拖拽
@@ -296,6 +298,41 @@
 					},
 				})
 			},
+			//XXX新方案
+			rowDrop() {
+				this.$nextTick(() => {
+					let xTable = this.$refs.xTable;
+					this.sortable = Sortable.create(
+						xTable.$el.querySelector(".body--wrapper>.vxe-table--body tbody"),
+						{
+							handle: ".vxe-body--row",
+							animation: 150,
+							onEnd: ({ newIndex, oldIndex }) => { // 拖拽后回调
+								// 解决方案
+								this.workorder_table_data.splice(newIndex, 0, this.workorder_table_data.splice(oldIndex, 1)[0]);
+								let newArray = this.workorder_table_data.slice(0);
+								this.workorder_table_data = [];
+								this.$nextTick(function () {
+									this.workorder_table_data = newArray;
+									const query = {
+										oldId:this.workorder_table_data[oldIndex].id,
+										oldSort:this.workorder_table_data[oldIndex].sort,
+										newId:this.workorder_table_data[newIndex].id,
+										newSort:this.workorder_table_data[newIndex].sort,
+									}
+									updateSort2(query).then((res) => {
+										if (res.code == 200 && res.data > 0) {
+											this.$notify.success('修改成功')
+										}else{
+											this.$notify.error('修改失败')
+										}
+									})
+								});
+							},
+						}
+					);
+				});
+			},
 
 			handleClick() {
 				this.getList()
@@ -535,6 +572,22 @@
 					})
 					.catch(() => {})
 			},
+			vehicleNumberInput(value) {
+				if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
+					this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
+				} else {
+					this.workorderItem.previousNumber = 0;
+				}
+
+			},
+			hangNumberInput(value) {
+				if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
+					this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
+				} else {
+					this.workorderItem.previousNumber = 0;
+				}
+			},
+
 			initMqtt() {
 				const that = this;
 				if (that.mqttClient !== null && that.mqttClient.connected) {
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 13a5148..1a3110b 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -49,9 +49,10 @@
 			<vxe-colgroup title="订单信息" align="center" fixed="left">
 				<vxe-column field="workorderId" title="工单号" width="120px"></vxe-column>
 				<vxe-column field="finishedPartNumber" title="零件号" min-width="80px" :show-overflow="false"></vxe-column>
+				<vxe-column field="colour" title="颜色" min-width="100px" :show-overflow="false"></vxe-column>
 				<vxe-column field="productDescription" title="描述" min-width="100px" :show-overflow="false"></vxe-column>
 				<vxe-column field="requireNumber" title="生  产  投  入  数" min-width="60px"></vxe-column>
-				<vxe-column field="team" title="班次"></vxe-column>
+				<vxe-column field="team" title="班次" sortable></vxe-column>
 				<vxe-column field="qualifiedNumber" title="合  格  数" min-width="60px"></vxe-column>
 				<vxe-column title="合格率" min-width="70px">
 					<template #default="{ row }"> {{ offsetRate(row.qualifiedRate) }}% </template>
@@ -59,8 +60,8 @@
 				<vxe-column field="paoguangTotal" title="抛光总数" min-width="60px"></vxe-column>
 				<vxe-column field="damoTotal" title="打磨总数" min-width="60px"></vxe-column>
 				<vxe-column field="baofeiTotal" title="报废总数" min-width="60px"></vxe-column>
-				<vxe-column field="startTime" title="开始时间" width="120px" :show-overflow="false"></vxe-column>
-				<vxe-column field="endTime" title="结束时间" width="120px" :show-overflow="false"></vxe-column>
+				<vxe-column field="startTime" title="开始时间" width="120px" :show-overflow="false" sortable></vxe-column>
+				<vxe-column field="endTime" title="结束时间" width="120px" :show-overflow="false" sortable></vxe-column>
 				<vxe-column field="remark" title="备注" width="60px"></vxe-column>
 			</vxe-colgroup>
 
diff --git a/src/views/wms/area/index.vue b/src/views/wms/area/index.vue
new file mode 100644
index 0000000..fa4e4be
--- /dev/null
+++ b/src/views/wms/area/index.vue
@@ -0,0 +1,277 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="areaNo">
+				<el-input v-model.trim="queryParams.areaNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="areaName">
+				<el-input v-model.trim="queryParams.areaName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<el-input v-model.trim="queryParams.warehouseId" placeholder="请输入所属仓库" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:area:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:area:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:area:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:area:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsAreaList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="areaNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="areaName" v-if="columns[1].visible" />
+			<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[2].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['wms:area:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:area:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改库区对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="areaNo">
+					<el-input v-model="form.areaNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="areaName">
+					<el-input v-model="form.areaName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="所属仓库" prop="warehouseId">
+					<el-select v-model="form.warehouseId" placeholder="请输入货仓名称" clearable size="small">
+						<el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsArea,
+		getWmsArea,
+		delWmsArea,
+		addWmsArea,
+		updateWmsArea,
+		exportWmsArea,
+	} from "@/api/wms/area";
+	import { mapGetters } from 'vuex';
+	export default {
+		name: "WmsArea",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库区表格数据
+				wmsAreaList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					areaNo: null,
+					areaName: null,
+					warehouseId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					areaNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+					areaName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" },
+					],
+					warehouseId: [
+						{ required: true, message: "所属仓库不能为空", trigger: "blur" },
+					],
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "所属仓库", visible: true },
+					{ key: 4, label: "备注", visible: true },
+				],
+			};
+		},
+		computed: {
+			// ...mapGetters(['warehouseMap', 'warehouseList'])
+		},
+		created() {
+			this.warehouseList = [];
+			console.log(111)
+			// this.getList();
+		},
+		methods: {
+			/** 查询库区列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = {
+					...this.queryParams,
+					pageNum: undefined,
+					pageSize: undefined,
+				};
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsArea(query, pageReq).then((response) => {
+					const { content, totalElements } = response;
+					content.forEach((item) => {
+						item.warehouseName = this.warehouseMap.get(item.warehouseId);
+					});
+					this.wmsAreaList = content;
+					this.total = totalElements;
+					this.loading = false;
+
+				});
+
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					areaNo: null,
+					areaName: null,
+					warehouseId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map((item) => item.id);
+				this.single = selection.length !== 1;
+				this.multiple = !selection.length;
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加库区";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids;
+				getWmsArea(id).then((response) => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改库区";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate((valid) => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsArea(this.form).then((response) => {
+								this.$store.dispatch("wms/getAreaList");
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsArea(this.form).then((response) => {
+								this.$store.dispatch("wms/getAreaList");
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal
+					.confirm('是否确认删除库区编号为"' + ids + '"的数据项？')
+					.then(function () {
+						return delWmsArea(ids);
+					})
+					.then(() => {
+						this.getList();
+						this.$store.dispatch("wms/getAreaList");
+						this.$modal.msgSuccess("删除成功");
+					})
+					.catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal
+					.confirm("是否确认导出所有库区数据项？")
+					.then(() => {
+						this.exportLoading = true;
+						return exportWmsArea(queryParams);
+					})
+					.then((response) => {
+						this.$download.download(response);
+						this.exportLoading = false;
+					})
+					.catch(() => {});
+			},
+		},
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/carrier/index.vue b/src/views/wms/carrier/index.vue
new file mode 100644
index 0000000..abaa83a
--- /dev/null
+++ b/src/views/wms/carrier/index.vue
@@ -0,0 +1,330 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="carrierNo">
+				<el-input v-model.trim="queryParams.carrierNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="carrierName">
+				<el-input v-model.trim="queryParams.carrierName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="地址" prop="address">
+				<el-input v-model.trim="queryParams.address" placeholder="请输入地址" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="手机号" prop="mobile">
+				<el-input v-model.trim="queryParams.mobile" placeholder="请输入手机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="座机号" prop="tel">
+				<el-input v-model.trim="queryParams.tel" placeholder="请输入座机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="联系人" prop="contact">
+				<el-input v-model.trim="queryParams.contact" placeholder="请输入联系人" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="级别" prop="level">
+				<el-select v-model="queryParams.level" placeholder="请选择级别" clearable size="small" @change="handleQuery">
+					<el-option v-for="dict in dict.type.wms_carrier_level" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+				</el-select>
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="Email" prop="email">
+					<el-input v-model.trim="queryParams.email" placeholder="请输入Email" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:carrier:add']">新增</el-button>
+			</el-col>
+			<!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:carrier:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:carrier:remove']"
+        >删除</el-button>
+      </el-col> -->
+			<!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['wms:carrier:export']"
+        >导出</el-button>
+      </el-col> -->
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsCarrierList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="carrierNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="carrierName" v-if="columns[1].visible" />
+			<el-table-column label="地址" align="center" prop="address" v-if="columns[2].visible" />
+			<el-table-column label="手机号" align="center" prop="mobile" v-if="columns[3].visible" />
+			<el-table-column label="座机号" align="center" prop="tel" v-if="columns[4].visible" />
+			<el-table-column label="联系人" align="center" prop="contact" v-if="columns[5].visible" />
+			<el-table-column label="级别" align="center" prop="level" v-if="columns[6].visible" />
+			<el-table-column label="Email" align="center" prop="email" v-if="columns[7].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['wms:carrier:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:carrier:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改承运商对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="carrierNo">
+					<el-input v-model="form.carrierNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="carrierName">
+					<el-input v-model="form.carrierName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="地址" prop="address">
+					<el-input v-model="form.address" placeholder="请输入地址" />
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile">
+					<el-input v-model="form.mobile" placeholder="请输入手机号" />
+				</el-form-item>
+				<el-form-item label="座机号" prop="tel">
+					<el-input v-model="form.tel" placeholder="请输入座机号" />
+				</el-form-item>
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="form.contact" placeholder="请输入联系人" />
+				</el-form-item>
+				<el-form-item label="级别" prop="level">
+					<el-select v-model="form.level" placeholder="请选择级别">
+						<el-option v-for="dict in dict.type.wms_carrier_level" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="Email" prop="email">
+					<el-input v-model="form.email" placeholder="请输入Email" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsCarrier, getWmsCarrier, delWmsCarrier, addWmsCarrier, updateWmsCarrier, exportWmsCarrier } from "@/api/wms/carrier";
+	import WmsTable from "@/components/WmsTable/index.vue";
+
+	export default {
+		name: "WmsCarrier",
+		dicts: ["wms_carrier_level"],
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 承运商表格数据
+				wmsCarrierList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					carrierNo: null,
+					carrierName: null,
+					address: null,
+					mobile: null,
+					tel: null,
+					contact: null,
+					level: null,
+					email: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					carrierNo: [
+						{ required: true, message: "编号不能为空", trigger: "blur" }
+					],
+					carrierName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" }
+					],
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "地址", visible: true },
+					{ key: 4, label: "手机号", visible: true },
+					{ key: 5, label: "座机号", visible: true },
+					{ key: 6, label: "联系人", visible: true },
+					{ key: 7, label: "级别", visible: true },
+					{ key: 8, label: "Email", visible: true },
+					{ key: 9, label: "备注", visible: true },
+				],
+				showMoreCondition: false
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询承运商列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsCarrier(query, pageReq).then(response => {
+					const { content, totalElements } = response;
+					this.wmsCarrierList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					carrierNo: null,
+					carrierName: null,
+					address: null,
+					mobile: null,
+					tel: null,
+					contact: null,
+					level: null,
+					email: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id);
+				this.single = selection.length !== 1;
+				this.multiple = !selection.length;
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加承运商";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids;
+				getWmsCarrier(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改承运商";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsCarrier(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+								this.$store.dispatch('wms/getCarrier')
+							});
+						}
+						else {
+							addWmsCarrier(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+								this.$store.dispatch('wms/getCarrier')
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm("是否确认删除承运商编号为\"" + ids + "\"的数据项？").then(function () {
+					return delWmsCarrier(ids);
+				}).then(() => {
+					this.getList();
+					this.$store.dispatch('wms/getCarrier')
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm("是否确认导出所有承运商数据项？").then(() => {
+					this.exportLoading = true;
+					return exportWmsCarrier(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		},
+		components: { WmsTable }
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue
new file mode 100644
index 0000000..afebdf9
--- /dev/null
+++ b/src/views/wms/customer/index.vue
@@ -0,0 +1,404 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="customerNo">
+				<el-input v-model.trim="queryParams.customerNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="customerName">
+				<el-input v-model.trim="queryParams.customerName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="地址" prop="address">
+				<el-input v-model.trim="queryParams.address" placeholder="请输入地址" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="手机号" prop="mobile">
+				<el-input v-model.trim="queryParams.mobile" placeholder="请输入手机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="座机号" prop="tel">
+				<el-input v-model.trim="queryParams.tel" placeholder="请输入座机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="联系人" prop="customerPerson">
+				<el-input v-model.trim="queryParams.customerPerson" placeholder="请输入联系人" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="级别" prop="customerLevel">
+				<el-input v-model.trim="queryParams.customerLevel" placeholder="请输入级别" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="Email" prop="email">
+					<el-input v-model.trim="queryParams.email" placeholder="请输入Email" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:customer:add']">新增</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsCustomerList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="customerNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="customerName" v-if="columns[1].visible" />
+			<el-table-column label="应收款" align="center" class-name="small-padding fixed-width" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<p> {{ scope.row.receivableAmount }}</p>
+					<el-button size="mini" type="text" @click="handleEnter(scope.row)">+应收
+					</el-button>
+					<el-button size="mini" type="text" @click="handleExit(scope.row)">-结款
+					</el-button>
+					<el-button size="mini" type="text" @click="handleDetail(scope.row)">查看流水
+					</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column label="地址" align="center" prop="address" v-if="columns[3].visible" />
+			<el-table-column label="手机号" align="center" prop="mobile" v-if="columns[4].visible" />
+			<el-table-column label="座机号" align="center" prop="tel" v-if="columns[5].visible" />
+			<el-table-column label="联系人" align="center" prop="customerPerson" v-if="columns[6].visible" />
+			<el-table-column label="级别" align="center" prop="customerLevel" v-if="columns[7].visible" />
+			<el-table-column label="Email" align="center" prop="email" v-if="columns[8].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="columns[10].visible">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:customer:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:customer:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改客户对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="customerNo">
+					<el-input v-model="form.customerNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="customerName">
+					<el-input v-model="form.customerName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="地址" prop="address">
+					<el-input v-model="form.address" placeholder="请输入地址" />
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile">
+					<el-input v-model="form.mobile" placeholder="请输入手机号" />
+				</el-form-item>
+				<el-form-item label="开户行" prop="bankName">
+					<el-input v-model="form.bankName" placeholder="请输入开户行" />
+				</el-form-item>
+				<el-form-item label="银行卡号" prop="bankAccount">
+					<el-input v-model="form.bankAccount" placeholder="请输入银行卡号" />
+				</el-form-item>
+				<el-form-item label="座机号" prop="tel">
+					<el-input v-model="form.tel" placeholder="请输入座机号" />
+				</el-form-item>
+				<el-form-item label="联系人" prop="customerPerson">
+					<el-input v-model="form.customerPerson" placeholder="请输入联系人" />
+				</el-form-item>
+				<el-form-item label="级别" prop="customerLevel">
+					<el-input v-model="form.customerLevel" placeholder="请输入级别" />
+				</el-form-item>
+				<el-form-item label="Email" prop="email">
+					<el-input v-model="form.email" placeholder="请输入Email" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+
+		<!-- 应付款 新增/结账 对话框 -->
+		<el-dialog :title="duePayForm.title" :visible.sync="duePayForm.open" width="500px" append-to-body>
+			<el-form ref="duePayForm" :model="duePayForm.form" :rules="duePayForm.rules" label-width="108px">
+
+				<el-form-item label="金额" prop="transactionAmount">
+					<el-input-number v-model="duePayForm.form.transactionAmount" :precision="2" :min="0" label="请输入金额"></el-input-number>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="duePayForm.form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitDuePayForm">确 定</el-button>
+				<el-button @click="cancelDuePayForm">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsCustomer, getWmsCustomer, delWmsCustomer, addWmsCustomer, updateWmsCustomer, exportWmsCustomer } from "@/api/wms/customer";
+	import { randomId } from "@/utils/RandomUtils";
+	import { addWmsCustomerTransaction } from "@/api/wms/customerTransaction";
+
+	/* 银行卡校验 */
+	var isbankAccount = (rule, value, callback) => {
+		const strBin =
+			"10,18,30,35,37,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,58,60,62,65,68,69,84,87,88,94,95,98,99";
+		if (!value) {
+			return callback(new Error("收款账户不能为空"));
+		} else if (!Number.isInteger(+value)) {
+			callback(new Error("银行卡号必须全为数字"));
+		} else if (value.trim().length < 12 || value.trim().length > 19) {
+			callback(new Error("银行卡号长度必须在12到19之间"));
+		} else if (strBin.indexOf(value.substring(0, 2)) === -1) {
+			callback(new Error("银行卡号开头6位不符合规范"));
+		} else {
+			callback();
+		}
+	};
+
+	export default {
+		name: "WmsCustomer",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 客户表格数据
+				wmsCustomerList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					customerNo: null,
+					customerName: null,
+					address: null,
+					mobile: null,
+					tel: null,
+					customerPerson: null,
+					customerLevel: null,
+					email: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					customerNo: [
+						{ required: true, message: "编号不能为空", trigger: "blur" }
+					],
+					customerName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" }
+					],
+					bankAccount: [{ validator: isbankAccount, trigger: "blur" }, ]
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "应收款", visible: true },
+					{ key: 4, label: "地址", visible: false },
+					{ key: 5, label: "手机号", visible: false },
+					{ key: 6, label: "座机号", visible: false },
+					{ key: 7, label: "联系人", visible: true },
+					{ key: 8, label: "级别", visible: true },
+					{ key: 9, label: "Email", visible: false },
+					{ key: 10, label: "备注", visible: true },
+					{ key: 11, label: "操作", visible: true },
+				],
+				showMoreCondition: false,
+				duePayForm: {
+					// 弹出层标题
+					title: "",
+					// 是否显示弹出层
+					open: false,
+					form: {}
+				}
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询客户列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsCustomer(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsCustomerList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			/** 应付款 取消按钮 */
+			cancelDuePayForm() {
+				this.duePayForm.open = false
+			},
+			/** 应付款 提交按钮 */
+			submitDuePayForm() {
+				this.$refs["duePayForm"].validate(valid => {
+					if (valid) {
+						addWmsCustomerTransaction(this.duePayForm.form).then(res => {
+							this.duePayForm.open = false
+							this.$store.dispatch('wms/getSuppliers')
+							this.$modal.msgSuccess("修改成功");
+							this.getList();
+
+						})
+
+					}
+				})
+
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					customerNo: null,
+					customerName: null,
+					address: null,
+					mobile: null,
+					tel: null,
+					customerPerson: null,
+					customerLevel: null,
+					email: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加客户";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsCustomer(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改客户";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsCustomer(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+								this.$store.dispatch('wms/getCustomer')
+							});
+						} else {
+							addWmsCustomer(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+								this.$store.dispatch('wms/getCustomer')
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsCustomer(ids);
+				}).then(() => {
+					this.getList();
+					this.$store.dispatch('wms/getCustomer')
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有客户数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsCustomer(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			},
+			/** 查看流水 */
+			handleDetail(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/relation/customerTransaction', query: { id } })
+			},
+			/* 新增 应付款 */
+			handleEnter(row) {
+				this.duePayForm.title = '新增应收款'
+				this.duePayForm.open = true
+
+				this.resetDueForm();
+				this.duePayForm.form.customerId = row.id
+				this.duePayForm.form.transactionType = '22'
+
+			},
+			resetDueForm() {
+				this.duePayForm.form = {
+					transactionCode: 'TS-' + randomId(),
+					transactionAmount: 0.00,
+					remark: null
+				}
+			},
+			/* 结款 */
+			handleExit(row) {
+				this.duePayForm.title = '结款'
+				this.duePayForm.open = true
+
+				this.resetDueForm();
+				this.duePayForm.form.transactionType = '11'
+				this.duePayForm.form.customerId = row.id
+
+			},
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/customerTransaction/index.vue b/src/views/wms/customerTransaction/index.vue
new file mode 100644
index 0000000..9704f98
--- /dev/null
+++ b/src/views/wms/customerTransaction/index.vue
@@ -0,0 +1,337 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="交易编号" prop="transactionCode">
+				<el-input v-model.trim="queryParams.transactionCode" placeholder="请输入交易编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="交易类型" prop="transactionType">
+				<DictRadio v-model="queryParams.transactionType" @change="handleQuery" size="small" :radioData="dict.type.wms_customer_transaction_type" :showAll="'all'" />
+			</el-form-item>
+			<el-form-item label="创建时间" prop="Time">
+				<el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions" range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" align="right" @change="handleChange">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<WmsTable v-loading="loading" :data="wmsCustomerTransactionList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="交易编号" align="center" prop="transactionCode" v-if="columns[0].visible" />
+			<el-table-column label="用户" align="center" prop="customerId" v-if="columns[1].visible">
+				<template slot-scope="scope">
+					{{ getCustomerName(scope.row) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="交易类型" align="center" prop="transactionType" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_customer_transaction_type" :value="scope.row.transactionType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="交易金额" align="center" prop="transactionAmount" v-if="columns[3].visible">
+				<template slot-scope="scope">
+					<span style="color:red">{{scope.row.transactionType==11 ? "-":"+"}} {{scope.row.transactionAmount}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="上期余额" align="center" prop="previousBalance" v-if="columns[4].visible" />
+			<el-table-column label="当前余额" align="center" prop="currentBalance" v-if="columns[5].visible" />
+			<el-table-column label="出库单号" align="center" prop="shipmentOrderId" v-if="columns[6].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible" />
+			<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="columns[9].visible">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsCustomerTransaction:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsCustomerTransaction:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改客户账户流水对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="交易编号" prop="transactionCode">
+					<el-input v-model="form.transactionCode" placeholder="请输入交易编号" />
+				</el-form-item>
+				<el-form-item label="用户编号" prop="customerId">
+					<el-input v-model="form.customerId" placeholder="请输入用户编号" />
+				</el-form-item>
+				<el-form-item label="交易类型" prop="transactionType">
+					<el-select v-model="form.transactionType" placeholder="请选择交易类型">
+						<el-option label="请选择字典生成" value="" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="交易金额" prop="transactionAmount">
+					<el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+				</el-form-item>
+				<el-form-item label="上期余额" prop="previousBalance">
+					<el-input v-model="form.previousBalance" placeholder="请输入上期余额" />
+				</el-form-item>
+				<el-form-item label="当前余额" prop="currentBalance">
+					<el-input v-model="form.currentBalance" placeholder="请输入当前余额" />
+				</el-form-item>
+				<el-form-item label="出库单号" prop="shipmentOrderId">
+					<el-input v-model="form.shipmentOrderId" placeholder="请输入出库单号" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsCustomerTransaction, getWmsCustomerTransaction, delWmsCustomerTransaction, addWmsCustomerTransaction, updateWmsCustomerTransaction, exportWmsCustomerTransaction } from "@/api/wms/customerTransaction";
+	import { mapGetters } from "vuex";
+
+	export default {
+		name: "WmsCustomerTransaction",
+		dicts: ["wms_customer_transaction_type"],
+		computed: {
+			...mapGetters(['customerMap']),
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 客户账户流水表格数据
+				wmsCustomerTransactionList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					transactionCode: null,
+					customerId: null,
+					transactionType: null,
+					transactionAmount: null,
+					previousBalance: null,
+					currentBalance: null,
+					shipmentOrderId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					transactionCode: [
+						{ required: true, message: "交易编号不能为空", trigger: "blur" }
+					],
+					customerId: [
+						{ required: true, message: "用户编号不能为空", trigger: "blur" }
+					],
+					transactionType: [
+						{ required: true, message: "交易类型  1：结款  2：应付 不能为空", trigger: "change" }
+					],
+					transactionAmount: [
+						{ required: true, message: "交易金额不能为空", trigger: "blur" }
+					],
+					previousBalance: [
+						{ required: true, message: "上期余额不能为空", trigger: "blur" }
+					],
+					currentBalance: [
+						{ required: true, message: "当前余额不能为空", trigger: "blur" }
+					],
+					createTime: [
+						{ required: true, message: "创建时间不能为空", trigger: "blur" }
+					],
+					updateTime: [
+						{ required: true, message: "更新时间不能为空", trigger: "blur" }
+					]
+				},
+				columns: [
+					{ key: 1, label: "交易编号", visible: true },
+					{ key: 2, label: "用户编号", visible: true },
+					{ key: 3, label: "交易类型", visible: true },
+					{ key: 4, label: "交易金额", visible: true },
+					{ key: 5, label: "上期余额", visible: true },
+					{ key: 6, label: "当前余额", visible: true },
+					{ key: 7, label: "出库单号", visible: false },
+					{ key: 8, label: "备注", visible: true },
+					{ key: 9, label: "创建时间", visible: true },
+					{ key: 10, label: "操作", visible: false },
+				],
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				customerId: null
+			};
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.customerId = id
+				this.getList(id)
+			}
+		},
+		methods: {
+			getCustomerName(row) {
+				return this.customerMap.get(Number(row.customerId))
+			},
+			/** 查询客户账户流水列表 */
+			getList() {
+				if (this.queryParams.Time) {
+					this.queryParams.startTime = this.queryParams.Time[0]
+					this.queryParams.endTime = this.queryParams.Time[1]
+				}
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, customerId: this.customerId };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsCustomerTransaction(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsCustomerTransactionList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					transactionCode: null,
+					customerId: null,
+					transactionType: null,
+					transactionAmount: null,
+					previousBalance: null,
+					currentBalance: null,
+					shipmentOrderId: null,
+					remark: null,
+					createTime: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加客户账户流水";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsCustomerTransaction(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改客户账户流水";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsCustomerTransaction(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsCustomerTransaction(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除客户账户流水编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsCustomerTransaction(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有客户账户流水数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsCustomerTransaction(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			},
+			handleChange(value) {
+				if (!value) {
+					this.queryParams.startTime = null;
+					this.queryParams.endTime = null;
+				}
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/delivery/index.vue b/src/views/wms/delivery/index.vue
new file mode 100644
index 0000000..d487933
--- /dev/null
+++ b/src/views/wms/delivery/index.vue
@@ -0,0 +1,268 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="出库单主表Id" prop="shipmentOrderId">
+				<el-input v-model.trim="queryParams.shipmentOrderId" placeholder="请输入出库单主表Id" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="承运商" prop="carrierId">
+
+				<WmsCarrierSelect v-model="queryParams.carrierId"></WmsCarrierSelect>
+
+			</el-form-item>
+			<el-form-item label="发货日期" prop="deliveryDate">
+				<el-date-picker clearable size="small" v-model="queryParams.deliveryDate" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择发货日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="快递单号" prop="trackingNo">
+				<el-input v-model.trim="queryParams.trackingNo" placeholder="请输入快递单号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsDeliveryList" @selection-change="handleSelectionChange">
+			<el-table-column label="出库单" align="center" prop="shipmentOrderId" v-if="columns[0].visible">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" @click.stop="handleView(scope.row)">{{ '查看出库单' }}
+					</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column label="承运商" align="center" prop="carrierId" :formatter="getCarrier" v-if="columns[1].visible" />
+			<el-table-column label="发货日期" align="center" prop="deliveryDate" width="180" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.deliveryDate, '') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="快递单号" align="center" prop="trackingNo" v-if="columns[3].visible">
+				<!--        https://www.kuaidi100.com/chaxun?com=[]&nu=[]-->
+				<template slot-scope="scope">
+					<a target="_blank" :href=" 'https://www.kuaidi100.com/chaxun?com='+getCarrier(scope.row)+'&nu='+scope.row.trackingNo">{{
+              scope.row.trackingNo
+            }}
+					</a>
+				</template>
+			</el-table-column>
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[4].visible" />
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改发货记录对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="出库单主表Id" prop="shipmentOrderId">
+					<el-input v-model="form.shipmentOrderId" placeholder="请输入出库单主表Id" />
+				</el-form-item>
+				<el-form-item label="承运商Id" prop="carrierId">
+					<el-input v-model="form.carrierId" placeholder="请输入承运商Id" />
+				</el-form-item>
+				<el-form-item label="发货日期" prop="deliveryDate">
+					<el-date-picker clearable size="small" v-model="form.deliveryDate" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择发货日期">
+					</el-date-picker>
+				</el-form-item>
+				1
+				<el-form-item label="快递单号" prop="trackingNo">
+					<el-input v-model="form.trackingNo" placeholder="请输入快递单号" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		addWmsDelivery,
+		delWmsDelivery,
+		exportWmsDelivery,
+		getWmsDelivery,
+		listWmsDelivery,
+		updateWmsDelivery
+	} from "@/api/wms/delivery";
+	import { mapGetters } from "vuex";
+
+	export default {
+		name: "WmsDelivery",
+		computed: {
+			...mapGetters(['carrierMap']),
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 发货记录表格数据
+				wmsDeliveryList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					shipmentOrderId: null,
+					carrierId: null,
+					deliveryDate: null,
+					trackingNo: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "出库单主表Id", visible: true },
+					{ key: 2, label: "承运商Id", visible: true },
+					{ key: 3, label: "发货日期", visible: true },
+					{ key: 4, label: "快递单号", visible: true },
+					{ key: 5, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+			// this.$message.warning('该功能正在开发中...')
+		},
+		methods: {
+			//查看出库单
+			handleView(row) {
+				const id = row.shipmentOrderId
+				this.$router.push({ path: '/wms/shipmentOrder/status', query: { id } })
+			},
+			// 格式化承运商
+			getCarrier(row, column) {
+				return this.carrierMap.get(row.carrierId)
+			},
+			/** 查询发货记录列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsDelivery(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsDeliveryList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					shipmentOrderId: null,
+					carrierId: null,
+					deliveryDate: null,
+					trackingNo: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加发货记录";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsDelivery(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改发货记录";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsDelivery(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsDelivery(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除发货记录编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsDelivery(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有发货记录数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsDelivery(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/component/MergeTable.vue b/src/views/wms/inventory/component/MergeTable.vue
new file mode 100644
index 0000000..9377b4c
--- /dev/null
+++ b/src/views/wms/inventory/component/MergeTable.vue
@@ -0,0 +1,81 @@
+<template>
+	<el-table v-bind="$props" :data="processData" :span-method="objectSpanMethod" border>
+		<slot />
+	</el-table>
+</template>
+
+<script>
+	export default {
+		name: 'MergeTable',
+		props: {
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			mergeArr: { // 表格中需要合并的列名
+				type: Array,
+				default: () => []
+			}
+		},
+		data() {
+			return {
+				mergeObj: {}, // 用来记录需要合并行的下标
+			}
+		},
+		computed: {
+			processData() {
+				// 在data发生变化时执行的操作
+				this.getSpanArr(this.tableData)
+				return this.tableData
+			}
+		},
+		methods: {
+			// objectSpanMethod方法
+			// 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
+			objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+				// 判断列的属性
+				if (this.mergeArr.indexOf(column.property) !== -1) {
+					// 判断其值是不是为0
+					if (this.mergeObj[column.property][rowIndex]) {
+						return [this.mergeObj[column.property][rowIndex], 1]
+					} else {
+						// 如果为0则为需要合并的行
+						return [0, 0];
+					}
+				}
+			},
+			// getSpanArr方法
+			getSpanArr(data) {
+				this.mergeArr.forEach((key, index1) => {
+					let count = 0;
+					this.mergeObj[key] = [];
+					data.forEach((item, index) => {
+						if (index === 0) {
+							// 第一行始终为新组
+							this.mergeObj[key].push(1);
+						} else {
+							let valid = true;
+							// 逐步判断当前行的特定属性与前一行的对应属性是否相等
+							for (let i = 0; i <= index1; i++) {
+								const mergeKey = this.mergeArr[i];
+								if (item[mergeKey] !== data[index - 1][mergeKey]) {
+									valid = false;
+									break;
+								}
+							}
+							if (valid) {
+								// 所有属性值都相等，执行合并操作
+								this.mergeObj[key][count] += 1;
+								this.mergeObj[key].push(0);
+							} else {
+								// 任何一个属性不相等，不执行合并操作，创建新组
+								count = index;
+								this.mergeObj[key].push(1);
+							}
+						}
+					});
+				});
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/component/PanelByArea.vue b/src/views/wms/inventory/component/PanelByArea.vue
new file mode 100644
index 0000000..81b44a5
--- /dev/null
+++ b/src/views/wms/inventory/component/PanelByArea.vue
@@ -0,0 +1,37 @@
+<template>
+	<merge-table :table-data="tableData" :merge-arr="mergeArr">
+		<el-table-column prop="warehouseName" label="仓库"></el-table-column>
+		<el-table-column prop="areaName" label="库区"></el-table-column>
+
+		<el-table-column prop="itemTypeName" label="物料类型">
+		</el-table-column>
+		<el-table-column prop="itemNo" label="物料编码"></el-table-column>
+		<el-table-column prop="itemName" label="物料名称"></el-table-column>
+
+		<el-table-column prop="quantity" label="库存"></el-table-column>
+	</merge-table>
+</template>
+
+<script>
+	import MergeTable from "@/views/wms/inventory/component/MergeTable.vue";
+
+	export default {
+		name: 'PanelByArea',
+		components: { MergeTable },
+		props: {
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			// loading: {
+			//   type: Boolean,
+			//   default: false
+			// }
+		},
+		data() {
+			return {
+				mergeArr: ['warehouseName', 'areaName', 'itemTypeName'], // 表格中的列名
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/component/PanelByItem.vue b/src/views/wms/inventory/component/PanelByItem.vue
new file mode 100644
index 0000000..29e41dc
--- /dev/null
+++ b/src/views/wms/inventory/component/PanelByItem.vue
@@ -0,0 +1,60 @@
+<template>
+	<merge-table :table-data="tableData" :merge-arr="['itemNo']">
+		<el-table-column prop="itemNo" label="物料信息">
+			<template v-slot="{ row }">
+				<el-row>
+					<el-col :span="12">
+						<span>名称：{{ row.itemName }}</span>
+					</el-col>
+					<el-col :span="12">
+						<span>编码：{{ row.itemNo }}</span>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<span>类型：{{ row.itemTypeName }}</span>
+					</el-col>
+					<el-col :span="12" v-if="row.itemDelFlag">
+						<el-popconfirm placement="top-start" icon="el-icon-info" icon-color="red" width="200" trigger="hover" @confirm="deleteItem(row)" title="该物料已经被逻辑删除，是否清除库存记录？">
+							<a slot="reference" class="el-icon-question red">删除</a>
+						</el-popconfirm>
+					</el-col>
+				</el-row>
+
+			</template>
+		</el-table-column>
+		<el-table-column prop="warehouseName" label="仓库/库区"></el-table-column>
+		<el-table-column prop="quantity" label="库存"></el-table-column>
+	</merge-table>
+</template>
+
+<script>
+	import MergeTable from "@/views/wms/inventory/component/MergeTable.vue";
+	import { delWmsInventoryByItem } from "@/api/wms/inventory";
+
+	export default {
+		name: 'PanelByItem',
+		components: { MergeTable },
+		props: {
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			// loading: {
+			//   type: Boolean,
+			//   default: false
+			// }
+		},
+		methods: {
+			deleteItem(row) {
+				delWmsInventoryByItem(row.itemId).then(res => {
+					this.$message({
+						message: '删除成功',
+						type: 'success'
+					});
+					this.$emit('update', row)
+				})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/component/PanelByItemType.vue b/src/views/wms/inventory/component/PanelByItemType.vue
new file mode 100644
index 0000000..f8dd2b3
--- /dev/null
+++ b/src/views/wms/inventory/component/PanelByItemType.vue
@@ -0,0 +1,55 @@
+<template>
+	<merge-table :table-data="tableData" :merge-arr="mergeArr">
+		<el-table-column prop="itemTypeName" label="物料类型">
+		</el-table-column>
+		<el-table-column prop="itemNo" label="物料编码"></el-table-column>
+		<el-table-column prop="itemName" label="物料名称">
+			<template v-slot="{ row }">
+				<span>{{ row.itemName }}</span>
+
+				<el-popconfirm v-if="row.itemDelFlag" placement="top-start" icon="el-icon-info" icon-color="red" width="200" class="ml10" trigger="hover" @confirm="deleteItem(row)" title="该物料已经被逻辑删除，是否清除库存记录？">
+					<a slot="reference" class="el-icon-question red">删除</a>
+				</el-popconfirm>
+
+			</template>
+		</el-table-column>
+		<el-table-column prop="warehouseName" label="仓库/库区"></el-table-column>
+		<el-table-column prop="quantity" label="库存"></el-table-column>
+	</merge-table>
+</template>
+
+<script>
+	import MergeTable from "@/views/wms/inventory/component/MergeTable.vue";
+	import { delWmsInventoryByItem } from "@/api/wms/inventory";
+
+	export default {
+		name: 'PanelByItemType',
+		components: { MergeTable },
+		props: {
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			// loading: {
+			//   type: Boolean,
+			//   default: false
+			// }
+		},
+		data() {
+			return {
+				mergeArr: ['itemTypeName', 'itemNo', 'itemName'], // 表格中的列名
+			}
+		},
+		methods: {
+			deleteItem(row) {
+				delWmsInventoryByItem(row.itemId).then(res => {
+					this.$message({
+						message: '删除成功',
+						type: 'success'
+					});
+					this.$emit('update', row)
+				})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/component/PanelByWarehouse.vue b/src/views/wms/inventory/component/PanelByWarehouse.vue
new file mode 100644
index 0000000..1dd6f56
--- /dev/null
+++ b/src/views/wms/inventory/component/PanelByWarehouse.vue
@@ -0,0 +1,65 @@
+<template>
+	<merge-table :table-data="tableData" :merge-arr="mergeArr">
+		<el-table-column prop="warehouseName" label="仓库/库区">
+			<template v-slot="{ row }">
+				<span>{{ row.warehouseName }}</span>
+				<el-popover v-if="!row.warehouseId" placement="top-start" title="提示" width="200" trigger="hover" content="该物料未分配仓库/库区。">
+					<a slot="reference" class="el-icon-question blue" @click="allocationItem(row)">分配</a>
+				</el-popover>
+				<el-popconfirm v-if="row.warehouseDelFlag == 1" placement="top-start" icon="el-icon-info" icon-color="red" width="200" trigger="hover" @confirm="deleteItem(row)" title="该仓库已经被逻辑删除,是否清除库存记录？">
+					<a slot="reference" class="el-icon-question red">删除</a>
+				</el-popconfirm>
+			</template>
+		</el-table-column>
+
+		<el-table-column prop="itemTypeName" label="物料类型">
+		</el-table-column>
+		<el-table-column prop="itemNo" label="物料编码"></el-table-column>
+		<el-table-column prop="itemName" label="物料名称"></el-table-column>
+
+		<el-table-column prop="quantity" label="库存"></el-table-column>
+	</merge-table>
+</template>
+
+<script>
+	import MergeTable from "@/views/wms/inventory/component/MergeTable.vue";
+	import { delWmsInventoryByWarehouse } from "@/api/wms/inventory";
+
+	export default {
+		name: 'PanelByWarehouse',
+		components: { MergeTable },
+		props: {
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			// loading: {
+			//   type: Boolean,
+			//   default: false
+			// }
+		},
+		data() {
+			return {
+				mergeArr: ['warehouseName', 'itemTypeName'], // 表格中的列名
+			}
+		},
+		methods: {
+			deleteItem(row) {
+				delWmsInventoryByWarehouse(row.warehouseId).then(res => {
+					this.$message({
+						message: '删除成功',
+						type: 'success'
+					});
+					this.$emit('update', row)
+				})
+			},
+			allocationItem(row) {
+				console.log('该物料未分配仓库/库区。', row)
+				this.$message({
+					message: '该功能暂未开放',
+					type: 'warning'
+				});
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventory/index.vue b/src/views/wms/inventory/index.vue
new file mode 100644
index 0000000..db437fe
--- /dev/null
+++ b/src/views/wms/inventory/index.vue
@@ -0,0 +1,193 @@
+<template>
+	<div class="app-container">
+		<el-form class="ry_form" v-show="showSearch" :inline="true" label-width="100px" :model="queryParams" ref="queryForm" size="medium">
+			<el-form-item label="类型" prop="panelType">
+				<DictRadio v-model="queryParams.panelType" :radioData="dict.type.wms_inventory_panel_type" size="small" @change="handleQuery"></DictRadio>
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<item-select v-model="queryParams.itemId"></item-select>
+			</el-form-item>
+			<el-form-item label="仓库" prop="rackId">
+				<wms-warehouse-cascader v-model="queryParams.place"></wms-warehouse-cascader>
+			</el-form-item>
+			<el-form-item label="库存" prop="quantity">
+				<number-range v-model="queryParams.quantityRange"></number-range>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<el-row class="mb8" :gutter="10">
+			<!--      <el-col :span="1.5">-->
+			<!--        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"-->
+			<!--                   @click="handleExport"-->
+			<!--                   v-hasPermi="['wms:item:export']">导出-->
+			<!--        </el-button>-->
+			<!--      </el-col>-->
+			<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+		<component :is="currentComponent" v-loading="loading" @update="getList" :table-data="wmsInventoryList"></component>
+		<pagination v-show="total&gt;0" :limit.sync="pageReq.size" :page.sync="pageReq.page" :total="total" @pagination="getList"></pagination>
+
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsInventory,
+		exportWmsInventory
+	} from '@/api/wms/inventory'
+	import NumberRange from '@/components/NumberRange'
+	import ItemSelect from '@/components/ItemSelect'
+	import PanelByItem from "@/views/wms/inventory/component/PanelByItem.vue";
+	import PanelByItemType from "@/views/wms/inventory/component/PanelByItemType.vue";
+	import PanelByWarehouse from "@/views/wms/inventory/component/PanelByWarehouse.vue";
+	import PanelByArea from "@/views/wms/inventory/component/PanelByArea.vue";
+	import { mapGetters } from 'vuex'
+
+	export default {
+		name: 'WmsInventory',
+		components: { PanelByArea, PanelByWarehouse, PanelByItemType, PanelByItem, ItemSelect, NumberRange },
+		dicts: ['wms_inventory_panel_type'],
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存表格数据
+				wmsInventoryList: [],
+				// 查询参数
+				queryParams: {
+					itemId: null,
+					place: null,
+					quantityRange: [],
+					panelType: 5
+				},
+				pageReq: {
+					page: 1,
+					size: 10
+				},
+				// 表单参数
+				form: {},
+				columns: false,
+				panelType: 5
+			}
+		},
+		async created() {
+		},
+		computed: {
+			...mapGetters(['userId']),
+			currentComponent() {
+				let type = parseInt(this.panelType)
+				switch (type) {
+				case 5:
+					return 'panel-by-warehouse';
+				case 10:
+					return 'panel-by-area';
+				case 20:
+					return 'panel-by-item-type';
+				default:
+					return '';
+				}
+			}
+		},
+		methods: {
+			/** 查询库存列表 */
+			getList() {
+				this.loading = true
+				const { place, quantityRange, itemId, panelType } = this.queryParams;
+				this.panelType = panelType;
+				const [warehouseId, areaId, rackId] = place || [];
+				const [quantityStart, quantityEnd] = quantityRange || [];
+				const query = { warehouseId, areaId, rackId, itemId, quantityStart, quantityEnd, panelType }
+				const pageReq = { ...this.pageReq }
+				pageReq.page -= 1;
+				listWmsInventory(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryList = content
+
+					if (panelType == 5 || panelType == 20) {
+						// 10 库区需要考虑库区是否为空
+						content.forEach(item => {
+							if (!item.warehouseName) {
+								item.warehouseName = "暂未分配仓库"
+							}
+							if (item.areaName) {
+								item.warehouseName = item.warehouseName + '/' + item.areaName
+							}
+						})
+					} else if (panelType == 10) {
+						// 库区
+						content.forEach(item => {
+							if (!item.warehouseName) {
+								item.warehouseName = "暂未分配仓库"
+							}
+							if (!item.areaName) {
+								item.areaName = "暂未分配库区"
+							}
+						})
+
+					}
+					this.total = totalElements
+					this.loading = false
+				})
+			},
+
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					itemId: null,
+					rackId: null,
+					quantity: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				}
+				this.resetForm('form')
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.pageReq.page = 1
+				this.getList()
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm('queryForm')
+				this.handleQuery()
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams
+				this.$modal.confirm('是否确认导出所有库存数据项？').then(() => {
+					this.exportLoading = true
+					return exportWmsInventory(queryParams)
+				}).then(response => {
+					this.$download.download(response)
+					this.exportLoading = false
+				}).catch(() => {})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryCheck/edit.vue b/src/views/wms/inventoryCheck/edit.vue
new file mode 100644
index 0000000..e8965d8
--- /dev/null
+++ b/src/views/wms/inventoryCheck/edit.vue
@@ -0,0 +1,384 @@
+<template>
+	<div class="receipt-order-edit-wrapper app-container">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="盘点单" prop="inventoryCheckNo">
+					<el-input class="w200" v-model="form.inventoryCheckNo" placeholder="盘点单" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="盘点仓库" prop="supplierId">
+					<wms-warehouse-cascader v-model="form.place" size="small"></wms-warehouse-cascader>
+				</el-form-item>
+				<el-form-item label="盈亏数" prop="inventoryCheckTotal">
+					<el-input-number v-model="inventoryCheckTotal" :precision="2" disabled></el-input-number>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="备注...100个字符以内" rows="3" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+				</el-form-item>
+				<el-form-item label="附件" prop="attachment">
+					<file-upload v-model="form.attachment" :file-type="types"></file-upload>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">物料明细</div>
+				<div class="ops">
+					<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+				</div>
+			</div>
+			<div class="table">
+				<table class="common-table">
+					<tr>
+						<th>物料编号</th>
+						<th>物料名</th>
+						<th>仓库/库区</th>
+						<th>账面库存</th>
+						<th>实际库存</th>
+						<th>变化量</th>
+						<th>操作</th>
+					</tr>
+					<tr v-for="(it, index) in form.details">
+						<td align="center">{{ it.prod.itemNo }}</td>
+						<td align="center">{{ it.prod.itemName }}</td>
+						<td align="center">
+							<WmsWarehouseCascader :disabled="!it.isNew" v-model="it.place" size="small"></WmsWarehouseCascader>
+						</td>
+						<td align="center">
+							{{ it.quantity }}
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.checkQuantity" :precision="2" :min="0" label="请输入实际库存"></el-input-number>
+						</td>
+						<td align="center">
+							{{ it.checkQuantity - it.quantity }}
+						</td>
+						<td align="center">
+							<a class="blue" @click="showRemarkItem(it)">说明</a>&nbsp;
+							<a class="red" @click="form.details.splice(index, 1)">删除</a>
+						</td>
+					</tr>
+				</table>
+				<!-- <el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty> -->
+			</div>
+			<div class="tc mt16">
+				<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm(11)" type="primary">暂存</el-button>
+				<el-button @click="submitFinishForm" type="success">盘库结束</el-button>
+			</div>
+		</div>
+		<el-dialog :visible="modalObj.show" :title="modalObj.title" :width="modalObj.width" @close="modalObj.cancel">
+			<template v-if="modalObj.component === 'add-item'">
+				<item-select ref="item-select" :data="this.form.details"></item-select>
+			</template>
+			<span slot="footer">
+				<el-button v-if="modalObj.cancel" @click="modalObj.cancel">取消</el-button>
+				<el-button v-if="modalObj.ok" type="primary" @click="modalObj.ok">确认</el-button>
+			</span>
+		</el-dialog>
+		<el-dialog :visible="remarkModalObj.show" :title="remarkModalObj.title" :width="remarkModalObj.width" @close="remarkModalObj.cancel">
+			<template v-if="remarkModalObj.component === 'remark-item'">
+				<el-input v-model="remarkModalObj.content" placeholder="说明...100个字符以内" rows="4" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+			</template>
+			<template v-slot:footer>
+				<el-button v-if="remarkModalObj.cancel" @click="remarkModalObj.cancel">取消</el-button>
+				<el-button v-if="remarkModalObj.ok" type="primary" @click="remarkModalObj.ok">确认</el-button>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { randomId } from '@/utils/RandomUtils'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import { listWmsInventory } from "@/api/wms/inventory";
+	import { addOrUpdateWmsInventoryCheck, getWmsInventoryCheck } from "@/api/wms/inventoryCheck";
+	import { Message } from "element-ui";
+
+
+	export default {
+		name: 'WmsInventoryCheck',
+		components: { ItemSelect },
+		data() {
+			return {
+				types: ['png', 'jpg', 'jpeg'],
+				// 表单参数
+				form: {
+					details: []
+				},
+				// 表单校验
+				rules: {},
+				modalObj: {
+					show: false,
+					title: '',
+					width: '50%',
+					component: null,
+					model: {},
+					ok: () => {},
+					cancel: () => {}
+				},
+				//添加说明对话框
+				remarkModalObj: {
+					show: false,
+					title: '',
+					width: '50%',
+					component: null,
+					model: {},
+					content: '',
+					ok: () => {},
+					cancel: () => {}
+				}
+			}
+		},
+		computed: {
+			inventoryCheckTotal: {
+				get() {
+					let sum = 0;
+					this.form.details.map(item => {
+						if (!isNaN(parseFloat(item.checkQuantity))) {
+							sum += (item.checkQuantity - item.quantity)
+						}
+						return item.checkQuantity
+					})
+					return sum
+				},
+				set(value) {}
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.reset()
+			}
+		},
+		methods: {
+			/** 取消按钮 */
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/inventoryCheck' })
+			},
+			/** 提交按钮 */
+			submitFinishForm() {
+				//盘库结束22
+				this.submitForm(22)
+			},
+			submitForm(inventoryCheckStatus = 11) {
+				if (inventoryCheckStatus === 22 && this.form.details.length === 0) {
+					//未添加物料
+					Message({
+						message: "您还未开始盘库！",
+						type: 'error'
+					})
+					return false;
+				}
+				this.$refs['form'].validate(valid => {
+					if (!valid) {
+						return
+					}
+					this.form.inventoryCheckStatus = inventoryCheckStatus
+					this.form.inventoryCheckTotal = this.inventoryCheckTotal
+
+					const details = this.form.details.map(it => {
+						if (it.place) {
+							it.warehouseId = it.place[0]
+							it.areaId = it.place[1]
+							it.rackId = it.place[2]
+						} else {
+							it.warehouseId = null
+							it.areaId = null
+							it.rackId = null
+						}
+						return {
+							itemId: it.itemId,
+							rackId: it.rackId,
+							areaId: it.areaId,
+							warehouseId: it.warehouseId,
+							quantity: it.quantity,
+							checkQuantity: it.checkQuantity,
+							delFlag: 0,
+							remark: it.remark
+						}
+					})
+
+					const req = { ...this.form, details }
+
+
+					addOrUpdateWmsInventoryCheck(req).then(response => {
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel();
+					})
+				})
+			},
+			/** 加载 盘点单详情 */
+			loadDetail(id) {
+				getWmsInventoryCheck(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					});
+					details && details.forEach(it => it.prod = map[it.itemId])
+					this.form = {
+						...response,
+						details
+					}
+				})
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryCheckNo: 'IV-' + randomId(),
+					receiptOrderType: 1,
+					supplierId: null,
+					orderNo: null,
+					receiptOrderStatus: 0,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					attachment: null,
+					details: []
+				}
+				this.resetForm('form')
+			},
+			/** 物料选择框 */
+			confirmSelectItem() {
+				const value = this.$refs['item-select'].getRightList()
+
+				// 当前选中物料ids
+				this.prodIds = value.map(it => it.id)
+
+				// 当前盘点仓库
+				const { place } = this.form
+
+
+				const [warehouseId, areaId, rackId] = place || [];
+				this.form.warehouseId = warehouseId
+				this.form.areaId = areaId
+				this.form.rackId = rackId
+
+				let hasInventoryIds = new Set()
+				//获取该仓库下物料ids的库存
+				const query = { warehouseId, areaId, rackId }
+				listWmsInventory(query, null).then(response => {
+					const { content, totalElements } = response
+					let wmsInventoryMap = content.filter(it => {
+						if (this.prodIds.indexOf(it.itemId) > -1) {
+							hasInventoryIds.add(it.itemId)
+							return true;
+						}
+						return false;
+					})
+
+
+					//无库存
+					this.form.details = value.filter(it => {
+						return !hasInventoryIds.has(it.id)
+					}).map(it => {
+						let place = [this.form.warehouseId]
+						if (this.form.areaId) {
+							place.push(this.form.areaId)
+						}
+						return {
+							isNew: true,
+							prod: {
+								itemName: it.itemName,
+								itemNo: it.itemNo,
+							},
+							itemId: it.id,
+							rackId: this.form.rackId,
+							areaId: this.form.areaId,
+							place: place,
+							warehouseId: this.form.warehouseId,
+							quantity: 0.00,
+							checkQuantity: 0.00,
+							receiptOrderStatus: 0,
+							delFlag: 0,
+							remark: null
+						}
+					})
+
+					//有库存
+					this.form.details.push(...
+						wmsInventoryMap.map(it => {
+							let place = [it.warehouseId]
+							if (it.areaId) {
+								place.push(it.areaId)
+							}
+							return {
+								isNew: false,
+								prod: {
+									itemName: it.itemName,
+									itemNo: it.itemNo,
+								},
+								itemId: it.itemId,
+								rackId: it.rackId,
+								areaId: it.areaId,
+								place: place,
+								warehouseId: it.warehouseId,
+								quantity: it.quantity,
+								checkQuantity: it.quantity,
+								receiptOrderStatus: 0,
+								delFlag: 0,
+								remark: it.remark
+							}
+						})
+					)
+				})
+
+				this.closeModal()
+			},
+			closeModal() {
+				this.modalObj.show = false
+				this.remarkModalObj.show = false
+			},
+			showAddItem() {
+				try {
+					this.$refs['item-select'].initDetailsList(this.form.details)
+				} catch (err) {
+
+				}
+				const ok = () => this.confirmSelectItem()
+				const cancel = () => this.closeModal()
+				this.modalObj = {
+					show: true,
+					title: '添加物料',
+					width: '50%',
+					component: 'add-item',
+					model: {},
+					ok,
+					cancel
+				}
+			},
+			showRemarkItem(it) {
+				const ok = () => this.confirmAddRemark(it)
+				const cancel = () => this.closeModal()
+				this.remarkModalObj = {
+					show: true,
+					title: '添加说明',
+					width: '40%',
+					component: 'remark-item',
+					content: it.remark,
+					model: {},
+					ok,
+					cancel
+				}
+			},
+			confirmAddRemark(it) {
+				it.remark = this.remarkModalObj.content
+				this.closeModal()
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.receipt-order-edit-wrapper
+  .receipt-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryCheck/index.vue b/src/views/wms/inventoryCheck/index.vue
new file mode 100644
index 0000000..cb72fe6
--- /dev/null
+++ b/src/views/wms/inventoryCheck/index.vue
@@ -0,0 +1,287 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="库存盘点单号" prop="inventoryCheckNo">
+				<el-input v-model="queryParams.inventoryCheckNo" placeholder="请输入库存盘点单号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="盘点状态" prop="inventoryCheckStatus">
+
+				<DictRadio v-model="queryParams.inventoryCheckStatus" @change="handleQuery" size="small" :radioData="dict.type.wms_check_status" :showAll="'all'" />
+
+			</el-form-item>
+
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<wms-warehouse-cascader v-model="queryParams.warehouseArr" size="small"></wms-warehouse-cascader>
+			</el-form-item>
+
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? '收起条件' : '展开条件' }}
+				</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:inventoryCheck:add']">新增盘点单
+				</el-button>
+			</el-col>
+
+			<!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['wms:inventoryCheck:export']"
+        >导出
+        </el-button>
+      </el-col> -->
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventoryCheckList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="库存盘点单号" align="center" prop="inventoryCheckNo" v-if="columns[0].visible" />
+			<!--      <el-table-column label="库存盘点类型" align="center" prop="inventoryCheckType" v-if="columns[1].visible"/>-->
+
+			<el-table-column label="盈亏数" align="center" prop="inventoryCheckTotal" v-if="columns[3].visible" />
+			<!--      <el-table-column label="审核状态" align="center" prop="checkStatus" v-if="columns[4].visible"/>
+            <el-table-column label="审核人" align="center" prop="checkUserId" v-if="columns[5].visible"/>
+            <el-table-column label="审核时间" align="center" prop="checkTime" width="180" v-if="columns[6].visible">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.checkTime, '') }}</span>
+              </template>
+            </el-table-column>-->
+			<!--      <el-table-column label="所属仓库" align="center" prop="warehouseId" v-if="columns[7].visible"/>
+            <el-table-column label="所属库区" align="center" prop="areaId" v-if="columns[8].visible"/>-->
+			<el-table-column label="所属仓库" align="center" prop="rackId" v-if="columns[4].visible">
+				<template v-slot="{ row }"><span>{{ row.warehouseName }}</span><span v-if="row.areaName">/{{ row.areaName }}</span><span v-if="row.rackName">/{{ row.rackName }}</span></template>
+			</el-table-column>
+			<el-table-column label="库存盘点单状态" align="center" prop="inventoryCheckStatus" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_check_status" :value="scope.row.inventoryCheckStatus" />
+				</template>
+
+			</el-table-column>
+
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)" v-hasPermi="['wms:inventoryCheck:edit']">查看
+					</el-button>
+					<el-button size="mini" type="text" v-if="scope.row.inventoryCheckStatus == '11'" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:inventoryCheck:edit']">继续盘点
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.inventoryCheckStatus == '11'" @click="handleDelete(scope.row)" v-hasPermi="['wms:inventoryCheck:remove']">删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+	</div>
+</template>
+
+<script>
+	import {
+		addWmsInventoryCheck,
+		delWmsInventoryCheck,
+		exportWmsInventoryCheck,
+		listWmsInventoryCheck,
+		updateWmsInventoryCheck
+	} from "@/api/wms/inventoryCheck";
+	import { randomId } from "@/utils/RandomUtils";
+	import { mapGetters } from 'vuex'
+
+	export default {
+		name: "WmsInventoryCheck",
+		dicts: ["wms_check_status"],
+		computed: {
+			...mapGetters(['userId', 'warehouseMap', 'areaMap']),
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存盘点单据表格数据
+				wmsInventoryCheckList: [],
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					inventoryCheckNo: null,
+					inventoryCheckType: null,
+					inventoryCheckStatus: null,
+					inventoryCheckTotal: null,
+					checkStatus: null,
+					checkUserId: null,
+					checkTime: null,
+					warehouseId: null,
+					areaId: null,
+					rackId: null,
+					attachment: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "库存盘点单号，系统自动生成", visible: true },
+					{ key: 2, label: "库存盘点类型", visible: true },
+					{ key: 3, label: "库存盘点单状态", visible: true },
+					{ key: 4, label: "盈亏数", visible: true },
+					{ key: 5, label: "审核状态", visible: true },
+					{ key: 6, label: "审核人", visible: true },
+					{ key: 7, label: "审核时间", visible: true },
+					{ key: 8, label: "所属仓库", visible: true },
+					{ key: 9, label: "所属库区", visible: true },
+					{ key: 10, label: "货架", visible: false },
+					{ key: 11, label: "附件文件", visible: false },
+					{ key: 12, label: "备注", visible: false },
+				],
+				showMoreCondition: false
+			};
+		},
+		async created() {
+
+		},
+		methods: {
+			/** 查询库存盘点单据列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize, warehouseArr } = this.queryParams;
+				const [warehouseId, areaId, rackId] = warehouseArr || [];
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, warehouseId, areaId, rackId };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventoryCheck(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryCheckList = content;
+					this.wmsInventoryCheckList.forEach(it => {
+						it.warehouseName = this.warehouseMap.get(it.warehouseId)
+						it.areaName = this.areaMap.get(it.areaId)
+					})
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryCheckNo: 'IV-' + randomId(),
+					inventoryCheckType: null,
+					inventoryCheckStatus: 0,
+					inventoryCheckTotal: null,
+					checkStatus: 0,
+					checkUserId: null,
+					checkTime: null,
+					warehouseId: null,
+					areaId: null,
+					rackId: null,
+					attachment: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.$router.push({ path: '/check/edit' })
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/check/edit', query: { id } })
+			},
+			/** 查看按钮操作 */
+			handleView(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/check/status', query: { id } })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						const { warehouseArr } = this.form
+						const [warehouseId, areaId, rackId] = warehouseArr || [];
+						this.form.warehouseId = warehouseId
+						this.form.areaId = areaId
+						this.form.rackId = rackId
+
+						if (this.form.id != null) {
+							updateWmsInventoryCheck(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsInventoryCheck(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除库存盘点单据编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsInventoryCheck(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存盘点单据数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventoryCheck(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryCheck/status-stylus.txt b/src/views/wms/inventoryCheck/status-stylus.txt
new file mode 100644
index 0000000..ba6c204
--- /dev/null
+++ b/src/views/wms/inventoryCheck/status-stylus.txt
@@ -0,0 +1,23 @@
+<style lang="stylus">
+	.receipt-order-edit-wrapper .receipt-order-content width 70% min-width 900px margin 0 auto .wrap width 100px text-overflow ellipsis white-space nowrap overflow hidden .popperOptions[x-placement^=left] .popper__arrow::after {
+		border-left-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=right] .popper__arrow::after {
+		border-right-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=bottom] .popper__arrow::after {
+		border-bottom-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=top] .popper__arrow::after {
+		border-top-color: #565D6B;
+	}
+
+	.popperOptions {
+		background-color: #565D6B;
+		color: #FFFFFF;
+		border: #565D6B;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryCheck/status.vue b/src/views/wms/inventoryCheck/status.vue
new file mode 100644
index 0000000..d5c6d4b
--- /dev/null
+++ b/src/views/wms/inventoryCheck/status.vue
@@ -0,0 +1,178 @@
+<template>
+	<div class="receipt-order-edit-wrapper app-container">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="盘点单" prop="inventoryCheckNo">
+					<el-input class="w200" v-model="form.inventoryCheckNo" placeholder="盘点单" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="盘点仓库" prop="supplierId">
+					<wms-warehouse-cascader disabled v-model="form.place" size="small"></wms-warehouse-cascader>
+				</el-form-item>
+				<el-form-item label="盈亏数" prop="inventoryCheckTotal">
+					<el-input-number v-model="inventoryCheckTotal" :precision="2" disabled></el-input-number>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					{{ form.remark }}
+				</el-form-item>
+				<el-form-item label="附件" prop="attachment">
+					<file-upload v-model="form.attachment" :file-type="types"></file-upload>
+				</el-form-item>
+
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">物料明细</div>
+
+			</div>
+			<div class="table">
+				<table class="common-table">
+					<tr>
+						<th>物料编号</th>
+						<th>物料名</th>
+						<th>仓库/库区</th>
+						<th>账面库存</th>
+						<th>实际库存</th>
+						<th>变化量</th>
+						<th>说明</th>
+					</tr>
+					<tr v-for="(it, index) in form.details">
+						<td align="center">{{ it.prod.itemNo }}</td>
+						<td align="center">{{ it.prod.itemName }}</td>
+						<td align="center">
+							<WmsWarehouseCascader disabled v-model="it.place" size="small"></WmsWarehouseCascader>
+						</td>
+						<td align="center">
+							{{ it.quantity }}
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.checkQuantity" :precision="2" :min="0" disabled label="请输入实际库存"></el-input-number>
+						</td>
+						<td align="center">
+							{{ it.checkQuantity - it.quantity }}
+						</td>
+						<td align="center">
+							<el-popover placement="left" width="300" trigger="hover" :content="it.remark" popper-class="popperOptions">
+								<div class="wrap" slot="reference">
+									{{ it.remark }}
+								</div>
+							</el-popover>
+						</td>
+					</tr>
+				</table>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel" type="primary">返回</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import { randomId } from '@/utils/RandomUtils'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import { getWmsInventoryCheck } from "@/api/wms/inventoryCheck";
+
+
+	export default {
+		name: 'WmsInventoryCheck',
+		components: { ItemSelect },
+		data() {
+			return {
+				types: ['png', 'jpg', 'jpeg'],
+				// 表单参数
+				form: {
+					details: []
+				},
+				// 表单校验
+				rules: {}
+			}
+		},
+		computed: {
+			inventoryCheckTotal: {
+				get() {
+					let sum = 0;
+					this.form.details.map(item => {
+						if (!isNaN(parseFloat(item.checkQuantity))) {
+							sum += (item.checkQuantity - item.quantity)
+						}
+						return item.checkQuantity
+					})
+					return sum
+				},
+				set(value) {}
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.reset()
+			}
+		},
+		methods: {
+			/** 取消按钮 */
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/inventoryCheck' })
+			},
+			/** 加载 盘点单详情 */
+			loadDetail(id) {
+				getWmsInventoryCheck(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					});
+					details && details.forEach(it => it.prod = map[it.itemId])
+					this.form = {
+						...response,
+						details
+					}
+				})
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryCheckNo: 'IV-' + randomId(),
+					receiptOrderType: 1,
+					supplierId: null,
+					orderNo: null,
+					receiptOrderStatus: 0,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					attachment: null,
+					details: []
+				}
+				this.resetForm('form')
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+	.receipt-order-edit-wrapper .receipt-order-content width 70% min-width 900px margin 0 auto .wrap width 100px text-overflow ellipsis white-space nowrap overflow hidden .popperOptions[x-placement^=left] .popper__arrow::after {
+		border-left-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=right] .popper__arrow::after {
+		border-right-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=bottom] .popper__arrow::after {
+		border-bottom-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=top] .popper__arrow::after {
+		border-top-color: #565D6B;
+	}
+
+	.popperOptions {
+		background-color: #565D6B;
+		color: #FFFFFF;
+		border: #565D6B;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryCheckDetail/index.vue b/src/views/wms/inventoryCheckDetail/index.vue
new file mode 100644
index 0000000..a83883f
--- /dev/null
+++ b/src/views/wms/inventoryCheckDetail/index.vue
@@ -0,0 +1,274 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="库存盘点单" prop="inventoryCheckId">
+				<el-input v-model="queryParams.inventoryCheckId" placeholder="请输入库存盘点单" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<el-input v-model="queryParams.itemId" placeholder="请输入物料" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="库存数量" prop="quantity">
+				<el-input v-model="queryParams.quantity" placeholder="请输入库存数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="盘点数量" prop="checkQuantity">
+				<el-input v-model="queryParams.checkQuantity" placeholder="请输入盘点数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<el-input v-model="queryParams.warehouseId" placeholder="请输入所属仓库" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属库区" prop="areaId">
+				<el-input v-model="queryParams.areaId" placeholder="请输入所属库区" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="货架" prop="rackId">
+				<el-input v-model="queryParams.rackId" placeholder="请输入货架" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:wmsInventoryCheckDetail:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:wmsInventoryCheckDetail:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:wmsInventoryCheckDetail:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:wmsInventoryCheckDetail:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventoryCheckDetailList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="库存盘点单" align="center" prop="inventoryCheckId" v-if="columns[0].visible" />
+			<el-table-column label="物料" align="center" prop="itemId" v-if="columns[1].visible" />
+			<el-table-column label="库存数量" align="center" prop="quantity" v-if="columns[2].visible" />
+			<el-table-column label="盘点数量" align="center" prop="checkQuantity" v-if="columns[3].visible" />
+			<el-table-column label="所属仓库" align="center" prop="warehouseId" v-if="columns[4].visible" />
+			<el-table-column label="所属库区" align="center" prop="areaId" v-if="columns[5].visible" />
+			<el-table-column label="货架" align="center" prop="rackId" v-if="columns[6].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsInventoryCheckDetail:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsInventoryCheckDetail:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改库存盘点单据详情对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="库存盘点单" prop="inventoryCheckId">
+					<el-input v-model="form.inventoryCheckId" placeholder="请输入库存盘点单" />
+				</el-form-item>
+				<el-form-item label="物料" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料" />
+				</el-form-item>
+				<el-form-item label="库存数量" prop="quantity">
+					<el-input v-model="form.quantity" placeholder="请输入库存数量" />
+				</el-form-item>
+				<el-form-item label="盘点数量" prop="checkQuantity">
+					<el-input v-model="form.checkQuantity" placeholder="请输入盘点数量" />
+				</el-form-item>
+				<el-form-item label="所属仓库" prop="warehouseId">
+					<el-input v-model="form.warehouseId" placeholder="请输入所属仓库" />
+				</el-form-item>
+				<el-form-item label="所属库区" prop="areaId">
+					<el-input v-model="form.areaId" placeholder="请输入所属库区" />
+				</el-form-item>
+				<el-form-item label="货架" prop="rackId">
+					<el-input v-model="form.rackId" placeholder="请输入货架" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsInventoryCheckDetail, getWmsInventoryCheckDetail, delWmsInventoryCheckDetail, addWmsInventoryCheckDetail, updateWmsInventoryCheckDetail, exportWmsInventoryCheckDetail } from "@/api/wms/inventoryCheckDetail";
+
+	export default {
+		name: "WmsInventoryCheckDetail",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存盘点单据详情表格数据
+				wmsInventoryCheckDetailList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					inventoryCheckId: null,
+					itemId: null,
+					quantity: null,
+					checkQuantity: null,
+					warehouseId: null,
+					areaId: null,
+					rackId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "库存盘点单", visible: true },
+					{ key: 2, label: "物料", visible: true },
+					{ key: 3, label: "库存数量", visible: true },
+					{ key: 4, label: "盘点数量", visible: true },
+					{ key: 5, label: "所属仓库", visible: true },
+					{ key: 6, label: "所属库区", visible: true },
+					{ key: 7, label: "货架", visible: true },
+					{ key: 9, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询库存盘点单据详情列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventoryCheckDetail(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryCheckDetailList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryCheckId: null,
+					itemId: null,
+					quantity: null,
+					checkQuantity: null,
+					warehouseId: null,
+					areaId: null,
+					rackId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加库存盘点单据详情";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsInventoryCheckDetail(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改库存盘点单据详情";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsInventoryCheckDetail(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsInventoryCheckDetail(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除库存盘点单据详情编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsInventoryCheckDetail(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存盘点单据详情数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventoryCheckDetail(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryHistory/index.vue b/src/views/wms/inventoryHistory/index.vue
new file mode 100644
index 0000000..ad79206
--- /dev/null
+++ b/src/views/wms/inventoryHistory/index.vue
@@ -0,0 +1,244 @@
+<template>
+	<div class="app-container">
+		<el-form class="ry_form" v-show="showSearch" :inline="true" label-width="100px" :model="queryParams" ref="queryForm" size="medium">
+			<el-form-item label="操作类型" prop="formType">
+				<in-out-type-select v-model="queryParams.formType" size="small"></in-out-type-select>
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<item-select v-model="queryParams.itemId" clearable="clearable" placeholder="请输入物料ID" size="small"></item-select>
+			</el-form-item>
+			<el-form-item label="仓库" prop="rackId">
+				<wms-warehouse-cascader v-model="queryParams.warehouseArr" size="small"></wms-warehouse-cascader>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<el-row class="mb8" :gutter="10">
+			<el-col :span="1.5">
+				<el-button v-hasPermi="['wms:inventoryHistory:export']" icon="el-icon-download" :loading="exportLoading" plain="plain" size="mini" type="warning" @click="handleExport">导出
+				</el-button>
+			</el-col>
+			<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+		<WmsTable v-loading="loading" :data="wmsInventoryHistoryList" @selection-change="handleSelectionChange">
+			<el-table-column v-if="columns[1].visible" align="center" label="操作类型" prop="formType">
+				<template v-slot="{ row }"><span>{{ row.formType ? opTypeMap[row.formType] : row.formType }}</span></template>
+			</el-table-column>
+			<el-table-column v-if="columns[2].visible" align="center" label="物料名称" prop="itemName"></el-table-column>
+			<el-table-column align="center" label="物料编号" prop="itemNo"></el-table-column>
+			<el-table-column v-if="columns[3].visible" align="center" label="仓库" prop="rackId">
+				<template v-slot="{ row }"><span>{{ row.warehouseName }}</span><span v-if="row.areaName">/{{ row.areaName }}</span></template>
+			</el-table-column>
+			<el-table-column v-if="columns[4].visible" align="center" label="库存变化" prop="quantity"></el-table-column>
+			<el-table-column v-if="columns[4].visible" align="center" label="操作时间" prop="createTime"></el-table-column>
+			<el-table-column v-if="columns[5].visible" align="center" label="备注" prop="remark"></el-table-column>
+		</WmsTable>
+		<pagination v-show="total&gt;0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total" @pagination="getList"></pagination>
+		<!-- 添加或修改库存记录对话框-->
+		<el-dialog append-to-body="append-to-body" :title="title" :visible.sync="open" width="50%">
+			<el-form class="dialog-form-two" inline="inline" label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="操作id" prop="formId">
+					<el-input v-model="form.formId" placeholder="请输入操作id"></el-input>
+				</el-form-item>
+				<el-form-item label="操作类型" prop="formType">
+					<el-select v-model="form.formType" placeholder="请选择操作类型">
+						<el-option label="请选择字典生成" value=""></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="物料ID" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料ID"></el-input>
+				</el-form-item>
+				<el-form-item label="货架id" prop="rackId">
+					<el-input v-model="form.rackId" placeholder="请输入货架id"></el-input>
+				</el-form-item>
+				<el-form-item label="库存变化" prop="quantity">
+					<el-input v-model="form.quantity" placeholder="请输入库存变化"></el-input>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+				</el-form-item>
+			</el-form>
+			<div class="dialog-footer" slot="footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsInventoryHistory, getWmsInventoryHistory, delWmsInventoryHistory, addWmsInventoryHistory, updateWmsInventoryHistory, exportWmsInventoryHistory } from "@/api/wms/inventoryHistory";
+	import ItemSelect from '@/components/ItemSelect'
+	import InOutTypeSelect from '@/components/InOutTypeSelect'
+	import { mapGetters } from 'vuex'
+
+	export default {
+		name: "WmsInventoryHistory",
+		components: { InOutTypeSelect, ItemSelect },
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存记录表格数据
+				wmsInventoryHistoryList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					formId: null,
+					formType: null,
+					itemId: null,
+					warehouseArr: null,
+					quantity: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "操作id（出库、入库、库存移动表单id）", visible: true },
+					{ key: 2, label: "操作类型", visible: true },
+					{ key: 3, label: "物料ID", visible: true },
+					{ key: 4, label: "货架id", visible: true },
+					{ key: 5, label: "库存变化", visible: true },
+					{ key: 6, label: "备注", visible: true },
+				],
+			};
+		},
+		computed: {
+			...mapGetters(['opTypeMap'])
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询库存记录列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize, warehouseArr } = this.queryParams;
+				const [warehouseId, areaId, rackId] = warehouseArr || [];
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, warehouseId, areaId, rackId };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventoryHistory(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryHistoryList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					formId: null,
+					formType: null,
+					itemId: null,
+					rackId: null,
+					quantity: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加库存记录";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsInventoryHistory(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改库存记录";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsInventoryHistory(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsInventoryHistory(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除库存记录编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsInventoryHistory(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存记录数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventoryHistory(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryMovement/edit.vue b/src/views/wms/inventoryMovement/edit.vue
new file mode 100644
index 0000000..1e8ed43
--- /dev/null
+++ b/src/views/wms/inventoryMovement/edit.vue
@@ -0,0 +1,279 @@
+<template>
+	<div class="inventory-movement-edit-wrapper app-container">
+		<div class="inventory-movement-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="移库单号" prop="inventoryMovementNo">
+					<el-input class="w200" v-model="form.inventoryMovementNo" placeholder="移库单号" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="备注...100个字符以内" rows="3" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">
+					<el-row class="mb8 mt10" :gutter="10">
+						<el-col :span="1.5">
+							<div class="flex-one large-tip bolder-font">物料明细</div>
+						</el-col>
+						<el-col :span="1.5">
+							<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory('sourcePlace')">
+								设置源仓库
+							</el-button>
+						</el-col>
+
+						<el-col :span="1.5">
+							<el-button size="small" icon="el-icon-aim" type="warning" plain="plain" @click="onBatchSetInventory('targetPlace')">
+								设置目标仓库
+							</el-button>
+						</el-col>
+
+					</el-row>
+				</div>
+				<div class="ops">
+					<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+				</div>
+			</div>
+			<div class="table">
+				<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55" align="center"></el-table-column>
+					<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+					<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+					<el-table-column label="物料类型" align="center" prop="prod.itemType"></el-table-column>
+					<el-table-column label="计划数量" align="center" prop="planQuantity" width="150">
+						<template slot-scope="scope">
+							<el-input-number v-model="scope.row.planQuantity" placeholder="计划数量" size="small" :min="1" :max="2147483647"></el-input-number>
+						</template>
+					</el-table-column>
+					<el-table-column label="源 仓库/库区" align="center" width="200">
+						<template slot-scope="scope">
+							<WmsWarehouseCascader v-model="scope.row.sourcePlace" size="small"></WmsWarehouseCascader>
+						</template>
+					</el-table-column>
+					<el-table-column label="目标 仓库/库区" align="center" width="200">
+						<template slot-scope="scope">
+							<WmsWarehouseCascader v-model="scope.row.targetPlace" size="small"></WmsWarehouseCascader>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" align="center">
+						<template slot-scope="scope">
+							<a class="red" @click="form.details.splice(scope.$index, 1)">删除</a>
+						</template>
+					</el-table-column>
+				</WmsTable>
+				<!--        <el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>-->
+			</div>
+			<div class="tc mt16">
+				<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary">保存</el-button>
+			</div>
+		</div>
+		<el-dialog :visible="modalObj.show" :title="modalObj.title" :width="modalObj.width" @close="modalObj.cancel">
+			<template v-if="modalObj.component === 'add-item'">
+				<item-select ref="item-select" :data="this.form.details"></item-select>
+			</template>
+			<span slot="footer">
+				<el-button v-if="modalObj.cancel" @click="modalObj.cancel">取消</el-button>
+				<el-button v-if="modalObj.ok" type="primary" @click="modalObj.ok">确认</el-button>
+			</span>
+		</el-dialog>
+		<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+	</div>
+</template>
+
+<script>
+	import { addOrUpdateWmsInventoryMovement, getWmsInventoryMovement } from '@/api/wms/inventoryMovement'
+	import { randomId } from '@/utils/RandomUtils'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+
+	export default {
+		name: 'WmsMovementOrder',
+		components: { BatchWarehouseDialog, ItemSelect },
+		data() {
+			return {
+				ids: [],
+				// 非多个禁用
+				multiple: true,
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchDialogField: '',
+				batchForm: {
+					place: []
+				},
+				// 表单参数
+				form: {
+					details: []
+				},
+				// 表单校验
+				rules: {},
+				modalObj: {
+					show: false,
+					title: '',
+					width: '50%',
+					component: null,
+					model: {},
+					ok: () => {},
+					cancel: () => {}
+				}
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.reset()
+			}
+		},
+		methods: {
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory(field) {
+				const { details } = this.form
+				if (!details || details.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+				this.batchDialogField = field
+			},
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.details.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it[this.batchDialogField] = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/inventoryMovement' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs['form'].validate(valid => {
+					if (!valid) {
+						return
+					}
+					const details = this.form.details.map(it => {
+						let { sourcePlace, targetPlace } = it;
+						return {
+							itemId: it.prod.id,
+							sourceRackId: sourcePlace ? sourcePlace[2] : null,
+							sourceAreaId: sourcePlace ? sourcePlace[1] : null,
+							sourceWarehouseId: sourcePlace ? sourcePlace[0] : null,
+							targetRackId: targetPlace ? targetPlace[2] : null,
+							targetAreaId: targetPlace ? targetPlace[1] : null,
+							targetWarehouseId: targetPlace ? targetPlace[0] : null,
+							planQuantity: it.planQuantity,
+							realQuantity: it.realQuantity,
+							moveStatus: it.moveStatus,
+							delFlag: 0
+						}
+					})
+					if (details.filter(it => !it.sourceWarehouseId || !it.targetWarehouseId)?.length > 0) {
+						this.$message.warning('请选择仓库、库区或货架')
+						return;
+					}
+					const arr = details.filter(it => it.sourceRackId === it.targetRackId && it.sourceAreaId === it.targetAreaId && it.sourceWarehouseId === it.targetWarehouseId)
+					if (arr?.length > 0) {
+						this.$message.warning('同一个物料不能选择相同的仓库、库区、货架')
+						return;
+					}
+					const req = { ...this.form, details }
+					addOrUpdateWmsInventoryMovement(req).then(response => {
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel();
+					})
+				})
+			},
+			loadDetail(id) {
+				getWmsInventoryMovement(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					});
+					details && details.forEach(it => it.prod = map[it.itemId])
+					this.form = {
+						...response,
+						details
+					}
+				})
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryMovementNo: 'M-' + randomId(),
+					status: 21,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					details: []
+				}
+				this.resetForm('form')
+			},
+			confirmSelectItem() {
+				const value = this.$refs['item-select'].getRightList()
+				this.form.details = value.map(it => {
+					return {
+						id: it.id,
+						prod: it,
+						planQuantity: null,
+						targetPlace: [],
+						sourcePlace: [],
+						realQuantity: null,
+						moveStatus: 21,
+						delFlag: 0
+					}
+				})
+				this.closeModal()
+			},
+			closeModal() {
+				this.modalObj.show = false
+			},
+			showAddItem() {
+				try {
+					this.$refs['item-select'].initDetailsList(this.form.details)
+				} catch (err) {
+
+				}
+				const ok = () => this.confirmSelectItem()
+				const cancel = () => this.closeModal()
+				this.modalObj = {
+					show: true,
+					title: '添加物料',
+					width: '50%',
+					component: 'add-item',
+					model: {},
+					ok,
+					cancel
+				}
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.inventory-movement-edit-wrapper
+  .inventory-movement-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryMovement/index.vue b/src/views/wms/inventoryMovement/index.vue
new file mode 100644
index 0000000..a25f85b
--- /dev/null
+++ b/src/views/wms/inventoryMovement/index.vue
@@ -0,0 +1,236 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="移库状态" prop="status">
+				<DictRadio v-model="queryParams.status" @change="handleQuery" size="small" :radioData="dict.type.wms_movement_status" :showAll="'all'" />
+			</el-form-item>
+			<el-form-item label="编号" prop="inventoryMovementNo">
+				<el-input v-model="queryParams.inventoryMovementNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:inventoryMovement:add']">创建移库单
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventoryMovementList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="inventoryMovementNo" v-if="columns[0].visible" />
+			<el-table-column label="状态" align="center" prop="status" v-if="columns[1].visible">
+				<template slot-scope="scope">
+					<el-tag size="medium" effect="plain" :type="getStatusTag(scope.row)">
+						{{ getStatus(scope.row) }}
+					</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="下单时间" align="center" prop="createTime" width="180" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.createTime, '') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible">
+				<template v-slot="{ row }">
+					<el-popover placement="left" width="300" trigger="hover" :content="row.remark" popper-class="popperOptions">
+						<p class="showOverTooltip" slot="reference">{{ row.remark }}</p>
+					</el-popover>
+				</template>
+			</el-table-column>
+			<el-table-column label="物料" align="center" prop="remark" v-if="columns[4].visible">
+				<template slot-scope="scope">
+					<p>物料品种数量：{{ scope.row.detailCount }}</p>
+					<p>物料总数量：{{ scope.row.itemCount }}</p>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template v-slot="{ row }">
+					<el-button v-if="21 === row.status" size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(row)" v-hasPermi="['wms:inventoryMovement:edit']">修改
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(row)" v-hasPermi="['wms:inventoryMovement:remove']">删除
+					</el-button>
+					<el-button v-if="row.detailCount" size="mini" type="text" icon="el-icon-truck" @click.stop="handleStatus(row)" v-hasPermi="['wms:inventoryMovement:status']">移库
+					</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsInventoryMovement,
+		delWmsInventoryMovement,
+		exportWmsInventoryMovement
+	} from "@/api/wms/inventoryMovement";
+	import { mapGetters } from "vuex";
+
+	export default {
+		name: "WmsInventoryMovement",
+		dicts: ['wms_movement_status'],
+		computed: {
+			...mapGetters(['warehouseMap', 'areaMap', 'rackMap']),
+			statusMap() {
+				let obj = this.dict.type.wms_movement_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存移动表格数据
+				wmsInventoryMovementList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					inventoryMovementNo: null,
+					status: null
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "状态", visible: true },
+					{ key: 3, label: "下单时间", visible: true },
+					{ key: 4, label: "备注", visible: true },
+					{ key: 5, label: "物料", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			getStatusTag(row) {
+				switch (row.status) {
+				case 21:
+					return "info";
+				case 22:
+					return "warning";
+				case 24:
+					return "danger";
+				case 23:
+					return "success";
+				}
+			},
+			getStatus(row) {
+				return this.statusMap.get(row.status + "")
+			},
+			/** 查询库存移动列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventoryMovement(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryMovementList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.$router.push({ path: "/wms/inventoryMovement/edit" });
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: "/wms/inventoryMovement/edit", query: { id } });
+			},
+			handleStatus(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: "/wms/inventoryMovement/status", query: { id } });
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				const inventoryMovementNo = row.inventoryMovementNo
+				this.$modal.confirm('是否确认删除库存移动编号为"' + inventoryMovementNo + '"的数据项？').then(function () {
+					return delWmsInventoryMovement(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存移动数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventoryMovement(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
+<style lang="stylus">
+	.popperOptions[x-placement^=left] .popper__arrow::after {
+		border-left-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=right] .popper__arrow::after {
+		border-right-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=bottom] .popper__arrow::after {
+		border-bottom-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=top] .popper__arrow::after {
+		border-top-color: #565D6B;
+	}
+
+	.popperOptions {
+		background-color: #565D6B;
+		color: #FFFFFF;
+		border: #565D6B;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryMovement/status.vue b/src/views/wms/inventoryMovement/status.vue
new file mode 100644
index 0000000..b665f94
--- /dev/null
+++ b/src/views/wms/inventoryMovement/status.vue
@@ -0,0 +1,296 @@
+<template>
+	<div class="inventory-movement-status-wrapper app-container" v-loading="loading">
+		<div class="inventory-movement-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="移库单号" prop="inventoryMovementNo">{{ form.inventoryMovementNo }}</el-form-item>
+				<el-form-item label="移库状态" prop="status">{{ statusMap.get(form.status + '') }}</el-form-item>
+				<el-form-item label="备注" prop="remark">{{ form.remark }}</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<el-row class="mb8 mt10" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">物料明细</div>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory('sourcePlace')">
+						设置源仓库
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="batch">批量设置出库状态
+					</el-button>
+				</el-col>
+
+				<el-col :span="1.5">
+					<el-button size="small" icon="el-icon-aim" type="warning" plain="plain" @click="onBatchSetInventory('targetPlace')">
+						设置目标仓库
+					</el-button>
+				</el-col>
+
+			</el-row>
+			<el-dialog title="请选择移库状态" :visible.sync="open" width="50%" append-to-body="append-to-body">
+				<DictRadio v-model="dialogStatus" :radioData="dialogStatusRange"></DictRadio>
+				<div class="dialog-footer" slot="footer">
+					<el-button type="primary" @click="dialogConfirm">确 定</el-button>
+					<el-button @click="cancelDialog">取 消</el-button>
+				</div>
+			</el-dialog>
+			<div class="table">
+				<el-form ref="form" :model="form" :show-message="false">
+					<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+						<el-table-column type="selection" width="55" align="center"></el-table-column>
+						<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+						<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+						<el-table-column label="物料类型" align="center" prop="prod.itemType"></el-table-column>
+						<el-table-column label="计划数量" align="center" prop="planQuantity"></el-table-column>
+						<el-table-column label="实际数量" align="center" width="150">
+							<template slot-scope="scope">
+								<el-input-number v-model="scope.row.realQuantity" :min="1" :max="2147483647" size="small" :disabled="scope.row.finish"></el-input-number>
+							</template>
+						</el-table-column>
+						<el-table-column label="源 仓库/库区" align="center" width="200">
+
+							<template slot-scope="scope">
+								<el-form-item :prop=" 'details.' + scope.$index + '.sourcePlace' " :rules="[{ required: true, message: '请选择源 仓库/库区', trigger: 'change' }]" style="margin-bottom: 0!important;">
+									<WmsWarehouseCascader v-model="scope.row.sourcePlace" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+								</el-form-item>
+							</template>
+						</el-table-column>
+						<el-table-column label="目标 仓库/库区" align="center" width="200">
+
+							<template slot-scope="scope">
+								<el-form-item :prop=" 'details.' + scope.$index + '.targetPlace' " :rules="[{ required: true, message: '请选择目标 仓库/库区', trigger: 'change' }]" style="margin-bottom: 0!important;">
+									<WmsWarehouseCascader v-model="scope.row.targetPlace" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+								</el-form-item>
+							</template>
+						</el-table-column>
+						<el-table-column label="移库状态" width="150">
+							<template slot-scope="{ row }">
+								<DictSelect v-model="row.moveStatus" :options="row.range" size="small" :disabled="row.finish"></DictSelect>
+							</template>
+						</el-table-column>
+					</WmsTable>
+				</el-form>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary" :disabled="finish">保存</el-button>
+			</div>
+		</div>
+		<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+	</div>
+</template>
+
+<script>
+	import { addOrUpdateWmsInventoryMovement, getWmsInventoryMovement } from '@/api/wms/inventoryMovement'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+
+	export default {
+		name: 'WmsInventoryMovement',
+		components: { BatchWarehouseDialog, ItemSelect },
+		dicts: ['wms_movement_status'],
+		computed: {
+			statusMap() {
+				let obj = this.dict.type.wms_movement_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			mergeDetailStatusArray() {
+				const arr = this.sourceDetails || []
+				return [...new Set(arr.filter(it => it.moveStatus !== null).map(it => it.moveStatus))]
+			},
+			dialogStatusRange() {
+				if (this.mergeDetailStatusArray.length !== 1) {
+					return []
+				}
+				return this.getRange(this.mergeDetailStatusArray[0])
+			}
+		},
+		data() {
+			return {
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchDialogField: '',
+				batchForm: {
+					place: []
+				},
+				open: false,
+				// 遮罩层
+				loading: true,
+				ids: [],
+				// 表单参数
+				form: {
+					details: []
+				},
+				sourceDetails: [],
+				// 表单校验
+				rules: {},
+				dialogStatus: null,
+				// 非多个禁用
+				multiple: true,
+				finish: false
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.cancel()
+			}
+		},
+		methods: {
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory(field) {
+				const { details } = this.form
+				if (!details || details.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+				this.batchDialogField = field
+			},
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.details.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it[this.batchDialogField] = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			dialogConfirm() {
+				if (!this.dialogStatus) {
+					this.$modal.alert('请选择移库状态')
+					return
+				}
+				this.form.details.forEach(detail => {
+					if (this.ids.includes(detail.id)) {
+						detail.moveStatus = this.dialogStatus
+					}
+				})
+				this.cancelDialog()
+			},
+			cancelDialog() {
+				this.open = false
+				this.dialogStatus = null
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			batch() {
+				if (this.multiple) {
+					this.$modal.alert('请先选择物料')
+				} else {
+					this.open = true
+				}
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/inventoryMovement' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs['form'].validate(valid => {
+					if (!valid) {
+						this.$notify({
+							title: '警告',
+							message: "请完善表单信息",
+							type: 'warning'
+						});
+						return
+					}
+					const details = this.form.details.map(it => {
+						let { sourcePlace, targetPlace } = it;
+						return {
+							id: it.id,
+							itemId: it.prod.id,
+							sourceRackId: sourcePlace ? sourcePlace[2] : null,
+							sourceAreaId: sourcePlace ? sourcePlace[1] : null,
+							sourceWarehouseId: sourcePlace ? sourcePlace[0] : null,
+							targetRackId: targetPlace ? targetPlace[2] : null,
+							targetAreaId: targetPlace ? targetPlace[1] : null,
+							targetWarehouseId: targetPlace ? targetPlace[0] : null,
+							planQuantity: it.planQuantity,
+							realQuantity: it.realQuantity,
+							moveStatus: it.moveStatus,
+							delFlag: 0
+						}
+					})
+					if (details.filter(it => !it.sourceWarehouseId || !it.targetWarehouseId)?.length > 0) {
+						this.$message.warning('请选择仓库、库区或货架')
+						return;
+					}
+					const arr = details.filter(it => it.sourceRackId === it.targetRackId && it.sourceAreaId === it.targetAreaId && it.sourceWarehouseId === it.targetWarehouseId)
+					if (arr?.length > 0) {
+						this.$message.warning('同一个物料不能选择相同的仓库、库区、货架')
+						return;
+					}
+					const req = { ...this.form, details }
+					addOrUpdateWmsInventoryMovement(req).then(response => {
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel()
+					})
+				})
+			},
+			loadDetail(id) {
+				this.loading = true
+				getWmsInventoryMovement(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					details && details.forEach(it => {
+						it.prod = map[it.itemId]
+						if ((!it.sourcePlace || it.sourcePlace.length === 0) && it.prod) {
+							it.sourcePlace = it.prod.sourcePlace;
+						}
+						if ((!it.targetPlace || it.targetPlace.length === 0) && it.prod) {
+							it.targetPlace = it.prod.targetPlace;
+						}
+						it.range = this.getRange(it.moveStatus)
+						it.finish = it.moveStatus === 23
+					})
+					this.finish = details.filter(it => !it.finish)?.length === 0
+					this.sourceDetails = details.map(it => ({ ...it }))
+					this.form = {
+						...response,
+						details
+					}
+				}).finally(() => {
+					this.loading = false
+				})
+			},
+			getRange(status) {
+				const arr = this.dict.type.wms_movement_status
+				if (status === 4 || status === 3) {
+					return arr.filter(it => +it.value === status).map(it => ({ label: it.label, value: it.value }))
+				}
+				if (status === 2) {
+					return arr.filter(it => +it.value >= status && +it.value !== 4).map(it => ({
+						label: it.label,
+						value: it.value
+					}))
+				}
+				return arr.filter(it => +it.value >= status).map(it => ({ label: it.label, value: it.value }))
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.inventory-movement-status-wrapper
+  .inventory-movement-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventoryMovementDetail/index.vue b/src/views/wms/inventoryMovementDetail/index.vue
new file mode 100644
index 0000000..1517b79
--- /dev/null
+++ b/src/views/wms/inventoryMovementDetail/index.vue
@@ -0,0 +1,244 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="库存移动Id" prop="inventoryMovementId">
+				<el-input v-model="queryParams.inventoryMovementId" placeholder="请输入库存移动Id" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<el-input v-model="queryParams.itemId" placeholder="请输入物料" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="计划数量" prop="planQuantity">
+				<el-input v-model="queryParams.planQuantity" placeholder="请输入计划数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="实际数量" prop="realQuantity">
+				<el-input v-model="queryParams.realQuantity" placeholder="请输入实际数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:inventoryMovementDetail:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:inventoryMovementDetail:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:inventoryMovementDetail:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:inventoryMovementDetail:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventoryMovementDetailList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="库存移动Id" align="center" prop="inventoryMovementId" v-if="columns[0].visible" />
+			<el-table-column label="物料" align="center" prop="itemId" v-if="columns[1].visible" />
+			<el-table-column label="计划数量" align="center" prop="planQuantity" v-if="columns[2].visible" />
+			<el-table-column label="实际数量" align="center" prop="realQuantity" v-if="columns[3].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[4].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:inventoryMovementDetail:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:inventoryMovementDetail:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改库存移动详情对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="库存移动Id" prop="inventoryMovementId">
+					<el-input v-model="form.inventoryMovementId" placeholder="请输入库存移动Id" />
+				</el-form-item>
+				<el-form-item label="物料" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料" />
+				</el-form-item>
+				<el-form-item label="计划数量" prop="planQuantity">
+					<el-input v-model="form.planQuantity" placeholder="请输入计划数量" />
+				</el-form-item>
+				<el-form-item label="实际数量" prop="realQuantity">
+					<el-input v-model="form.realQuantity" placeholder="请输入实际数量" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsInventoryMovementDetail, getWmsInventoryMovementDetail, delWmsInventoryMovementDetail, addWmsInventoryMovementDetail, updateWmsInventoryMovementDetail, exportWmsInventoryMovementDetail } from "@/api/wms/inventoryMovementDetail";
+
+	export default {
+		name: "WmsInventoryMovementDetail",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存移动详情表格数据
+				wmsInventoryMovementDetailList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					inventoryMovementId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "库存移动Id", visible: true },
+					{ key: 2, label: "物料", visible: true },
+					{ key: 3, label: "计划数量", visible: true },
+					{ key: 4, label: "实际数量", visible: true },
+					{ key: 6, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询库存移动详情列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventoryMovementDetail(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventoryMovementDetailList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventoryMovementId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加库存移动详情";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsInventoryMovementDetail(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改库存移动详情";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsInventoryMovementDetail(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsInventoryMovementDetail(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除库存移动详情编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsInventoryMovementDetail(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存移动详情数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventoryMovementDetail(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/inventorySettlement/edit.vue b/src/views/wms/inventorySettlement/edit.vue
new file mode 100644
index 0000000..c891fdb
--- /dev/null
+++ b/src/views/wms/inventorySettlement/edit.vue
@@ -0,0 +1,232 @@
+<template>
+	<div class="receipt-order-edit-wrapper app-container">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="结算单号" prop="inventorySettlementNo">
+					<el-input class="w200" v-model="form.inventorySettlementNo" placeholder="结算单号" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="结算周期" prop="inventorySettlementPeriod">
+					<el-date-picker v-model="form.inventorySettlementPeriod" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="备注...100个字符以内" rows="3" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">结算明细</div>
+				<div class="ops">
+					<el-button type="primary" plain="plain" size="small" @click="startSettle">开始结算</el-button>
+				</div>
+			</div>
+			<div class="table">
+				<table class="common-table">
+					<tr>
+						<th>物料信息</th>
+						<th>仓库信息</th>
+						<th>上期结存</th>
+						<th>本期入库</th>
+						<th>本期出库</th>
+						<th>本期盘点</th>
+						<th>本期结存</th>
+					</tr>
+					<tr v-for="(it, index) in form.details">
+						<td align="center">{{ it.itemName }} <br>编码：{{ it.itemNo }}</td>
+						<td align="center">{{ it.warehouseName }} {{ it.warehouseNo }}</td>
+						<td align="center">
+							<el-input-number v-model="it.previousBalance" :precision="2" :min="0"></el-input-number>
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.currentEnter" :precision="2" :min="0"></el-input-number>
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.currentOut" :precision="2" :min="0"></el-input-number>
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.currentCheck" :precision="2" :min="0"></el-input-number>
+						</td>
+						<td align="center">
+							<el-input-number v-model="it.currentBalance" :precision="2" :min="0"></el-input-number>
+						</td>
+					</tr>
+				</table>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm(11)" type="primary">暂存</el-button>
+				<el-button @click="submitFinishForm" type="success">结算完成</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import { randomId } from "@/utils/RandomUtils";
+	import { listByTime } from "@/api/wms/inventorySettlementDetail";
+	import { Message } from "element-ui";
+	import { addOrUpdateWmsInventorySettlement, getWmsInventorySettlement } from "@/api/wms/inventorySettlement";
+	import moment from "moment";
+
+	export default {
+		name: "WmsInventorySettle",
+		data() {
+			return {
+				// 预设时间选择日期范围
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				types: ["png", "jpg", "jpeg"],
+				// 表单参数
+				form: {
+					details: [],
+				},
+				// 表单校验
+				rules: {},
+			};
+		},
+		created() {
+			const { id, settlementType } = this.$route.query;
+			if (id) {
+				this.loadDetail(id);
+			} else {
+				this.reset();
+				this.form.settlementType = settlementType
+				// this.loadSettlement();
+			}
+		},
+		methods: {
+			// 获取当期的结算初始列表
+			startSettle() {
+				let [startTime, endTime] = this.form.inventorySettlementPeriod || [];
+				if (startTime) {
+					startTime = moment(startTime).format('YYYY-MM-DD HH:mm:ss')
+					endTime = moment(endTime).format('YYYY-MM-DD HH:mm:ss')
+				}
+				const settlementType = this.form.settlementType
+				const rep = { startTime, endTime, settlementType }
+				listByTime(rep).then((response) => {
+					const details = response;
+					this.form = {
+						...this.form,
+						details,
+					};
+				})
+			},
+			/** 取消按钮 */
+			cancel() {
+				const { settlementType } = this.form
+				if (Number(settlementType) === 1) {
+					this.$tab.closeOpenPage({ path: "/settlement/inventorySettlementMonth?settlementType=1" });
+				} else {
+					this.$tab.closeOpenPage({ path: "/settlement/inventorySettlementYear?settlementType=2" });
+				}
+			},
+			loadSettlement() {
+				listByTime().then((response) => {
+					const details = response;
+					this.form = {
+						...this.form,
+						details,
+					};
+				})
+			},
+			/** 提交按钮 */
+			submitFinishForm() {
+				//结算完成22
+				this.submitForm(22);
+			},
+			submitForm(inventorySettlementStatus = 11) {
+				if (inventorySettlementStatus === 22 && this.form.details.length === 0) {
+					//未添加物料
+					Message({
+						message: "您还未开始结算！",
+						type: "error",
+					});
+					return false;
+				}
+				this.$refs["form"].validate((valid) => {
+					if (!valid) {
+						return;
+					}
+					const [startTime, endTime] = this.form.inventorySettlementPeriod || [];
+					// moment(value).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementStartTime = moment(startTime).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementEndTime = moment(endTime).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementStatus = inventorySettlementStatus;
+
+
+					const req = { ...this.form };
+
+					addOrUpdateWmsInventorySettlement(req).then((response) => {
+						this.$modal.msgSuccess(this.form.id ? "修改成功" : "新增成功");
+						this.cancel();
+					});
+				});
+			},
+			/** 加载 盘点单详情 */
+			loadDetail(id) {
+				getWmsInventorySettlement(id).then((response) => {
+					const { details, items, inventorySettlementStartTime, inventorySettlementEndTime } = response;
+					const map = {};
+					(items || []).forEach((it) => {
+						map[it.id] = it;
+					});
+					const inventorySettlementPeriod = [inventorySettlementStartTime, inventorySettlementEndTime];
+					details && details.forEach((it) => (it.prod = map[it.itemId]));
+					this.form = {
+						...response,
+						inventorySettlementPeriod,
+						details,
+					};
+				});
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventorySettlementNo: "IS-" + randomId(),
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					inventorySettlementPeriod: null
+				};
+				this.resetForm("form");
+			},
+		},
+	};
+</script>
+<style lang="stylus">
+.receipt-order-edit-wrapper
+  .receipt-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventorySettlement/index.vue b/src/views/wms/inventorySettlement/index.vue
new file mode 100644
index 0000000..8354a63
--- /dev/null
+++ b/src/views/wms/inventorySettlement/index.vue
@@ -0,0 +1,267 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="结算单号" prop="inventorySettlementNo">
+				<el-input
+					v-model="queryParams.inventorySettlementNo"
+					placeholder="请输入结算单号"
+					clearable
+					size="small"
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="结算状态" prop="inventorySettlementStatus">
+				<DictRadio
+					v-model="queryParams.inventorySettlementStatus"
+					@change="handleQuery"
+					size="small"
+					:radioData="dict.type.wms_settlement_status"
+					:showAll="'all'"
+				/>
+			</el-form-item>
+			<el-form-item label="结算类型" prop="settlementType">
+				<DictRadio
+					v-model="queryParams.settlementType"
+					@change="handleQuery"
+					size="small"
+					:radioData="dict.type.wms_settlement_type"
+					:showAll="'all'"
+				/>
+			</el-form-item>
+
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索 </el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置 </el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:wmsInventorySettlement:add']"
+					>新增结算单
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					:loading="exportLoading"
+					@click="handleExport"
+					v-hasPermi="['wms:wmsInventorySettlement:export']"
+					>导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventorySettlementList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="结算单号" align="center" prop="inventorySettlementNo" v-if="columns[3].visible" />
+			<el-table-column label="结算周期" align="center" v-if="columns[0].visible">
+				<template slot-scope="scope">
+					<span>{{ formatInventorySettlementPeriod(scope.row) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="结算状态" align="center" prop="inventorySettlementStatus" v-if="columns[0].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_settlement_status" :value="scope.row.inventorySettlementStatus" />
+				</template>
+			</el-table-column>
+			<!--      <el-table-column
+              label="结算类型"
+              align="center"
+              prop="settlementType"
+              v-if="columns[1].visible"
+            />-->
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[2].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleView(scope.row)"
+						v-hasPermi="['wms:wmsInventorySettlement:edit']"
+						>查看
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-if="11 === scope.row.inventorySettlementStatus"
+						v-hasPermi="['wms:wmsInventorySettlement:edit']"
+						>继续结算
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						v-if="11 === scope.row.inventorySettlementStatus"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['wms:wmsInventorySettlement:remove']"
+						>删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+import { listWmsInventorySettlement, delWmsInventorySettlement, exportWmsInventorySettlement } from '@/api/wms/inventorySettlement'
+import moment from 'moment'
+
+export default {
+	name: 'WmsInventorySettlement',
+	dicts: ['wms_settlement_status', 'wms_settlement_type'],
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 导出遮罩层
+			exportLoading: false,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 库存结算单表格数据
+			wmsInventorySettlementList: [],
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				inventorySettlementStatus: null,
+				settlementType: 1,
+				inventorySettlementNo: null,
+			},
+			// 表单参数
+			form: {},
+			columns: [
+				{ key: 9, label: '结算单号', visible: true },
+				{ key: 1, label: '结算状态', visible: true },
+				{ key: 2, label: '结算类型', visible: true },
+				{ key: 4, label: '备注', visible: true },
+			],
+		}
+	},
+	created() {
+		this.queryParams.settlementType = 1
+		this.getList()
+	},
+	methods: {
+		formatInventorySettlementPeriod(row) {
+			if (row.inventorySettlementStartTime) {
+				return (
+					moment(row.inventorySettlementStartTime).format('YYYY-MM-DD') +
+					'-' +
+					moment(row.inventorySettlementEndTime).format('YYYY-MM-DD')
+				)
+			}
+			return ''
+		},
+		/** 查询库存结算单列表 */
+		getList() {
+			this.loading = true
+			const { pageNum, pageSize } = this.queryParams
+			const query = {
+				...this.queryParams,
+				pageNum: undefined,
+				pageSize: undefined,
+			}
+			const pageReq = { page: pageNum - 1, size: pageSize }
+			listWmsInventorySettlement(query, pageReq).then((response) => {
+				const { content, totalElements } = response
+				this.wmsInventorySettlementList = content
+				this.total = totalElements
+				this.loading = false
+			})
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: null,
+				inventorySettlementStatus: 0,
+				settlementType: null,
+				remark: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				inventorySettlementNo: null,
+			}
+			this.resetForm('form')
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 查看按钮操作 */
+		handleView(row) {
+			const id = row.id || this.ids
+			this.$router.push({ path: 'inventorySettlement/status', query: { id } })
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			const settlementType = this.queryParams.settlementType
+			this.$router.push({ path: 'inventorySettlement/edit', query: { settlementType } })
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			const id = row.id || this.ids
+			this.$router.push({ path: 'inventorySettlement/edit', query: { id } })
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id || this.ids
+			this.$modal
+				.confirm('是否确认删除库存结算单编号为"' + ids + '"的数据项？')
+				.then(function () {
+					return delWmsInventorySettlement(ids)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.catch(() => {})
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			const queryParams = this.queryParams
+			this.$modal
+				.confirm('是否确认导出所有库存结算单数据项？')
+				.then(() => {
+					this.exportLoading = true
+					return exportWmsInventorySettlement(queryParams)
+				})
+				.then((response) => {
+					this.$download.download(response)
+					this.exportLoading = false
+				})
+				.catch(() => {})
+		},
+	},
+}
+</script>
diff --git a/src/views/wms/inventorySettlement/status.vue b/src/views/wms/inventorySettlement/status.vue
new file mode 100644
index 0000000..73ac675
--- /dev/null
+++ b/src/views/wms/inventorySettlement/status.vue
@@ -0,0 +1,223 @@
+<template>
+	<div class="receipt-order-edit-wrapper app-container">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="结算单号" prop="inventorySettlementNo">
+					<el-input class="w200" v-model="form.inventorySettlementNo" placeholder="结算单号" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="结算周期" prop="inventorySettlementPeriod">
+					<el-date-picker v-model="form.inventorySettlementPeriod" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="备注...100个字符以内" rows="3" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">结算明细</div>
+			</div>
+			<div class="table">
+				<table class="common-table">
+					<tr>
+						<th>物料信息</th>
+						<th>仓库信息</th>
+						<th>上期结存</th>
+						<th>本期入库</th>
+						<th>本期出库</th>
+						<th>本期盘点</th>
+						<th>本期结存</th>
+					</tr>
+					<tr v-for="(it, index) in form.details">
+						<td align="center">{{ it.itemName }} <br>编码：{{ it.itemNo }}</td>
+						<td align="center">{{ it.warehouseName }} {{ it.warehouseNo }}</td>
+						<td align="center">
+							{{it.previousBalance}}
+						</td>
+						<td align="center">
+							{{it.currentEnter}}
+						</td>
+						<td align="center">
+							{{it.currentOut}}
+
+						</td>
+						<td align="center">
+							{{it.currentCheck}}
+						</td>
+						<td align="center">
+							{{it.currentBalance}}
+						</td>
+					</tr>
+				</table>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import { randomId } from "@/utils/RandomUtils";
+	import { listByTime } from "@/api/wms/inventorySettlementDetail";
+	import { Message } from "element-ui";
+	import { addOrUpdateWmsInventorySettlement, getWmsInventorySettlement } from "@/api/wms/inventorySettlement";
+	import moment from "moment";
+
+	export default {
+		name: "WmsInventorySettle",
+		data() {
+			return {
+				// 预设时间选择日期范围
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				types: ["png", "jpg", "jpeg"],
+				// 表单参数
+				form: {
+					details: [],
+				},
+				// 表单校验
+				rules: {},
+			};
+		},
+		created() {
+			const { id, settlementType } = this.$route.query;
+			if (id) {
+				this.loadDetail(id);
+			} else {
+				this.reset();
+				this.form.settlementType = settlementType
+				// this.loadSettlement();
+			}
+		},
+		methods: {
+			// 获取当期的结算初始列表
+			startSettle() {
+				let [startTime, endTime] = this.form.inventorySettlementPeriod || [];
+				startTime = moment(startTime).format('YYYY-MM-DD HH:mm:ss')
+				endTime = moment(endTime).format('YYYY-MM-DD HH:mm:ss')
+				const rep = { startTime, endTime }
+				listByTime(rep).then((response) => {
+					const details = response;
+					this.form = {
+						...this.form,
+						details,
+					};
+				})
+			},
+			/** 取消按钮 */
+			cancel() {
+				const { settlementType } = this.form
+				if (Number(settlementType) === 1) {
+					this.$tab.closeOpenPage({ path: "/settlement/inventorySettlementMonth?settlementType=1" });
+				} else {
+					this.$tab.closeOpenPage({ path: "/settlement/inventorySettlementYear?settlementType=2" });
+				}
+			},
+			loadSettlement() {
+				listByTime().then((response) => {
+					const details = response;
+					this.form = {
+						...this.form,
+						details,
+					};
+				})
+			},
+			/** 提交按钮 */
+			submitFinishForm() {
+				//结算完成22
+				this.submitForm(22);
+			},
+			submitForm(inventorySettlementStatus = 11) {
+				if (inventorySettlementStatus === 22 && this.form.details.length === 0) {
+					//未添加物料
+					Message({
+						message: "您还未开始结算！",
+						type: "error",
+					});
+					return false;
+				}
+				this.$refs["form"].validate((valid) => {
+					if (!valid) {
+						return;
+					}
+					const [startTime, endTime] = this.form.inventorySettlementPeriod || [];
+					// moment(value).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementStartTime = moment(startTime).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementEndTime = moment(endTime).format('YYYY-MM-DD HH:mm:ss')
+					this.form.inventorySettlementStatus = inventorySettlementStatus;
+
+
+					const req = { ...this.form };
+
+					addOrUpdateWmsInventorySettlement(req).then((response) => {
+						this.$modal.msgSuccess(this.form.id ? "修改成功" : "新增成功");
+						this.cancel();
+					});
+				});
+			},
+			/** 加载 盘点单详情 */
+			loadDetail(id) {
+				getWmsInventorySettlement(id).then((response) => {
+					const { details, items, inventorySettlementStartTime, inventorySettlementEndTime } = response;
+					const map = {};
+					(items || []).forEach((it) => {
+						map[it.id] = it;
+					});
+					const inventorySettlementPeriod = [inventorySettlementStartTime, inventorySettlementEndTime];
+					details && details.forEach((it) => (it.prod = map[it.itemId]));
+					this.form = {
+						...response,
+						inventorySettlementPeriod,
+						details,
+					};
+				});
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					inventorySettlementNo: "IS-" + randomId(),
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					inventorySettlementPeriod: null
+				};
+				this.resetForm("form");
+			},
+		},
+	};
+</script>
+<style lang="stylus">
+.receipt-order-edit-wrapper
+  .receipt-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/inventorySettlementDetail/index.vue b/src/views/wms/inventorySettlementDetail/index.vue
new file mode 100644
index 0000000..c12c8ce
--- /dev/null
+++ b/src/views/wms/inventorySettlementDetail/index.vue
@@ -0,0 +1,417 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="结算单id" prop="settlementId">
+				<el-input v-model="queryParams.settlementId" placeholder="请输入结算单id" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="结算类型,1:月结，2:年结" prop="settlementType">
+				<el-select v-model="queryParams.settlementType" placeholder="请选择结算类型,1:月结，2:年结" clearable size="small">
+					<el-option label="请选择字典生成" value="" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="物料id" prop="itemId">
+				<el-input v-model="queryParams.itemId" placeholder="请输入物料id" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="编号" prop="itemNo">
+				<el-input v-model="queryParams.itemNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="itemName">
+				<el-input v-model="queryParams.itemName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="仓库id" prop="warehouseId">
+				<el-input v-model="queryParams.warehouseId" placeholder="请输入仓库id" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="仓库编号" prop="warehouseNo">
+				<el-input v-model="queryParams.warehouseNo" placeholder="请输入仓库编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="仓库名称" prop="warehouseName">
+					<el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="库区id" prop="areaId">
+					<el-input v-model="queryParams.areaId" placeholder="请输入库区id" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="库区编号" prop="areaNo">
+					<el-input v-model="queryParams.areaNo" placeholder="请输入库区编号" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="库区名称" prop="areaName">
+					<el-input v-model="queryParams.areaName" placeholder="请输入库区名称" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="上期结存" prop="previousBalance">
+					<el-input v-model="queryParams.previousBalance" placeholder="请输入上期结存" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="本期入库" prop="currentEnter">
+					<el-input v-model="queryParams.currentEnter" placeholder="请输入本期入库" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="本期出库" prop="currentOut">
+					<el-input v-model="queryParams.currentOut" placeholder="请输入本期出库" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="本期盘点" prop="currentCheck">
+					<el-input v-model="queryParams.currentCheck" placeholder="请输入本期盘点" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="本期结存" prop="currentBalance">
+					<el-input v-model="queryParams.currentBalance" placeholder="请输入本期结存" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? '收起条件' : '展开条件' }}
+				</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:wmsInventorySettlementDetail:add']">新增
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:wmsInventorySettlementDetail:edit']">修改
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:wmsInventorySettlementDetail:remove']">删除
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:wmsInventorySettlementDetail:export']">导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsInventorySettlementDetailList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="结算单id" align="center" prop="settlementId" v-if="columns[0].visible" />
+			<el-table-column label="结算类型,1:月结，2:年结" align="center" prop="settlementType" v-if="columns[1].visible" />
+			<el-table-column label="物料id" align="center" prop="itemId" v-if="columns[2].visible" />
+			<el-table-column label="编号" align="center" prop="itemNo" v-if="columns[3].visible" />
+			<el-table-column label="名称" align="center" prop="itemName" v-if="columns[4].visible" />
+			<el-table-column label="仓库id" align="center" prop="warehouseId" v-if="columns[5].visible" />
+			<el-table-column label="仓库编号" align="center" prop="warehouseNo" v-if="columns[6].visible" />
+			<el-table-column label="仓库名称" align="center" prop="warehouseName" v-if="columns[7].visible" />
+			<el-table-column label="库区id" align="center" prop="areaId" v-if="columns[8].visible" />
+			<el-table-column label="库区编号" align="center" prop="areaNo" v-if="columns[9].visible" />
+			<el-table-column label="库区名称" align="center" prop="areaName" v-if="columns[10].visible" />
+			<el-table-column label="上期结存" align="center" prop="previousBalance" v-if="columns[11].visible" />
+			<el-table-column label="本期入库" align="center" prop="currentEnter" v-if="columns[12].visible" />
+			<el-table-column label="本期出库" align="center" prop="currentOut" v-if="columns[13].visible" />
+			<el-table-column label="本期盘点" align="center" prop="currentCheck" v-if="columns[14].visible" />
+			<el-table-column label="本期结存" align="center" prop="currentBalance" v-if="columns[15].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[16].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsInventorySettlementDetail:edit']">修改
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsInventorySettlementDetail:remove']">删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改库存结算明细对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="结算单id" prop="settlementId">
+					<el-input v-model="form.settlementId" placeholder="请输入结算单id" />
+				</el-form-item>
+				<el-form-item label="结算类型,1:月结，2:年结" prop="settlementType">
+					<el-select v-model="form.settlementType" placeholder="请选择结算类型,1:月结，2:年结">
+						<el-option label="请选择字典生成" value="" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="物料id" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料id" />
+				</el-form-item>
+				<el-form-item label="编号" prop="itemNo">
+					<el-input v-model="form.itemNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="itemName">
+					<el-input v-model="form.itemName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="仓库id" prop="warehouseId">
+					<el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
+				</el-form-item>
+				<el-form-item label="仓库编号" prop="warehouseNo">
+					<el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" />
+				</el-form-item>
+				<el-form-item label="仓库名称" prop="warehouseName">
+					<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+				</el-form-item>
+				<el-form-item label="库区id" prop="areaId">
+					<el-input v-model="form.areaId" placeholder="请输入库区id" />
+				</el-form-item>
+				<el-form-item label="库区编号" prop="areaNo">
+					<el-input v-model="form.areaNo" placeholder="请输入库区编号" />
+				</el-form-item>
+				<el-form-item label="库区名称" prop="areaName">
+					<el-input v-model="form.areaName" placeholder="请输入库区名称" />
+				</el-form-item>
+				<el-form-item label="上期结存" prop="previousBalance">
+					<el-input v-model="form.previousBalance" placeholder="请输入上期结存" />
+				</el-form-item>
+				<el-form-item label="本期入库" prop="currentEnter">
+					<el-input v-model="form.currentEnter" placeholder="请输入本期入库" />
+				</el-form-item>
+				<el-form-item label="本期出库" prop="currentOut">
+					<el-input v-model="form.currentOut" placeholder="请输入本期出库" />
+				</el-form-item>
+				<el-form-item label="本期盘点" prop="currentCheck">
+					<el-input v-model="form.currentCheck" placeholder="请输入本期盘点" />
+				</el-form-item>
+				<el-form-item label="本期结存" prop="currentBalance">
+					<el-input v-model="form.currentBalance" placeholder="请输入本期结存" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsInventorySettlementDetail,
+		getWmsInventorySettlementDetail,
+		delWmsInventorySettlementDetail,
+		addWmsInventorySettlementDetail,
+		updateWmsInventorySettlementDetail,
+		exportWmsInventorySettlementDetail
+	} from "@/api/wms/inventorySettlementDetail";
+
+	export default {
+		name: "WmsInventorySettlementDetail",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 库存结算明细表格数据
+				wmsInventorySettlementDetailList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					settlementId: null,
+					settlementType: null,
+					itemId: null,
+					itemNo: null,
+					itemName: null,
+					warehouseId: null,
+					warehouseNo: null,
+					warehouseName: null,
+					areaId: null,
+					areaNo: null,
+					areaName: null,
+					previousBalance: null,
+					currentEnter: null,
+					currentOut: null,
+					currentCheck: null,
+					currentBalance: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					settlementId: [
+						{ required: true, message: "结算单id不能为空", trigger: "blur" }
+					],
+					itemId: [
+						{ required: true, message: "物料id不能为空", trigger: "blur" }
+					],
+					itemNo: [
+						{ required: true, message: "编号不能为空", trigger: "blur" }
+					],
+					itemName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" }
+					],
+					warehouseId: [
+						{ required: true, message: "仓库id不能为空", trigger: "blur" }
+					],
+					warehouseNo: [
+						{ required: true, message: "仓库编号不能为空", trigger: "blur" }
+					],
+					warehouseName: [
+						{ required: true, message: "仓库名称不能为空", trigger: "blur" }
+					],
+					areaId: [
+						{ required: true, message: "库区id不能为空", trigger: "blur" }
+					],
+					areaNo: [
+						{ required: true, message: "库区编号不能为空", trigger: "blur" }
+					],
+					areaName: [
+						{ required: true, message: "库区名称不能为空", trigger: "blur" }
+					],
+				},
+				columns: [
+					{ key: 1, label: "结算单id", visible: true },
+					{ key: 2, label: "结算类型,1:月结，2:年结", visible: true },
+					{ key: 3, label: "物料id", visible: true },
+					{ key: 4, label: "编号", visible: true },
+					{ key: 5, label: "名称", visible: true },
+					{ key: 6, label: "仓库id", visible: true },
+					{ key: 7, label: "仓库编号", visible: true },
+					{ key: 8, label: "仓库名称", visible: true },
+					{ key: 9, label: "库区id", visible: true },
+					{ key: 10, label: "库区编号", visible: false },
+					{ key: 11, label: "库区名称", visible: false },
+					{ key: 12, label: "上期结存", visible: false },
+					{ key: 13, label: "本期入库", visible: false },
+					{ key: 14, label: "本期出库", visible: false },
+					{ key: 15, label: "本期盘点", visible: false },
+					{ key: 16, label: "本期结存", visible: false },
+					{ key: 18, label: "备注", visible: false },
+				],
+				showMoreCondition: false
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询库存结算明细列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsInventorySettlementDetail(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsInventorySettlementDetailList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					settlementId: null,
+					settlementType: null,
+					itemId: null,
+					itemNo: null,
+					itemName: null,
+					warehouseId: null,
+					warehouseNo: null,
+					warehouseName: null,
+					areaId: null,
+					areaNo: null,
+					areaName: null,
+					previousBalance: null,
+					currentEnter: null,
+					currentOut: null,
+					currentCheck: null,
+					currentBalance: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加库存结算明细";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsInventorySettlementDetail(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改库存结算明细";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsInventorySettlementDetail(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsInventorySettlementDetail(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除库存结算明细编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsInventorySettlementDetail(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有库存结算明细数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsInventorySettlementDetail(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/item/index.vue b/src/views/wms/item/index.vue
new file mode 100644
index 0000000..58bc7fc
--- /dev/null
+++ b/src/views/wms/item/index.vue
@@ -0,0 +1,383 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="itemNo">
+				<el-input v-model="queryParams.itemNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="itemNameLike">
+				<el-input v-model="queryParams.itemNameLike" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="分类" prop="itemType">
+				<treeselect v-model="queryParams.itemType" style="max-width: 180px" :options="deptOptions" :show-count="true" placeholder="请选择分类" />
+			</el-form-item>
+			<el-form-item label="单位类别" prop="unit">
+				<el-input v-model="queryParams.unit" placeholder="请输入单位类别" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属货架" prop="rackId">
+				<el-input v-model="queryParams.rackId" placeholder="请输入所属货架" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属库区" prop="areaId">
+				<el-input v-model="queryParams.areaId" placeholder="请输入所属库区" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<el-input v-model="queryParams.warehouseId" placeholder="请输入所属仓库" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="安全库存" prop="quantity">
+					<el-input v-model="queryParams.quantity" placeholder="请输入安全库存" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="有效期" prop="expiryDate">
+					<el-date-picker clearable size="small" v-model="queryParams.expiryDate" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择有效期">
+					</el-date-picker>
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? "收起条件" : "展开条件" }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:item:add']">新增</el-button>
+			</el-col>
+			<!-- <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['wms:item:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['wms:item:remove']">删除</el-button>
+      </el-col> -->
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:item:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsItemList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="itemNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="itemName" v-if="columns[1].visible" />
+			<el-table-column label="分类" align="center" prop="itemTypeName" v-if="columns[2].visible" />
+			<el-table-column label="单位类别" align="center" prop="unit" v-if="columns[3].visible" />
+			<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[6].visible" />
+			<el-table-column label="所属库区" align="center" prop="areaName" v-if="columns[5].visible" />
+			<el-table-column label="所属货架" align="center" prop="rackName" v-if="columns[4].visible" />
+			<el-table-column label="安全库存" align="center" prop="quantity" v-if="columns[7].visible" />
+			<el-table-column label="有效期" align="center" prop="expiryDate" width="180" v-if="columns[8].visible">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.expiryDate, "") }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['wms:item:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:item:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改物料对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="98px" class="dialog-form-two">
+				<el-row :gutter="24">
+					<el-col :span="12">
+						<el-form-item label="编号" prop="itemNo">
+							<el-input v-model="form.itemNo" placeholder="请输入编号" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="名称" prop="itemName">
+							<el-input v-model="form.itemName" placeholder="请输入名称" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
+					<el-col :span="12">
+						<el-form-item label="仓库/库区" prop="place">
+							<WmsWarehouseCascader v-model="form.place" size="small"></WmsWarehouseCascader>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="单位类别" prop="unit">
+							<el-input v-model="form.unit" placeholder="请输入单位类别" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
+					<el-col :span="12">
+						<el-form-item label="分类" prop="itemType">
+							<treeselect v-model="form.itemType" :options="deptOptions" :show-count="true" placeholder="请选择分类" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="安全库存" prop="quantity">
+							<el-input v-model="form.quantity" placeholder="请输入安全库存" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
+					<el-col :span="12">
+						<el-form-item label="有效期" prop="expiryDate">
+							<el-date-picker clearable size="small" v-model="form.expiryDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择有效期">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="form.remark" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsItem,
+		getWmsItem,
+		delWmsItem,
+		addWmsItem,
+		updateWmsItem,
+		exportWmsItem,
+	} from "@/api/wms/item";
+	import { mapGetters } from "vuex";
+	import Treeselect from "@riophae/vue-treeselect";
+	import { itemTypeTreeselect } from "@/api/wms/itemType";
+	import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+	export default {
+		name: "WmsItem",
+		components: { Treeselect },
+		dicts: ["wms_item_type"],
+		computed: {
+			...mapGetters(['warehouseMap', 'warehouseList', 'areaList', 'areaMap', 'rackList', 'rackMap']),
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 部门树选项
+				deptOptions: [],
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 物料表格数据
+				wmsItemList: [],
+				// 货架表格数据
+				rackListByArea: [],
+				// 库区表格数据
+				areaListByWarehouse: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					itemNo: null,
+					itemNameLike: null,
+					itemType: null,
+					unit: null,
+					rackId: null,
+					areaId: null,
+					warehouseId: null,
+					quantity: null,
+					expiryDate: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					itemNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+					itemName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" },
+					],
+
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "分类", visible: true },
+					{ key: 4, label: "单位类别", visible: true },
+					{ key: 5, label: "所属货架", visible: false },
+					{ key: 6, label: "所属库区", visible: true },
+					{ key: 7, label: "所属仓库", visible: true },
+					{ key: 8, label: "安全库存", visible: true },
+					{ key: 9, label: "有效期", visible: true },
+					{ key: 11, label: "备注", visible: false },
+				],
+				showMoreCondition: false,
+			};
+		},
+		created() {
+			this.getList();
+			itemTypeTreeselect().then(response => {
+				this.deptOptions = response.data
+			});
+		},
+		methods: {
+			/** 查询物料列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = {
+					...this.queryParams,
+					pageNum: undefined,
+					pageSize: undefined,
+				};
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsItem(query, pageReq).then((response) => {
+					const { content, totalElements } = response;
+					content.forEach((item) => {
+						item.warehouseName = this.warehouseMap.get(item.warehouseId);
+					});
+					content.forEach((item) => {
+						item.areaName = this.areaMap.get(item.areaId);
+					});
+					content.forEach((item) => {
+						item.rackName = this.rackMap.get(item.rackId);
+					});
+					this.wmsItemList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					itemNo: null,
+					itemName: null,
+					itemType: null,
+					unit: null,
+					rackId: null,
+					areaId: null,
+					warehouseId: null,
+					quantity: null,
+					expiryDate: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map((item) => item.id);
+				this.single = selection.length !== 1;
+				this.multiple = !selection.length;
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加物料";
+			},
+			/** 修改按钮操作 */
+			async handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids;
+				await getWmsItem(id).then((response) => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改物料";
+				});
+			},
+
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate((valid) => {
+					if (valid) {
+						if (this.form.place) {
+							this.form.warehouseId = this.form.place[0]
+							this.form.areaId = this.form.place[1]
+							this.form.rackId = this.form.place[2]
+
+						}
+						if (this.form.id != null) {
+							updateWmsItem(this.form).then((response) => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsItem(this.form).then((response) => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal
+					.confirm('是否确认删除物料编号为"' + ids + '"的数据项？')
+					.then(function () {
+						return delWmsItem(ids);
+					})
+					.then(() => {
+						this.getList();
+						this.$modal.msgSuccess("删除成功");
+					})
+					.catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal
+					.confirm("是否确认导出所有物料数据项？")
+					.then(() => {
+						this.exportLoading = true;
+						return exportWmsItem(queryParams);
+					})
+					.then((response) => {
+						this.$download.download(response);
+						this.exportLoading = false;
+					})
+					.catch(() => {});
+			},
+		},
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/itemType/index.vue b/src/views/wms/itemType/index.vue
new file mode 100644
index 0000000..6edbff6
--- /dev/null
+++ b/src/views/wms/itemType/index.vue
@@ -0,0 +1,305 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+
+			<el-form-item label="物料类型名称" prop="typeName">
+				<el-input v-model="queryParams.typeName" placeholder="请输入物料类型名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:itemType:add']">新增
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+
+		<el-table v-loading="loading" :data="wmsItemTypeList" row-key="itemTypeId" :default-expand-all="isExpandAll" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+			<el-table-column label="物料类型名称" align="center" prop="typeName" width="260" v-if="columns[2].visible" />
+			<el-table-column label="排序" align="center" prop="orderNum" width="200" />
+
+			<el-table-column prop="status" label="状态" width="100">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column label="创建时间" align="center" prop="createTime" width="200">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.createTime) }}</span>
+				</template>
+			</el-table-column>
+
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:itemType:edit']">修改
+					</el-button>
+					<!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:wmsItemType:add']"
+          >新增
+          </el-button>-->
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:itemType:remove']">删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<!-- 添加或修改物料类型表对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px" class="dialog-form-two">
+
+				<el-row>
+					<el-col :span="24" v-if="form.parentId !== 0">
+						<el-form-item label="所属类别" prop="parentId">
+							<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属类别" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="类型名称" prop="typeName">
+							<el-input v-model="form.typeName" placeholder="请输入类型名称" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="显示顺序" prop="orderNum">
+							<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="状态">
+					<el-radio-group v-model="form.status">
+						<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}
+						</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		addWmsItemType,
+		delWmsItemType,
+		exportWmsItemType,
+		getWmsItemType,
+		itemTypeTreeselect,
+		listWmsItemTypeNoPage,
+		updateWmsItemType
+	} from "@/api/wms/itemType";
+	import Treeselect from "@riophae/vue-treeselect";
+	import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+	export default {
+		name: "WmsItemType",
+		dicts: ['sys_normal_disable'],
+		components: { Treeselect },
+		data() {
+			return {
+				// 是否展开，默认全部展开
+				isExpandAll: true,
+				// 部门树选项
+				deptOptions: [],
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 物料类型表表格数据
+				wmsItemTypeList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					parentId: null,
+					ancestors: null,
+					typeName: null,
+					orderNum: undefined,
+					status: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					typeName: [
+						{ required: true, message: "请输入类型名称", trigger: "blur" },
+					]
+				},
+				columns: [
+					{ key: 1, label: "父物料类型id", visible: true },
+					{ key: 2, label: "祖级列表", visible: true },
+					{ key: 3, label: "物料类型名称", visible: true },
+					{ key: 4, label: "显示顺序", visible: true },
+					{ key: 5, label: "物料类型状态（0正常 1停用）", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 展开/折叠操作 */
+			toggleExpandAll() {
+				this.refreshTable = false;
+				this.isExpandAll = !this.isExpandAll;
+				this.$nextTick(() => {
+					this.refreshTable = true;
+				});
+			},
+			/** 转换物料类型数据结构 */
+			normalizer(node) {
+				if (node.children && !node.children.length) {
+					delete node.children;
+				}
+				return {
+					id: node.itemTypeId,
+					label: node.typeName,
+					children: node.children
+				};
+			},
+			/** 查询物料类型表列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsItemTypeNoPage(query).then(response => {
+					this.wmsItemTypeList = this.handleTree(response.data, "itemTypeId");
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					itemTypeId: null,
+					parentId: null,
+					ancestors: null,
+					typeName: null,
+					orderNum: undefined,
+					status: "0",
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.itemTypeId)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd(row) {
+				this.reset();
+				this.open = true;
+				this.title = "添加物料类型表";
+				if (row != undefined) {
+					this.form.parentId = row.itemTypeId;
+				}
+				listWmsItemTypeNoPage().then(response => {
+					this.deptOptions = this.handleTree(response.data, "itemTypeId");
+				});
+
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const itemTypeId = row.itemTypeId || this.ids
+				getWmsItemType(itemTypeId).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改物料类型表";
+				});
+				listWmsItemTypeNoPage().then(response => {
+					this.deptOptions = this.handleTree(response.data, "itemTypeId");
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.itemTypeId != null) {
+							updateWmsItemType(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsItemType(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const itemTypeIds = row.itemTypeId || this.ids;
+				this.$modal.confirm('是否确认删除物料类型表编号为"' + itemTypeIds + '"的数据项？').then(function () {
+					return delWmsItemType(itemTypeIds);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有物料类型表数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsItemType(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/rack/index.vue b/src/views/wms/rack/index.vue
new file mode 100644
index 0000000..176880f
--- /dev/null
+++ b/src/views/wms/rack/index.vue
@@ -0,0 +1,301 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="rackNo">
+				<el-input v-model="queryParams.rackNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="rackName">
+				<el-input v-model="queryParams.rackName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属库区" prop="areaId">
+				<el-input v-model="queryParams.areaId" placeholder="请输入所属库区" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<el-input v-model="queryParams.warehouseId" placeholder="请输入所属仓库" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:rack:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:rack:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:rack:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:rack:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsRackList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="rackNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="rackName" v-if="columns[1].visible" />
+			<el-table-column label="所属库区" align="center" prop="areaName" v-if="columns[2].visible" />
+			<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[4].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['wms:rack:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:rack:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改货架对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="rackNo">
+					<el-input v-model="form.rackNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="rackName">
+					<el-input v-model="form.rackName" placeholder="请输入名称" />
+				</el-form-item>
+
+				<el-form-item label="仓库/库区" prop="place">
+					<WmsAreaCascader v-model="form.place" size="small"></WmsAreaCascader>
+				</el-form-item>
+
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import WmsAreaCascader from "@/components/WmsAreaCascader";
+	import {
+		listWmsRack,
+		getWmsRack,
+		delWmsRack,
+		addWmsRack,
+		updateWmsRack,
+		exportWmsRack,
+	} from "@/api/wms/rack";
+	import { mapGetters } from "vuex";
+	export default {
+		name: "WmsRack",
+		components: {
+			WmsAreaCascader,
+		},
+
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 货架表格数据
+				wmsRackList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					rackNo: null,
+					rackName: null,
+					areaId: null,
+					warehouseId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					rackNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+					place: [
+					{
+						validator: (rule, value, callback) => {
+							console.log("validator", this.form.place)
+							let v = this.form.place;
+							if (v && v.length == 2) {
+								callback();
+							} else {
+								callback(new Error("请选择仓库和库区"));
+							}
+						},
+						trigger: "change",
+					}, ],
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "所属库区", visible: true },
+					{ key: 4, label: "所属仓库", visible: true },
+					{ key: 5, label: "备注", visible: true },
+				],
+			};
+		},
+		computed: {
+			...mapGetters(["warehouseMap", "warehouseList", "areaList", "areaMap"]),
+		},
+		created() {
+			// this.getList();
+		},
+		methods: {
+			/** 查询货架列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = {
+					...this.queryParams,
+					pageNum: undefined,
+					pageSize: undefined,
+				};
+				const pageReq = { page: pageNum - 1, size: pageSize };
+
+				listWmsRack(query, pageReq).then((response) => {
+					const { content, totalElements } = response;
+					content.forEach((item) => {
+						item.warehouseName = this.warehouseMap.get(item.warehouseId);
+					});
+					content.forEach((item) => {
+						item.areaName = this.areaMap.get(item.areaId);
+					});
+					this.wmsRackList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					rackNo: null,
+					rackName: null,
+					areaId: null,
+					warehouseId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map((item) => item.id);
+				this.single = selection.length !== 1;
+				this.multiple = !selection.length;
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加货架";
+			},
+			/** 修改按钮操作 */
+			async handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids;
+				await getWmsRack(id).then((response) => {
+					response.place = [response.warehouseId, response.areaId];
+					this.form = response;
+					this.open = true;
+					this.title = "修改货架";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate((valid) => {
+					if (valid) {
+						if (this.form.place) {
+							console.log(this.form.place);
+							this.form.warehouseId = this.form.place[0];
+							this.form.areaId = this.form.place[1];
+						}
+						if (this.form.id != null) {
+							updateWmsRack(this.form).then((response) => {
+								this.$store.dispatch("wms/getRackList");
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsRack(this.form).then((response) => {
+								this.$store.dispatch("wms/getRackList");
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal
+					.confirm('是否确认删除货架编号为"' + ids + '"的数据项？')
+					.then(function () {
+						return delWmsRack(ids);
+					})
+					.then(() => {
+						this.$store.dispatch("wms/getRackList");
+						this.getList();
+						this.$modal.msgSuccess("删除成功");
+					})
+					.catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal
+					.confirm("是否确认导出所有货架数据项？")
+					.then(() => {
+						this.exportLoading = true;
+						return exportWmsRack(queryParams);
+					})
+					.then((response) => {
+						this.$download.download(response);
+						this.exportLoading = false;
+					})
+					.catch(() => {});
+			},
+		},
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/receiptOrder/ReceiptOrderPrint.vue b/src/views/wms/receiptOrder/ReceiptOrderPrint.vue
new file mode 100644
index 0000000..7f0142d
--- /dev/null
+++ b/src/views/wms/receiptOrder/ReceiptOrderPrint.vue
@@ -0,0 +1,102 @@
+<template>
+	<div class="receipt-order-print" ref="receiptOrderPrintRef" hidden="hidden">
+		<div class="title">{{ row.receiptOrderNo }}</div>
+		<div class="summary">
+			<div class="col1">供应商: {{ row.supplierName }}</div>
+			<div class="col1">订单号: {{ row.orderNo }}</div>
+			<div class="col1">入库类型: {{ row.receiptType }}</div>
+			<div class="col1">日期: {{ row.createTime }}</div>
+		</div>
+		<table class="common-table">
+			<tr>
+				<th>物料名</th>
+				<th>物料编号</th>
+				<th>物料类型</th>
+				<th>数量</th>
+				<th>仓库/库区</th>
+			</tr>
+			<tr v-for="it in row.details">
+				<td>{{ it.itemName || '' }}</td>
+				<td>{{ it.itemNo || '' }}</td>
+				<td>{{ it.itemType || '' }}</td>
+				<td>{{ it.planQuantity }}</td>
+				<td>{{ it.place }}</td>
+			</tr>
+			<tr>
+				<td>合计</td>
+				<td></td>
+				<td></td>
+				<td>{{ row.totalCount }}</td>
+				<td></td>
+			</tr>
+		</table>
+		<div class="foot">
+			<div class="col2">备注: {{ row.remark }}</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		props: ['row'],
+		methods: {
+			start() {
+				this.$print(this.$refs.receiptOrderPrintRef, {}, 'A4')
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" media="print">
+@page {
+  size: auto;
+  margin: 0;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+  }
+
+  table {
+    width 100%
+    table-layout: fixed;
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+
+  table, tbody, thead {
+    width: 100% !important;
+  }
+
+  .receipt-order-print {
+    width: 100% !important;
+    font-size: 14px;
+  }
+
+  table, table tr th, table tr td {
+    border: 0.05rem solid #000;
+    font-size: 12px;
+  }
+
+}
+
+.receipt-order-print
+  padding 12px
+  line-height 1.8
+
+  .summary
+    display flex
+    flex-wrap wrap
+
+    .col1
+      width 50%
+
+  .title
+    font-size 18px
+    text-align center
+
+  .common-table
+    td, th
+      border-color black
+</style>
\ No newline at end of file
diff --git a/src/views/wms/receiptOrder/dashboard.vue b/src/views/wms/receiptOrder/dashboard.vue
new file mode 100644
index 0000000..4f718b1
--- /dev/null
+++ b/src/views/wms/receiptOrder/dashboard.vue
@@ -0,0 +1,472 @@
+<template>
+	<div>
+		<el-form class="ry_form" v-show="showSearch" :inline="true" label-width="100px" :model="queryParams" ref="queryForm" size="medium">
+			<el-form-item label="入库状态" prop="receiptOrderStatus">
+				<DictRadio
+					v-model="queryParams.receiptOrderStatus"
+					:radioData="dict.type.wms_receipt_status"
+					:showAll="'all'"
+					size="small"
+					@change="handleQuery"
+				></DictRadio>
+			</el-form-item>
+			<el-form-item label="入库类型" prop="receiptOrderType">
+				<DictRadio
+					v-model="queryParams.receiptOrderType"
+					:radioData="dict.type.wms_receipt_type"
+					:showAll="'all'"
+					size="small"
+					@change="handleQuery"
+				></DictRadio>
+			</el-form-item>
+			<el-form-item label="入库单号" prop="receiptOrderNo">
+				<el-input
+					v-model.trim="queryParams.receiptOrderNo"
+					clearable="clearable"
+					placeholder="请输入入库单号"
+					size="small"
+					@keyup.enter.native="handleQuery"
+				></el-input>
+			</el-form-item>
+			<el-form-item label="订单号" prop="orderNo">
+				<el-input
+					v-model.trim="queryParams.orderNo"
+					clearable="clearable"
+					placeholder="请输入订单号"
+					size="small"
+					@keyup.enter.native="handleQuery"
+				></el-input>
+			</el-form-item>
+			<el-form-item label="供应商" prop="supplierId">
+				<WmsSupplierSelect v-model="queryParams.supplierId" size="small"></WmsSupplierSelect>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<el-row class="mb8" :gutter="10">
+			<el-col :span="1.5">
+				<el-button v-hasPermi="['wms:receiptOrder:add']" icon="el-icon-plus" plain="plain" size="mini" type="primary" @click="handleAdd()"
+					>创建入库单
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button icon="el-icon-check" size="mini" type="warning" :disabled="!waveAble" @click="handleWave()">批量入库 </el-button>
+			</el-col>
+			<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+		<WmsTable v-loading="loading" :data="wmsReceiptOrderList" @selection-change="handleSelectionChange">
+			<el-table-column align="center" type="selection" width="55"></el-table-column>
+			<el-table-column v-if="columns[0].visible" align="center" label="入库单号" prop="receiptOrderNo"></el-table-column>
+			<el-table-column v-if="columns[1].visible" align="center" label="入库类型">
+				<template slot-scope="scope">
+					<el-tag effect="plain" size="medium" :type="getReceiptOrderTypeTag(scope.row)">{{ getReceiptOrderType(scope.row) }} </el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column v-if="columns[2].visible" align="center" :formatter="getSupplier" label="供应商"></el-table-column>
+			<el-table-column v-if="columns[3].visible" align="center" label="订单号" prop="orderNo"></el-table-column>
+			<el-table-column v-if="columns[4].visible" align="center" label="入库状态">
+				<template slot-scope="scope">
+					<el-tag effect="plain" size="medium" :type="getReceiptOrderStatusTag(scope.row)"
+						>{{ getReceiptOrderStatus(scope.row) }}
+					</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column v-if="columns[5].visible" align="center" label="批次号" prop="waveNo"></el-table-column>
+			<el-table-column v-if="columns[6].visible" align="center" label="备注" prop="remark">
+				<template v-slot="{ row }">
+					<el-popover placement="left" width="300" trigger="hover" :content="row.remark" popper-class="popperOptions">
+						<p class="showOverTooltip" slot="reference">{{ row.remark }}</p>
+					</el-popover>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+				<template v-slot="{ row }">
+					<el-button
+						v-hasPermi="['wms:receiptOrder:edit']"
+						v-if="ReceiptOrderConstant.Status.NOT_IN === row.receiptOrderStatus && !row.waveNo"
+						icon="el-icon-edit"
+						size="mini"
+						type="text"
+						@click.stop="handleUpdate(row)"
+						>修改
+					</el-button>
+					<el-button
+						v-hasPermi="['wms:receiptOrder:remove']"
+						icon="el-icon-delete"
+						v-if="!row.waveNo"
+						size="mini"
+						type="text"
+						@click.stop="handleDelete(row)"
+						>删除
+					</el-button>
+					<el-button
+						v-hasPermi="['wms:receiptOrder:status']"
+						v-if="row.detailCount && !row.waveNo"
+						icon="el-icon-truck"
+						size="mini"
+						type="text"
+						@click.stop="handleStatus(row)"
+						>发货/入库
+					</el-button>
+					<el-button icon="el-icon-print" size="mini" type="text" @click.stop="printOut(row, true)">打印</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+		<pagination
+			v-show="total > 0"
+			:limit.sync="queryParams.pageSize"
+			:page.sync="queryParams.pageNum"
+			:total="total"
+			@pagination="getList"
+		></pagination>
+		<el-dialog :visible.sync="modalObj.show" :title="modalObj.title" :width="modalObj.width">
+			<template v-if="modalObj.component === 'print-type'">
+				<el-radio-group v-model="modalObj.form.value">
+					<el-radio :label="1">lodop打印</el-radio>
+					<el-radio :label="2">浏览器打印</el-radio>
+				</el-radio-group>
+			</template>
+			<template v-if="modalObj.form.value === 2 || modalObj.component === 'window-print-preview'">
+				<receipt-order-print :row="modalObj.form.row" ref="receiptOrderPrintRef"></receipt-order-print>
+			</template>
+			<template slot="footer" class="dialog-footer">
+				<el-button @click="modalObj.cancel">取消</el-button>
+				<el-button @click="modalObj.ok" type="primary">确认</el-button>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listWmsReceiptOrder, delWmsReceiptOrder, exportWmsReceiptOrder, getWmsReceiptOrder } from '@/api/wms/receiptOrder'
+import { mapGetters } from 'vuex'
+import { STOCK_IN_TEMPLATE } from '@/utils/printData'
+import ReceiptOrderPrint from '@/views/wms/receiptOrder/ReceiptOrderPrint'
+import { ReceiptOrderConstant } from '@/constant/ReceiptOrderConstant.ts'
+import { addWaveForReceipt } from '@/api/wms/wave'
+
+export default {
+	name: 'WmsReceiptOrder',
+	components: { ReceiptOrderPrint },
+	dicts: ['wms_receipt_type', 'wms_receipt_status'],
+	computed: {
+		ReceiptOrderConstant() {
+			return ReceiptOrderConstant
+		},
+		...mapGetters(['supplierMap', 'warehouseMap', 'areaMap', 'rackMap', 'userId']),
+		receiptTypeMap() {
+			let obj = this.dict.type.wms_receipt_type.map((item) => [item.value, item.label])
+			let map = new Map(obj)
+			return map
+		},
+		receiptStatusMap() {
+			let obj = this.dict.type.wms_receipt_status.map((item) => [item.value, item.label])
+			let map = new Map(obj)
+			return map
+		},
+	},
+	data() {
+		return {
+			waveAble: false,
+			modalObj: {
+				title: '选择打印方式',
+				width: '520px',
+				component: null,
+				form: {
+					value: null,
+					row: null,
+				},
+				ok: () => {},
+				cancel: () => {},
+			},
+			// 遮罩层
+			loading: true,
+			// 导出遮罩层
+			exportLoading: false,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 入库单表格数据
+			wmsReceiptOrderList: [],
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				receiptOrderNo: null,
+				receiptOrderType: null,
+				supplierId: null,
+				orderNo: null,
+				receiptOrderStatus: null,
+			},
+			// 表单校验
+			rules: {},
+			columns: [
+				{ key: 1, label: '入库单号', visible: true },
+				{ key: 2, label: '入库类型', visible: true },
+				{ key: 3, label: '供应商', visible: true },
+				{ key: 4, label: '订单号', visible: true },
+				{ key: 5, label: '入库状态', visible: true },
+				{ key: 6, label: '批次号', visible: true },
+				{ key: 7, label: '备注', visible: true },
+			],
+		}
+	},
+	async created() {},
+	methods: {
+		handleWave() {
+			addWaveForReceipt({ ids: this.ids }).then((res) => {
+				this.$emit('switchTab', {})
+				this.getList()
+			})
+		},
+		getReceiptOrderTypeTag(row) {
+			switch (row.receiptOrderType) {
+				case 1:
+					return 'success'
+				case 2:
+					return 'warning'
+				case 3:
+					return 'danger'
+			}
+		},
+		getReceiptOrderStatusTag(row) {
+			switch (row.receiptOrderStatus) {
+				case 0:
+					return 'info'
+				case 1:
+					return 'warning'
+				case 2:
+					return 'danger'
+				case 3:
+					return 'success'
+			}
+		},
+		getReceiptOrderType(row) {
+			return this.receiptTypeMap.get(row.receiptOrderType + '')
+		},
+		getReceiptOrderStatus(row) {
+			return this.receiptStatusMap.get(row.receiptOrderStatus + '')
+		},
+		getSupplier(row, column) {
+			return this.supplierMap.get(row.supplierId)
+		},
+		/** 查询入库单列表 */
+		getList() {
+			this.loading = true
+			const { pageNum, pageSize } = this.queryParams
+			const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }
+			const pageReq = { page: pageNum - 1, size: pageSize }
+			listWmsReceiptOrder(query, pageReq).then((response) => {
+				const { content, totalElements } = response
+				this.wmsReceiptOrderList = content
+				this.total = totalElements
+				this.loading = false
+			})
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+			this.waveAble = selection.length > 1
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.$router.push({ path: '/wms/receiptOrder/edit' })
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			const id = row.id || this.ids
+			this.$router.push({ path: '/wms/receiptOrder/edit', query: { id } })
+		},
+		handleStatus(row) {
+			const id = row.id || this.ids
+			this.$router.push({ path: '/wms/receiptOrder/status', query: { id } })
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const ids = row.id || this.ids
+			const receiptOrderNo = row.receiptOrderNo
+			this.$modal
+				.confirm('是否确认删除入库单编号为"' + receiptOrderNo + '"的数据项？')
+				.then(function () {
+					return delWmsReceiptOrder(ids)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.catch(() => {})
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			const queryParams = this.queryParams
+			this.$modal
+				.confirm('是否确认导出所有入库单数据项？')
+				.then(() => {
+					this.exportLoading = true
+					return exportWmsReceiptOrder(queryParams)
+				})
+				.then((response) => {
+					this.$download.download(response)
+					this.exportLoading = false
+				})
+				.catch(() => {})
+		},
+		printOut(row, print) {
+			this.modalObj = {
+				show: true,
+				title: '选择打印方式',
+				width: '520px',
+				component: 'print-type',
+				form: {
+					value: 1,
+					row,
+				},
+				ok: () => {
+					this.modalObj.show = false
+					if (this.modalObj.form.value === 1) {
+						this.doPrintOut(row, false)
+					} else {
+						this.windowPrintOut(row, print)
+					}
+				},
+				cancel: () => {
+					this.modalObj.show = false
+				},
+			}
+		},
+		windowPrintOut(row, print) {
+			this.getOrderDetail(row).then((res) => {
+				if (print) {
+					this.modalObj.form.row = res
+					this.$nextTick(() => {
+						this.$refs['receiptOrderPrintRef'].start()
+					})
+					return
+				}
+				this.$nextTick(() => {
+					this.modalObj = {
+						show: true,
+						title: '浏览器打印预览',
+						width: '800px',
+						component: 'window-print-preview',
+						form: {
+							value: 1,
+							row,
+							print,
+						},
+						ok: () => {
+							this.modalObj.show = false
+						},
+						cancel: () => {
+							this.modalObj.show = false
+						},
+					}
+				})
+			})
+		},
+		doPrintOut(row, print) {
+			this.getOrderDetail(row).then((result) => {
+				if (print) {
+					this.$lodop.print(STOCK_IN_TEMPLATE, [result])
+				} else {
+					this.$lodop.preview(STOCK_IN_TEMPLATE, [result])
+				}
+			})
+		},
+		getOrderDetail(row) {
+			//查询详情
+			return getWmsReceiptOrder(row.id).then((response) => {
+				const { details, items } = response
+				const map = {}
+				;(items || []).forEach((it) => {
+					map[it.id] = it
+				})
+				let detailList = [],
+					totalCount = 0
+				details &&
+					details.forEach((it) => {
+						const prod = map[it.itemId]
+						totalCount += it.planQuantity
+						let place = this.warehouseMap.get(it.warehouseId)
+						if (it.areaId) {
+							place += `/${this.areaMap.get(it.areaId)}`
+						}
+						if (it.rackId) {
+							place += `/${this.rackMap.get(it.rackId)}`
+						}
+						detailList.push({
+							itemName: prod.itemName,
+							itemNo: prod.itemNo,
+							itemType: prod.itemType,
+							planQuantity: it.planQuantity,
+							place,
+						})
+					})
+				return {
+					remark: row.remark,
+					receiptOrderNo: row.receiptOrderNo,
+					supplierName: this.supplierMap.get(row.supplierId),
+					orderNo: row.orderNo,
+					receiptType: this.receiptTypeMap.get(row.receiptOrderType + ''),
+					createTime: row.createTime,
+					details: detailList,
+					totalCount,
+				}
+			})
+		},
+	},
+}
+</script>
+<style lang="stylus">
+.showOverTooltip {
+	display: -webkit-box;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	/*这里是3行*/
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
+}
+
+.popperOptions[x-placement^=left] .popper__arrow::after {
+	border-left-color: #565D6B;
+}
+
+.popperOptions[x-placement^=right] .popper__arrow::after {
+	border-right-color: #565D6B;
+}
+
+.popperOptions[x-placement^=bottom] .popper__arrow::after {
+	border-bottom-color: #565D6B;
+}
+
+.popperOptions[x-placement^=top] .popper__arrow::after {
+	border-top-color: #565D6B;
+}
+
+.popperOptions {
+	background-color: #565D6B;
+	color: #FFFFFF;
+	border: #565D6B;
+}
+</style>
diff --git a/src/views/wms/receiptOrder/edit.vue b/src/views/wms/receiptOrder/edit.vue
new file mode 100644
index 0000000..1f1f524
--- /dev/null
+++ b/src/views/wms/receiptOrder/edit.vue
@@ -0,0 +1,313 @@
+<template>
+	<div class="receipt-order-edit-wrapper app-container">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="入库单号" prop="receiptOrderNo">
+					<el-input class="w200" v-model="form.receiptOrderNo" placeholder="入库单号" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="入库类型" prop="receiptOrderType">
+					<el-radio-group v-model="form.receiptOrderType">
+						<el-radio-button v-for="dict in dict.type.wms_receipt_type" :key="dict.value" :label="dict.value">
+							{{dict.label}}
+						</el-radio-button>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="供应商" prop="supplierId">
+					<WmsSupplierSelect v-model="form.supplierId"></WmsSupplierSelect>
+				</el-form-item>
+				<el-form-item label="金额" prop="payableAmount" v-show="hasSupplier">
+					<el-input-number v-model="form.payableAmount" :precision="2" :min="0" label="请输入金额"></el-input-number>
+				</el-form-item>
+				<el-form-item label="订单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入订单号"></el-input>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="备注...100个字符以内" rows="3" maxlength="100" type="textarea" show-word-limit="show-word-limit"></el-input>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">
+					<el-row class="mb8 mt10" :gutter="10">
+						<el-col :span="1.5">
+							<div class="flex-one large-tip bolder-font">物料明细</div>
+						</el-col>
+						<el-col :span="1.5">
+							<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+								批量设置仓库/库区
+							</el-button>
+						</el-col>
+					</el-row>
+				</div>
+				<div class="ops">
+					<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+				</div>
+			</div>
+			<div class="table">
+				<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55" align="center"></el-table-column>
+					<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+					<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+					<el-table-column label="物料类型" align="center" prop="prod.itemType"></el-table-column>
+					<el-table-column label="计划数量" align="center" prop="planQuantity" width="150">
+						<template slot-scope="scope">
+							<el-input-number v-model="scope.row.planQuantity" placeholder="计划数量" :min="1" size="small" :max="2147483647"></el-input-number>
+						</template>
+					</el-table-column>
+					<el-table-column label="仓库/库区" align="center" width="200">
+						<template slot-scope="scope">
+							<WmsWarehouseCascader v-model="scope.row.place" size="small"></WmsWarehouseCascader>
+						</template>
+					</el-table-column>
+					<el-table-column label="金额" align="center" width="150">
+						<template slot-scope="scope">
+							<el-input-number v-model="scope.row.money" :precision="2" @change="selectMoney" size="small" :min="0" label="请输入金额"></el-input-number>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" align="center">
+						<template slot-scope="scope">
+							<a class="red" @click="form.details.splice(scope.$index, 1)">删除</a>
+						</template>
+					</el-table-column>
+				</WmsTable>
+				<!-- <el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty> -->
+			</div>
+			<div class="tc mt16">
+				<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary">保存</el-button>
+			</div>
+		</div>
+		<el-dialog :visible="modalObj.show" :title="modalObj.title" :width="modalObj.width" @close="modalObj.cancel">
+			<template v-if="modalObj.component === 'add-item'">
+				<item-select ref="item-select" :data="this.form.details"></item-select>
+			</template>
+			<span slot="footer">
+				<el-button v-if="modalObj.cancel" @click="modalObj.cancel">取消</el-button>
+				<el-button v-if="modalObj.ok" type="primary" @click="modalObj.ok">确认</el-button>
+			</span>
+		</el-dialog>
+		<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+	</div>
+</template>
+
+<script>
+	import { addOrUpdateWmsReceiptOrder, getWmsReceiptOrder } from '@/api/wms/receiptOrder'
+	import { randomId } from '@/utils/RandomUtils'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+
+	export default {
+		name: 'WmsReceiptOrder',
+		components: { BatchWarehouseDialog, ItemSelect },
+		dicts: ['wms_receipt_type'],
+		data() {
+			return {
+				ids: [],
+				// 非多个禁用
+				multiple: true,
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchForm: {
+					place: []
+				},
+				// 表单参数
+				form: {
+					details: [],
+					payableAmount: 0.00,
+					supplierId: null
+				},
+				// 表单校验
+				rules: {},
+				modalObj: {
+					show: false,
+					title: '',
+					width: '50%',
+					component: null,
+					model: {},
+					ok: () => {},
+					cancel: () => {}
+				},
+				hasSupplier: false
+			}
+		},
+		watch: {
+			'form.supplierId': {
+				immediate: true,
+				handler(value) {
+					if (value) {
+						this.hasSupplier = true
+					} else {
+						this.hasSupplier = false
+					}
+				}
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.reset()
+			}
+		},
+		methods: {
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory() {
+				const { details } = this.form
+				if (!details || details.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+			},
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.details.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it.place = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			/** 统计入库单金额 */
+			selectMoney() {
+				let sum = 0;
+				this.form.details.map(item => {
+					if (!isNaN(parseFloat(item.money))) {
+						sum += item.money
+					}
+					return item.money
+				})
+				this.form.payableAmount = sum
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/receiptOrder' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs['form'].validate(valid => {
+					if (!valid) {
+						return
+					}
+					const details = this.form.details.map(it => {
+						console.log(it.place)
+						if (it.place) {
+							it.prod.warehouseId = it.place[0]
+							it.prod.areaId = it.place[1]
+							it.prod.rackId = it.place[2]
+						} else {
+							it.prod.warehouseId = null
+							it.prod.areaId = null
+							it.prod.rackId = null
+						}
+						return {
+							itemId: it.prod.id,
+							rackId: it.prod.rackId,
+							areaId: it.prod.areaId,
+							money: it.money,
+							warehouseId: it.prod.warehouseId,
+							planQuantity: it.planQuantity,
+							realQuantity: it.realQuantity,
+							receiptOrderStatus: it.receiptOrderStatus,
+							delFlag: 0
+						}
+					})
+					const req = { ...this.form, details }
+					addOrUpdateWmsReceiptOrder(req).then(response => {
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel();
+					})
+				})
+			},
+			loadDetail(id) {
+				getWmsReceiptOrder(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					});
+					details && details.forEach(it => it.prod = map[it.itemId])
+					this.form = {
+						...response,
+						details
+					}
+				})
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					receiptOrderNo: 'R-' + randomId(),
+					receiptOrderType: 1,
+					supplierId: null,
+					orderNo: null,
+					receiptOrderStatus: 0,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					details: []
+				}
+				this.resetForm('form')
+			},
+			confirmSelectItem() {
+				const value = this.$refs['item-select'].getRightList()
+				this.form.details = value.map(it => {
+					return {
+						id: it.id,
+						prod: it,
+						planQuantity: null,
+						realQuantity: null,
+						place: [],
+						receiptOrderStatus: 0,
+						delFlag: 0
+					}
+				})
+				this.closeModal()
+			},
+			closeModal() {
+				this.modalObj.show = false
+			},
+			showAddItem() {
+				try {
+					this.$refs['item-select'].initDetailsList(this.form.details)
+				} catch (err) {
+
+				}
+				const ok = () => this.confirmSelectItem()
+				const cancel = () => this.closeModal()
+				this.modalObj = {
+					show: true,
+					title: '添加物料',
+					width: '50%',
+					component: 'add-item',
+					model: {},
+					ok,
+					cancel
+				}
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.receipt-order-edit-wrapper
+  .receipt-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/receiptOrder/index.vue b/src/views/wms/receiptOrder/index.vue
new file mode 100644
index 0000000..e0e3b8d
--- /dev/null
+++ b/src/views/wms/receiptOrder/index.vue
@@ -0,0 +1,24 @@
+<template>
+	<div class="app-container">
+		<el-tabs v-model="activeName">
+			<el-tab-pane label="订单管理" name="first"></el-tab-pane>
+			<el-tab-pane label="批量入库" name="second"></el-tab-pane>
+		</el-tabs>
+		<Dashboard v-if="activeName === 'first'" @switchTab="activeName = 'second'"></Dashboard>
+		<wave v-if="activeName === 'second'"></wave>
+	</div>
+</template>
+
+<script>
+	import wave from '@/views/wms/wave/receipt/index.vue'
+	import Dashboard from '@/views/wms/receiptOrder/dashboard.vue'
+
+	export default {
+		components: { Dashboard, wave },
+		data() {
+			return {
+				activeName: 'first',
+			}
+		},
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wms/receiptOrder/status.vue b/src/views/wms/receiptOrder/status.vue
new file mode 100644
index 0000000..b581347
--- /dev/null
+++ b/src/views/wms/receiptOrder/status.vue
@@ -0,0 +1,318 @@
+<template>
+	<div class="receipt-order-status-wrapper app-container" v-loading="loading">
+		<div class="receipt-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="入库单号" prop="receiptOrderNo">{{ form.receiptOrderNo }}</el-form-item>
+				<el-form-item label="入库状态" prop="receiptOrderNo">{{ receiptStatusMap.get(form.receiptOrderStatus + '') }}
+				</el-form-item>
+				<el-form-item label="入库类型" prop="receiptOrderType">
+					{{ selectDictLabel(dict.type.wms_receipt_type, form.receiptOrderType) }}
+				</el-form-item>
+				<el-form-item label="供应商" prop="supplierId">{{ supplierMap.get(form.supplierId) }}</el-form-item>
+				<el-form-item label="订单号" prop="orderNo">{{ form.orderNo }}</el-form-item>
+				<el-form-item label="备注" prop="remark">{{ form.remark }}</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<el-row class="mb8 mt10" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">物料明细</div>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+						批量设置仓库/库区
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="batch">批量设置出库状态
+					</el-button>
+				</el-col>
+
+			</el-row>
+
+			<el-dialog title="请选择入库状态" :visible.sync="open" width="50%" append-to-body="append-to-body">
+				<DictRadio v-model="dialogStatus" :radioData="dialogStatusRange"></DictRadio>
+				<div class="dialog-footer" slot="footer">
+					<el-button type="primary" @click="dialogConfirm">确 定</el-button>
+					<el-button @click="cancelDialog">取 消</el-button>
+				</div>
+			</el-dialog>
+			<div class="table">
+				<el-form ref="form" :model="form" :show-message="false">
+					<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+						<el-table-column type="selection" width="55" align="center"></el-table-column>
+						<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+						<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+						<el-table-column label="物料类型" align="center" prop="prod.itemType" class="mb20"></el-table-column>
+						<el-table-column label="计划数量" align="center" prop="planQuantity" class="mb20"></el-table-column>
+						<el-table-column label="实际数量" align="center" width="150">
+							<template slot-scope="scope" class="mb20">
+								<el-input-number v-model="scope.row.realQuantity" :min="1" :max="2147483647" size="small" :disabled="scope.row.finish"></el-input-number>
+							</template>
+						</el-table-column>
+						<el-table-column label="仓库/库区" align="center" width="200">
+							<template slot-scope="scope">
+								<el-form-item :prop=" 'details.' + scope.$index + '.place' " :rules="[{ required: true, message: '请选择仓库/库区', trigger: 'change' }]" style="margin-bottom: 0!important;">
+									<WmsWarehouseCascader v-model="scope.row.place" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+								</el-form-item>
+							</template>
+						</el-table-column>
+						<el-table-column label="入库状态" width="150">
+							<template slot-scope="{ row }">
+								<DictSelect v-model="row.receiptOrderStatus" :options="row.range" size="small" @change="setReceiptOrderStatus" :disabled="row.finish"></DictSelect>
+							</template>
+						</el-table-column>
+					</WmsTable>
+				</el-form>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary" :disabled="finish">保存</el-button>
+			</div>
+		</div>
+		<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+	</div>
+</template>
+
+<script>
+	import { addOrUpdateWmsReceiptOrder, getWmsReceiptOrder } from '@/api/wms/receiptOrder'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import { mapGetters } from 'vuex'
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+	import { ReceiptOrderConstant } from "@/constant/ReceiptOrderConstant.ts";
+
+	export default {
+		name: 'WmsReceiptOrder',
+		components: { BatchWarehouseDialog, ItemSelect },
+		dicts: ['wms_receipt_type', 'wms_receipt_status'],
+		computed: {
+			ReceiptOrderConstant() {
+				return ReceiptOrderConstant
+			},
+			...mapGetters(['supplierMap']),
+			receiptStatusMap() {
+				let obj = this.dict.type.wms_receipt_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			mergeDetailStatusArray() {
+				const arr = this.sourceDetails || []
+				return [...new Set(arr.filter(it => it.receiptOrderStatus !== null).map(it => it.receiptOrderStatus))]
+			},
+			dialogStatusRange() {
+				if (this.mergeDetailStatusArray.length !== 1) {
+					return []
+				}
+				return this.getRange(this.mergeDetailStatusArray[0])
+			}
+		},
+		data() {
+			return {
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchForm: {
+					place: []
+				},
+				open: false,
+				// 遮罩层
+				loading: true,
+				ids: [],
+				// 表单参数
+				form: {
+					details: []
+				},
+				sourceDetails: [],
+				// 表单校验
+				rules: {},
+				dialogStatus: null,
+				// 非多个禁用
+				multiple: true,
+				finish: false,
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.loadDetail(id)
+			} else {
+				this.cancel()
+			}
+		},
+		methods: {
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory() {
+				const { details } = this.form
+				if (!details || details.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+			},
+			/** 批量设置仓库/库区 完成事件 */
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.details.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it.place = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			dialogConfirm() {
+				if (!this.dialogStatus) {
+					this.$modal.alert('请选择入库状态')
+					return
+				}
+				this.form.details.forEach(detail => {
+					if (this.ids.includes(detail.id)) {
+						detail.receiptOrderStatus = this.dialogStatus
+					}
+				})
+				this.setReceiptOrderStatus()
+				this.cancelDialog()
+			},
+			cancelDialog() {
+				this.open = false
+				this.dialogStatus = null
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			batch() {
+				if (this.multiple) {
+					this.$modal.alert('请先选择物料')
+				} else {
+					this.open = true
+				}
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/receiptOrder' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs['form'].validate((valid, msg) => {
+					if (!valid) {
+						this.$notify({
+							title: '警告',
+							message: "请完善表单信息",
+							type: 'warning'
+						});
+						return
+					}
+					const details = this.form.details.map(it => {
+						if (it.place) {
+							it.prod.warehouseId = it.place[0]
+							it.prod.areaId = it.place[1]
+							it.prod.rackId = it.place[2]
+						} else {
+							it.prod.warehouseId = null
+							it.prod.areaId = null
+							it.prod.rackId = null
+						}
+						return {
+							id: it.id,
+							itemId: it.prod.id,
+							rackId: it.prod.rackId,
+							areaId: it.prod.areaId,
+							warehouseId: it.prod.warehouseId,
+							planQuantity: it.planQuantity,
+							realQuantity: it.realQuantity,
+							receiptOrderStatus: it.receiptOrderStatus,
+							delFlag: 0
+						}
+					})
+					const req = { ...this.form, details }
+					addOrUpdateWmsReceiptOrder(req).then(response => {
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel()
+					})
+				})
+			},
+			setReceiptOrderStatus() {
+				this.form.receiptOrderStatus = this.getReceiptOrderStatus()
+			},
+			getReceiptOrderStatus() {
+				let receiptOrderStatusArray = []
+				this.form.details.map(it => {
+					receiptOrderStatusArray.push(Number(it.receiptOrderStatus))
+				})
+				if (receiptOrderStatusArray.length == 0) {
+					return 0
+				}
+				for (let i = 0; i < 5; i++) {
+					if (receiptOrderStatusArray.every((item) => item == i)) {
+						return i
+					}
+				}
+				if (receiptOrderStatusArray.includes(3) || receiptOrderStatusArray.includes(2)) {
+					if (receiptOrderStatusArray.includes(0) || receiptOrderStatusArray.includes(1)) {
+						return 2
+					}
+				}
+				if (receiptOrderStatusArray.includes(1)) {
+					return 1
+				} else if (receiptOrderStatusArray.includes(2)) {
+					return 2
+				} else if (receiptOrderStatusArray.includes(0)) {
+					return 0
+				} else if (receiptOrderStatusArray.includes(3)) {
+					return 3
+				}
+			},
+			loadDetail(id) {
+				this.loading = true
+				getWmsReceiptOrder(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					details && details.forEach(it => {
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place;
+						}
+						it.range = this.getRange(it.receiptOrderStatus)
+						it.finish = it.receiptOrderStatus === 3
+					})
+					this.finish = details.filter(it => !it.finish)?.length === 0
+					this.sourceDetails = details.map(it => ({ ...it }))
+					this.form = {
+						...response,
+						details
+					}
+				}).finally(() => {
+					this.loading = false
+				})
+			},
+			getRange(status) {
+				const arr = this.dict.type.wms_receipt_status
+				if (status === 4 || status === 3) {
+					return arr.filter(it => +it.value === status).map(it => ({ label: it.label, value: it.value }))
+				}
+				if (status === 2) {
+					return arr.filter(it => +it.value >= status && +it.value !== 4).map(it => ({
+						label: it.label,
+						value: it.value
+					}))
+				}
+				return arr.filter(it => +it.value >= status).map(it => ({ label: it.label, value: it.value }))
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.receipt-order-status-wrapper
+  .receipt-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/receiptOrderDetail/index.vue b/src/views/wms/receiptOrderDetail/index.vue
new file mode 100644
index 0000000..f78e845
--- /dev/null
+++ b/src/views/wms/receiptOrderDetail/index.vue
@@ -0,0 +1,292 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="入库单号" prop="receiptOrderId">
+				<el-input v-model="queryParams.receiptOrderId" placeholder="请输入入库单号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<el-input v-model="queryParams.itemId" placeholder="请输入物料" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="计划数量" prop="planQuantity">
+				<el-input v-model="queryParams.planQuantity" placeholder="请输入计划数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="实际数量" prop="realQuantity">
+				<el-input v-model="queryParams.realQuantity" placeholder="请输入实际数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属货架" prop="rackId">
+				<el-input v-model="queryParams.rackId" placeholder="请输入所属货架" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属仓库" prop="warehouseId">
+				<el-input v-model="queryParams.warehouseId" placeholder="请输入所属仓库" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="所属库区" prop="areaId">
+				<el-input v-model="queryParams.areaId" placeholder="请输入所属库区" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="入库状态" prop="receiptOrderStatus">
+					<el-select v-model="queryParams.receiptOrderStatus" placeholder="请选择入库状态" clearable size="small">
+						<el-option label="请选择字典生成" value="" />
+					</el-select>
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:receiptOrderDetail:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:receiptOrderDetail:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:receiptOrderDetail:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:receiptOrderDetail:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsReceiptOrderDetailList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="入库单号" align="center" prop="receiptOrderId" v-if="columns[0].visible" />
+			<el-table-column label="物料" align="center" prop="itemId" v-if="columns[1].visible" />
+			<el-table-column label="计划数量" align="center" prop="planQuantity" v-if="columns[2].visible" />
+			<el-table-column label="实际数量" align="center" prop="realQuantity" v-if="columns[3].visible" />
+			<el-table-column label="所属货架" align="center" prop="rackId" v-if="columns[4].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
+			<el-table-column label="所属仓库" align="center" prop="warehouseId" v-if="columns[6].visible" />
+			<el-table-column label="所属库区" align="center" prop="areaId" v-if="columns[7].visible" />
+			<el-table-column label="入库状态" align="center" prop="receiptOrderStatus" v-if="columns[8].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:receiptOrderDetail:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:receiptOrderDetail:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改入库单详情对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="入库单号" prop="receiptOrderId">
+					<el-input v-model="form.receiptOrderId" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="物料" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料" />
+				</el-form-item>
+				<el-form-item label="计划数量" prop="planQuantity">
+					<el-input v-model="form.planQuantity" placeholder="请输入计划数量" />
+				</el-form-item>
+				<el-form-item label="实际数量" prop="realQuantity">
+					<el-input v-model="form.realQuantity" placeholder="请输入实际数量" />
+				</el-form-item>
+				<el-form-item label="所属货架" prop="rackId">
+					<el-input v-model="form.rackId" placeholder="请输入所属货架" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+				<el-form-item label="所属仓库" prop="warehouseId">
+					<el-input v-model="form.warehouseId" placeholder="请输入所属仓库" />
+				</el-form-item>
+				<el-form-item label="所属库区" prop="areaId">
+					<el-input v-model="form.areaId" placeholder="请输入所属库区" />
+				</el-form-item>
+				<el-form-item label="入库状态">
+					<el-radio-group v-model="form.receiptOrderStatus">
+						<el-radio label="1">请选择字典生成</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsReceiptOrderDetail, getWmsReceiptOrderDetail, delWmsReceiptOrderDetail, addWmsReceiptOrderDetail, updateWmsReceiptOrderDetail, exportWmsReceiptOrderDetail } from "@/api/wms/receiptOrderDetail";
+
+	export default {
+		name: "WmsReceiptOrderDetail",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 入库单详情表格数据
+				wmsReceiptOrderDetailList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					receiptOrderId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+					rackId: null,
+					warehouseId: null,
+					areaId: null,
+					receiptOrderStatus: null
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "入库单号", visible: true },
+					{ key: 2, label: "物料", visible: true },
+					{ key: 3, label: "计划数量", visible: true },
+					{ key: 4, label: "实际数量", visible: true },
+					{ key: 5, label: "所属货架", visible: true },
+					{ key: 7, label: "备注", visible: true },
+					{ key: 12, label: "所属仓库", visible: false },
+					{ key: 13, label: "所属库区", visible: false },
+					{ key: 14, label: "入库状态", visible: false },
+				],
+				showMoreCondition: false
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询入库单详情列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsReceiptOrderDetail(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsReceiptOrderDetailList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					receiptOrderId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+					rackId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					warehouseId: null,
+					areaId: null,
+					receiptOrderStatus: 0
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加入库单详情";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsReceiptOrderDetail(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改入库单详情";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsReceiptOrderDetail(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsReceiptOrderDetail(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除入库单详情编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsReceiptOrderDetail(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有入库单详情数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsReceiptOrderDetail(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/shipmentOrder/ShipmentOrderPrint.vue b/src/views/wms/shipmentOrder/ShipmentOrderPrint.vue
new file mode 100644
index 0000000..f468a4d
--- /dev/null
+++ b/src/views/wms/shipmentOrder/ShipmentOrderPrint.vue
@@ -0,0 +1,102 @@
+<template>
+	<div class="receipt-order-print" ref="receiptOrderPrintRef" hidden="hidden">
+		<div class="title">{{ row.shipmentOrderNo }}</div>
+		<div class="summary">
+			<div class="col1">客戶: {{ row.customerName }}</div>
+			<div class="col1">订单号: {{ row.orderNo }}</div>
+			<div class="col1">出库类型: {{ row.shipmentType }}</div>
+			<div class="col1">日期: {{ row.createTime }}</div>
+		</div>
+		<table class="common-table">
+			<tr>
+				<th>物料名</th>
+				<th>物料编号</th>
+				<th>物料类型</th>
+				<th>数量</th>
+				<th>仓库/库区</th>
+			</tr>
+			<tr v-for="it in row.details">
+				<td>{{ it.itemName || '' }}</td>
+				<td>{{ it.itemNo || '' }}</td>
+				<td>{{ it.itemType || '' }}</td>
+				<td>{{ it.planQuantity }}</td>
+				<td>{{ it.place }}</td>
+			</tr>
+			<tr>
+				<td>合计</td>
+				<td></td>
+				<td></td>
+				<td>{{ row.totalCount }}</td>
+				<td></td>
+			</tr>
+		</table>
+		<div class="foot">
+			<div class="col2">备注: {{ row.remark }}</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		props: ['row'],
+		methods: {
+			start() {
+				this.$print(this.$refs.receiptOrderPrintRef, {}, 'A4')
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" media="print">
+@page {
+  size: auto;
+  margin: 0;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+  }
+
+  table {
+    width 100%
+    table-layout: fixed;
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+
+  table, tbody, thead {
+    width: 100% !important;
+  }
+
+  .receipt-order-print {
+    width: 100% !important;
+    font-size: 14px;
+  }
+
+  table, table tr th, table tr td {
+    border: 0.05rem solid #000;
+    font-size: 12px;
+  }
+
+}
+
+.receipt-order-print
+  padding 12px
+  line-height 1.8
+
+  .summary
+    display flex
+    flex-wrap wrap
+
+    .col1
+      width 50%
+
+  .title
+    font-size 18px
+    text-align center
+
+  .common-table
+    td, th
+      border-color black
+</style>
diff --git a/src/views/wms/shipmentOrder/dashborad.vue b/src/views/wms/shipmentOrder/dashborad.vue
new file mode 100644
index 0000000..ce59d36
--- /dev/null
+++ b/src/views/wms/shipmentOrder/dashborad.vue
@@ -0,0 +1,413 @@
+<template>
+	<div class="">
+		<el-form class="ry_form" v-show="showSearch" :inline="true" label-width="100px" :model="queryParams" ref="queryForm" size="medium">
+			<el-form-item label="出库状态" prop="shipmentOrderStatus">
+				<DictRadio v-model="queryParams.shipmentOrderStatus" :radioData="dict.type.wms_shipment_status" :showAll="'all'" size="small" @change="handleQuery"></DictRadio>
+			</el-form-item>
+			<el-form-item label="出库类型" prop="shipmentOrderType">
+				<DictRadio v-model="queryParams.shipmentOrderType" :radioData="dict.type.wms_shipment_type" :showAll="'all'" size="small" @change="handleQuery"></DictRadio>
+			</el-form-item>
+			<el-form-item label="出库单号" prop="shipmentOrderNo">
+				<el-input v-model="queryParams.shipmentOrderNo" clearable="clearable" placeholder="请输入出库单号" size="small" @keyup.enter.native="handleQuery"></el-input>
+			</el-form-item>
+			<el-form-item label="订单号" prop="orderNo">
+				<el-input v-model="queryParams.orderNo" clearable="clearable" placeholder="请输入订单号" size="small" @keyup.enter.native="handleQuery"></el-input>
+			</el-form-item>
+			<el-form-item label="客户" prop="customerId">
+				<WmsCustomerSelect v-model="queryParams.customerId" size="small"></WmsCustomerSelect>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<el-row class="mb8" :gutter="10">
+			<el-col :span="1.5">
+				<el-button v-hasPermi="['wms:shipmentOrder:add']" icon="el-icon-plus" plain="plain" size="mini" type="primary" @click="handleAdd()">创建出库单
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button icon="el-icon-check" size="mini" type="warning" :disabled="!waveAble" @click="handleWave()">波次作业
+				</el-button>
+			</el-col>
+			<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+		<WmsTable v-loading="loading" :data="wmsShipmentOrderList" @selection-change="handleSelectionChange">
+			<el-table-column align="center" type="selection" width="55"></el-table-column>
+			<el-table-column v-if="columns[0].visible" align="center" label="出库单号" prop="shipmentOrderNo"></el-table-column>
+			<el-table-column v-if="columns[1].visible" align="center" label="出库类型">
+				<template slot-scope="scope">
+					<el-tag effect="plain" size="medium" :type="getShipmentOrderTypeTag(scope.row)">
+						{{ getShipmentOrderType(scope.row) }}
+					</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column v-if="columns[2].visible" align="center" :formatter="getCustomer" label="客户"></el-table-column>
+			<el-table-column v-if="columns[3].visible" align="center" label="订单号" prop="orderNo"></el-table-column>
+			<el-table-column v-if="columns[4].visible" align="center" label="出库状态">
+				<template slot-scope="scope">
+					<el-tag effect="plain" size="medium" :type="getShipmentOrderStatusTag(scope.row)">
+						{{ getShipmentOrderStatus(scope.row) }}
+					</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column v-if="columns[5].visible" align="center" label="波次号" prop="waveNo"></el-table-column>
+			<el-table-column v-if="columns[5].visible" align="center" label="备注" prop="remark">
+				<template v-slot="{ row }">
+					<el-popover placement="left" width="300" trigger="hover" :content="row.remark" popper-class="popperOptions">
+						<p class="showOverTooltip" slot="reference">{{ row.remark }}</p>
+					</el-popover>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+				<template v-slot="{ row }">
+					<el-button v-hasPermi="['wms:shipmentOrder:edit']" v-if="ShipmentOrderConstant.Status.NOT_IN === row.shipmentOrderStatus && !row.waveNo" icon="el-icon-edit" size="mini" type="text" @click.stop="handleUpdate(row)">修改
+					</el-button>
+					<el-button v-hasPermi="['wms:shipmentOrder:remove']" icon="el-icon-delete" size="mini" type="text" v-if="!row.waveNo && row.shipmentOrderStatus !== ShipmentOrderConstant.Status.ALL_IN" @click.stop="handleDelete(row)">删除
+					</el-button>
+					<el-button v-hasPermi="['wms:shipmentOrder:status']" v-if="row.detailCount && !row.waveNo && row.shipmentOrderStatus !== ShipmentOrderConstant.Status.ALL_IN" icon="el-icon-truck" size="mini" type="text" @click.stop="handleStatus(row)">发货/出库
+					</el-button>
+					<el-button icon="el-icon-print" size="mini" type="text" @click.stop="printOut(row,true)">打印</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+		<pagination v-show="total>0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total" @pagination="getList"></pagination>
+		<el-dialog :visible.sync="modalObj.show" :title="modalObj.title" :width="modalObj.width">
+			<template v-if="modalObj.component === 'print-type'">
+				<el-radio-group v-model="modalObj.form.value">
+					<el-radio :label="1">lodop打印</el-radio>
+					<el-radio :label="2">浏览器打印</el-radio>
+				</el-radio-group>
+			</template>
+			<template v-if="modalObj.form.value === 2 || modalObj.component === 'window-print-preview'">
+				<shipment-order-print :row="modalObj.form.row" ref="receiptOrderPrintRef"></shipment-order-print>
+			</template>
+			<template slot="footer" class="dialog-footer">
+				<el-button @click="modalObj.cancel">取消</el-button>
+				<el-button @click="modalObj.ok" type="primary">确认</el-button>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsShipmentOrder,
+		delWmsShipmentOrder,
+		exportWmsShipmentOrder,
+		getWmsShipmentOrder
+	} from '@/api/wms/shipmentOrder'
+	import { mapGetters } from 'vuex'
+	import { STOCK_OUT_TEMPLATE } from '@/utils/printData'
+	import ShipmentOrderPrint from '@/views/wms/shipmentOrder/ShipmentOrderPrint'
+	import { ShipmentOrderConstant } from '@/constant/ShipmentOrderConstant.ts'
+	import { addWave } from "@/api/wms/wave";
+
+	export default {
+		name: 'wmsShipmentOrder',
+		components: { ShipmentOrderPrint },
+		dicts: ['wms_shipment_type', 'wms_shipment_status'],
+		computed: {
+			ShipmentOrderConstant() {
+				return ShipmentOrderConstant
+			},
+			...mapGetters(['customerMap', 'warehouseMap', 'areaMap', 'rackMap']),
+			shipmentTypeMap() {
+				let obj = this.dict.type.wms_shipment_type.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			shipmentStatusMap() {
+				let obj = this.dict.type.wms_shipment_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			}
+		},
+		data() {
+			return {
+				modalObj: {
+					show: false,
+					title: '选择打印方式',
+					width: '520px',
+					component: null,
+					form: {
+						value: null,
+						row: null
+					},
+					ok: () => {},
+					cancel: () => {}
+				},
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 是否显示波次作业按钮
+				waveAble: false,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 出库单表格数据
+				wmsShipmentOrderList: [],
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					shipmentOrderNo: null,
+					shipmentOrderType: null,
+					customerId: null,
+					orderNo: null,
+					shipmentOrderStatus: null
+				},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: '出库单号', visible: true },
+					{ key: 2, label: '出库类型', visible: true },
+					{ key: 3, label: '供应商', visible: true },
+					{ key: 4, label: '订单号', visible: true },
+					{ key: 5, label: '出库状态', visible: true },
+					{ key: 6, label: '备注', visible: true }
+				]
+			}
+		},
+		created() {
+			this.getList()
+		},
+		methods: {
+			handleWave() {
+				addWave({ ids: this.ids }).then(res => {
+					this.$emit('switchTab', {})
+					this.getList()
+				})
+			},
+			getShipmentOrderTypeTag(row) {
+				switch (row.shipmentOrderType) {
+				case ShipmentOrderConstant.Type.SALE:
+					return 'success'
+				case ShipmentOrderConstant.Type.OUTSOURCING:
+					return 'warning'
+				case ShipmentOrderConstant.Type.TRANSFER:
+					return 'danger'
+				}
+			},
+			getShipmentOrderStatusTag(row) {
+				switch (row.shipmentOrderStatus) {
+				case ShipmentOrderConstant.Status.NOT_IN:
+					return 'info'
+				case ShipmentOrderConstant.Status.PART_IN:
+					return 'warning'
+				case ShipmentOrderConstant.Status.DROP:
+					return 'danger'
+				case ShipmentOrderConstant.Status.ALL_IN:
+					return 'success'
+				}
+			},
+			getShipmentOrderType(row) {
+				return this.shipmentTypeMap.get(row.shipmentOrderType + '')
+			},
+			getShipmentOrderStatus(row) {
+				return this.shipmentStatusMap.get(row.shipmentOrderStatus + '')
+			},
+			getCustomer(row, column) {
+				return this.customerMap.get(row.customerId)
+			},
+			/** 查询出库单列表 */
+			getList() {
+				this.loading = true
+				const { pageNum, pageSize } = this.queryParams
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }
+				const pageReq = { page: pageNum - 1, size: pageSize }
+				listWmsShipmentOrder(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsShipmentOrderList = content
+					this.total = totalElements
+					this.loading = false
+				})
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.getList()
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm('queryForm')
+				this.handleQuery()
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.waveAble = selection.length > 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.$router.push({ path: '/wms/shipmentOrder/edit' })
+			},
+			printOut(row, print) {
+				this.modalObj = {
+					show: true,
+					title: '选择打印方式',
+					width: '520px',
+					component: 'print-type',
+					form: {
+						value: 1,
+						row
+					},
+					ok: () => {
+						this.modalObj.show = false
+						if (this.modalObj.form.value === 1) {
+							this.doPrintOut(row, false)
+						} else {
+							this.windowPrintOut(row, print)
+						}
+					},
+					cancel: () => {
+						this.modalObj.show = false
+					}
+				}
+			},
+			doPrintOut(row, print) {
+				this.getDetail(row).then(result => {
+					if (print) {
+						this.$lodop.print(STOCK_OUT_TEMPLATE, [result])
+					} else {
+						this.$lodop.preview(STOCK_OUT_TEMPLATE, [result])
+					}
+				})
+			},
+			windowPrintOut(row, print) {
+				this.getDetail(row).then(res => {
+					if (print) {
+						this.modalObj.form.row = res
+						this.$nextTick(() => {
+							this.$refs['receiptOrderPrintRef'].start()
+						})
+						return
+					}
+					this.$nextTick(() => {
+						this.modalObj = {
+							show: true,
+							title: '浏览器打印预览',
+							width: '800px',
+							component: 'window-print-preview',
+							form: {
+								value: 1,
+								row,
+								print
+							},
+							ok: () => {
+								this.modalObj.show = false
+							},
+							cancel: () => {
+								this.modalObj.show = false
+							}
+						}
+					})
+				})
+			},
+			getDetail(row) {
+				//查询详情
+				return getWmsShipmentOrder(row.id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					let detailList = [],
+						totalCount = 0
+					details && details.forEach(it => {
+						const prod = map[it.itemId]
+						totalCount += it.planQuantity
+						let place = this.warehouseMap.get(it.warehouseId)
+						if (it.areaId) {
+							place += `/${this.areaMap.get(it.areaId)}`
+						}
+						if (it.rackId) {
+							place += `/${this.rackMap.get(it.rackId)}`
+						}
+						detailList.push({
+							itemName: prod.itemName,
+							itemNo: prod.itemNo,
+							itemType: prod.itemType,
+							planQuantity: it.planQuantity,
+							place
+						})
+					})
+					return {
+						remark: row.remark,
+						shipmentOrderNo: row.shipmentOrderNo,
+						customerName: this.customerMap.get(row.customerId),
+						orderNo: row.orderNo,
+						shipmentType: this.shipmentTypeMap.get(row.shipmentOrderType + ''),
+						createTime: row.createTime,
+						details: detailList,
+						totalCount
+					}
+				})
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/wms/shipmentOrder/edit', query: { id } })
+			},
+			handleStatus(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/wms/shipmentOrder/status', query: { id } })
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids
+				const shipmentOrderNo = row.shipmentOrderNo
+				this.$modal.confirm('是否确认删除出库单编号为"' + shipmentOrderNo + '"的数据项？').then(function () {
+					return delWmsShipmentOrder(ids)
+				}).then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				}).catch(() => {})
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams
+				this.$modal.confirm('是否确认导出所有出库单数据项？').then(() => {
+					this.exportLoading = true
+					return exportWmsShipmentOrder(queryParams)
+				}).then(response => {
+					this.$download.download(response)
+					this.exportLoading = false
+				}).catch(() => {})
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+	.popperOptions[x-placement^=left] .popper__arrow::after {
+		border-left-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=right] .popper__arrow::after {
+		border-right-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=bottom] .popper__arrow::after {
+		border-bottom-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=top] .popper__arrow::after {
+		border-top-color: #565D6B;
+	}
+
+	.popperOptions {
+		background-color: #565D6B;
+		color: #FFFFFF;
+		border: #565D6B;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/shipmentOrder/edit.vue b/src/views/wms/shipmentOrder/edit.vue
new file mode 100644
index 0000000..04d9594
--- /dev/null
+++ b/src/views/wms/shipmentOrder/edit.vue
@@ -0,0 +1,334 @@
+<template>
+	<div class="shipment-order-edit-wrapper app-container">
+		<div class="shipment-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-form-item label="出库单号" prop="shipmentOrderNo">
+					<el-input class="w200" v-model="form.shipmentOrderNo" placeholder="出库单号" disabled="disabled"></el-input>
+				</el-form-item>
+				<el-form-item label="出库类型" prop="shipmentOrderType">
+					<el-radio-group v-model="form.shipmentOrderType">
+						<el-radio-button v-for="dict in dict.type.wms_shipment_type" :key="dict.value" :label="dict.value"
+							>{{ dict.label }}
+						</el-radio-button>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="顾客" prop="customerId">
+					<WmsCustomerSelect v-model="form.customerId"></WmsCustomerSelect>
+				</el-form-item>
+				<el-form-item label="金额" prop="receivableAmount" v-show="hasCustomer">
+					<el-input-number v-model="form.receivableAmount" :precision="2" :min="0" label="请输入金额"></el-input-number>
+				</el-form-item>
+				<el-form-item label="订单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入订单号"></el-input>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						placeholder="备注...100个字符以内"
+						rows="3"
+						maxlength="100"
+						type="textarea"
+						show-word-limit="show-word-limit"
+					></el-input>
+				</el-form-item>
+			</el-form>
+			<el-divider></el-divider>
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">
+					<el-row class="mb8 mt10" :gutter="10">
+						<el-col :span="1.5">
+							<div class="flex-one large-tip bolder-font">物料明细</div>
+						</el-col>
+						<el-col :span="1.5">
+							<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+								批量设置仓库/库区
+							</el-button>
+						</el-col>
+					</el-row>
+				</div>
+				<div class="ops">
+					<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+				</div>
+			</div>
+			<div class="table">
+				<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+					、
+					<el-table-column type="selection" width="55" align="center"></el-table-column>
+					<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+					<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+					<el-table-column label="物料类型" align="center" prop="prod.itemType"></el-table-column>
+					<el-table-column label="计划数量" align="center" prop="planQuantity" width="150">
+						<template slot-scope="scope">
+							<el-input-number
+								v-model="scope.row.planQuantity"
+								placeholder="计划数量"
+								size="mini"
+								:min="1"
+								:max="2147483647"
+							></el-input-number>
+						</template>
+					</el-table-column>
+					<el-table-column label="仓库/库区" align="center">
+						<template slot-scope="scope">
+							<WmsWarehouseCascader v-model="scope.row.place" size="small"></WmsWarehouseCascader>
+						</template>
+					</el-table-column>
+					<el-table-column label="金额" align="center" width="150">
+						<template slot-scope="scope">
+							<el-input-number
+								v-model="scope.row.money"
+								:precision="2"
+								@change="selectMoney"
+								size="mini"
+								:min="0"
+								label="请输入金额"
+							></el-input-number>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" align="center">
+						<template slot-scope="scope">
+							<a class="red" @click="form.details.splice(scope.$index, 1)">删除</a>
+						</template>
+					</el-table-column>
+				</WmsTable>
+				<!-- <el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty> -->
+			</div>
+			<div class="tc mt16">
+				<el-button type="primary" plain="plain" size="small" @click="showAddItem">添加物料</el-button>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary">保存</el-button>
+			</div>
+		</div>
+		<el-dialog :visible="modalObj.show" :title="modalObj.title" :width="modalObj.width" @close="modalObj.cancel">
+			<template v-if="modalObj.component === 'add-item'">
+				<item-select ref="item-select" :data="this.form.details"></item-select>
+			</template>
+			<span slot="footer">
+				<el-button v-if="modalObj.cancel" @click="modalObj.cancel">取消</el-button>
+				<el-button v-if="modalObj.ok" type="primary" @click="modalObj.ok">确认</el-button>
+			</span>
+		</el-dialog>
+		<BatchWarehouseDialog
+			:visible.sync="batchDialogVisible"
+			:form-data.sync="batchForm"
+			@confirmed="onBatchDialogFinished"
+		></BatchWarehouseDialog>
+	</div>
+</template>
+
+<script>
+import { addOrUpdateWmsShipmentOrder, getWmsShipmentOrder } from '@/api/wms/shipmentOrder'
+import { randomId } from '@/utils/RandomUtils'
+import ItemSelect from '@/views/components/ItemSelect'
+import BatchWarehouseDialog from '@/views/components/wms/BatchWarehouseDialog/index.vue'
+
+export default {
+	name: 'WmsShipmentOrder',
+	components: { BatchWarehouseDialog, ItemSelect },
+	dicts: ['wms_shipment_type'],
+	data() {
+		return {
+			ids: [],
+			// 非多个禁用
+			multiple: true,
+			// 批量设置仓库/库区
+			batchDialogVisible: false,
+			batchForm: {
+				place: [],
+			},
+			// 表单参数
+			form: {
+				details: [],
+			},
+			// 表单校验
+			rules: {},
+			modalObj: {
+				show: false,
+				title: '',
+				width: '50%',
+				component: null,
+				model: {},
+				ok: () => {},
+				cancel: () => {},
+			},
+			hasSupplier: false,
+		}
+	},
+	watch: {
+		'form.customerId': {
+			immediate: true,
+			handler(value) {
+				if (value) {
+					this.hasCustomer = true
+				} else {
+					this.hasCustomer = false
+				}
+			},
+		},
+	},
+	created() {
+		const { id } = this.$route.query
+		if (id) {
+			this.loadDetail(id)
+		} else {
+			this.reset()
+		}
+	},
+	methods: {
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.multiple = !selection.length
+		},
+		/** 批量设置仓库/库区 */
+		onBatchSetInventory() {
+			const { details } = this.form
+			if (!details || details.length === 0) {
+				this.$modal.msgError('请先添加物料')
+				return
+			}
+			// 未选中
+			if (!this.ids.length) {
+				this.$modal.msgError('请先选择物料')
+				return
+			}
+			this.batchDialogVisible = true
+		},
+		onBatchDialogFinished() {
+			this.batchDialogVisible = false
+			const [warehouseId, areaId, rackId] = this.batchForm.place || []
+			this.form.details.forEach((it) => {
+				// 仅更新已选中
+				if (this.ids.includes(it.id)) {
+					it.place = [warehouseId, areaId, rackId].filter(Boolean)
+				}
+			})
+		},
+		/** 统计出库单金额 */
+		selectMoney() {
+			let sum = 0
+			this.form.details.map((item) => {
+				if (!isNaN(parseFloat(item.money))) {
+					sum += item.money
+				}
+				return item.money
+			})
+			this.form.receivableAmount = sum
+		},
+		cancel() {
+			this.$tab.closeOpenPage({ path: '/wms/shipmentOrder' })
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return
+				}
+				const details = this.form.details.map((it) => {
+					console.log(it.place)
+					if (it.place) {
+						it.prod.warehouseId = it.place[0]
+						it.prod.areaId = it.place[1]
+						it.prod.rackId = it.place[2]
+					} else {
+						it.prod.warehouseId = null
+						it.prod.areaId = null
+						it.prod.rackId = null
+					}
+					return {
+						itemId: it.prod.id,
+						rackId: it.prod.rackId,
+						areaId: it.prod.areaId,
+						money: it.money,
+						warehouseId: it.prod.warehouseId,
+						planQuantity: it.planQuantity,
+						realQuantity: it.realQuantity,
+						shipmentOrderStatus: it.shipmentOrderStatus,
+						delFlag: 0,
+					}
+				})
+				const req = { ...this.form, details }
+				addOrUpdateWmsShipmentOrder(req).then((response) => {
+					this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+					this.cancel()
+				})
+			})
+		},
+		loadDetail(id) {
+			getWmsShipmentOrder(id).then((response) => {
+				const { details, items } = response
+				const map = {}
+				;(items || []).forEach((it) => {
+					map[it.id] = it
+				})
+				details && details.forEach((it) => (it.prod = map[it.itemId]))
+				this.form = {
+					...response,
+					details,
+				}
+			})
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: null,
+				shipmentOrderNo: 'E-' + randomId(),
+				shipmentOrderType: 11,
+				customerId: null,
+				orderNo: null,
+				shipmentOrderStatus: 11,
+				remark: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				details: [],
+			}
+			this.resetForm('form')
+		},
+		confirmSelectItem() {
+			const value = this.$refs['item-select'].getRightList()
+			this.form.details = value.map((it) => {
+				return {
+					id: it.id,
+					prod: it,
+					planQuantity: null,
+					realQuantity: null,
+					place: [],
+					shipmentOrderStatus: 11,
+					delFlag: 0,
+				}
+			})
+			this.closeModal()
+		},
+		closeModal() {
+			this.modalObj.show = false
+		},
+		showAddItem() {
+			try {
+				this.$refs['item-select'].initDetailsList(this.form.details)
+			} catch (err) {}
+			const ok = () => this.confirmSelectItem()
+			const cancel = () => this.closeModal()
+			this.modalObj = {
+				show: true,
+				title: '添加物料',
+				width: '50%',
+				component: 'add-item',
+				model: {},
+				ok,
+				cancel,
+			}
+		},
+	},
+}
+</script>
+<style lang="stylus">
+.shipment-order-edit-wrapper
+  .shipment-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
diff --git a/src/views/wms/shipmentOrder/index.vue b/src/views/wms/shipmentOrder/index.vue
new file mode 100644
index 0000000..b67f762
--- /dev/null
+++ b/src/views/wms/shipmentOrder/index.vue
@@ -0,0 +1,333 @@
+<template>
+	<div class="app-container">
+		<el-tabs v-model="activeName">
+			<el-tab-pane label="订单管理" name="first"></el-tab-pane>
+			<el-tab-pane label="波次作业" name="second"></el-tab-pane>
+		</el-tabs>
+		<Dashborad v-if="activeName == 'first'" @switchTab="activeName = 'second'"></Dashborad>
+		<wave v-if="activeName == 'second'"></wave>
+	</div>
+</template>
+
+<script>
+	import {
+		listWmsShipmentOrder,
+		delWmsShipmentOrder,
+		exportWmsShipmentOrder,
+		getWmsShipmentOrder
+	} from '@/api/wms/shipmentOrder'
+	import { mapGetters } from 'vuex'
+	import { STOCK_OUT_TEMPLATE } from '@/utils/printData'
+	import { ShipmentOrderConstant } from '@/constant/ShipmentOrderConstant.ts'
+	import { addWave } from "@/api/wms/wave";
+	import Dashborad from "@/views/wms/shipmentOrder/dashborad.vue";
+	import wave from "@/views/wms/wave/index.vue";
+
+	export default {
+		name: 'wmsShipmentOrder',
+		components: { Dashborad, wave },
+		dicts: ['wms_shipment_type', 'wms_shipment_status'],
+		computed: {
+			ShipmentOrderConstant() {
+				return ShipmentOrderConstant
+			},
+			...mapGetters(['customerMap', 'warehouseMap', 'areaMap', 'rackMap']),
+			shipmentTypeMap() {
+				let obj = this.dict.type.wms_shipment_type.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			shipmentStatusMap() {
+				let obj = this.dict.type.wms_shipment_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			}
+		},
+		data() {
+			return {
+				activeName: 'first',
+				modalObj: {
+					show: false,
+					title: '选择打印方式',
+					width: '520px',
+					component: null,
+					form: {
+						value: null,
+						row: null
+					},
+					ok: () => {},
+					cancel: () => {}
+				},
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 是否显示波次作业按钮
+				waveAble: false,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 出库单表格数据
+				wmsShipmentOrderList: [],
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					shipmentOrderNo: null,
+					shipmentOrderType: null,
+					customerId: null,
+					orderNo: null,
+					shipmentOrderStatus: null
+				},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: '出库单号', visible: true },
+					{ key: 2, label: '出库类型', visible: true },
+					{ key: 3, label: '供应商', visible: true },
+					{ key: 4, label: '订单号', visible: true },
+					{ key: 5, label: '出库状态', visible: true },
+					{ key: 6, label: '备注', visible: true }
+				]
+			}
+		},
+		created() {
+			// this.getList()
+		},
+		methods: {
+			handleWave() {
+				addWave({ ids: this.ids }).then(res => {
+					this.getList()
+				})
+			},
+			getShipmentOrderTypeTag(row) {
+				switch (row.shipmentOrderType) {
+				case ShipmentOrderConstant.Type.SALE:
+					return 'success'
+				case ShipmentOrderConstant.Type.OUTSOURCING:
+					return 'warning'
+				case ShipmentOrderConstant.Type.TRANSFER:
+					return 'danger'
+				}
+			},
+			getShipmentOrderStatusTag(row) {
+				switch (row.shipmentOrderStatus) {
+				case ShipmentOrderConstant.Status.NOT_IN:
+					return 'info'
+				case ShipmentOrderConstant.Status.PART_IN:
+					return 'warning'
+				case ShipmentOrderConstant.Status.DROP:
+					return 'danger'
+				case ShipmentOrderConstant.Status.ALL_IN:
+					return 'success'
+				}
+			},
+			getShipmentOrderType(row) {
+				return this.shipmentTypeMap.get(row.shipmentOrderType + '')
+			},
+			getShipmentOrderStatus(row) {
+				return this.shipmentStatusMap.get(row.shipmentOrderStatus + '')
+			},
+			getCustomer(row, column) {
+				return this.customerMap.get(row.customerId)
+			},
+			/** 查询出库单列表 */
+			getList() {
+				this.loading = true
+				const { pageNum, pageSize } = this.queryParams
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }
+				const pageReq = { page: pageNum - 1, size: pageSize }
+				listWmsShipmentOrder(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsShipmentOrderList = content
+					this.total = totalElements
+					this.loading = false
+				})
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.getList()
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm('queryForm')
+				this.handleQuery()
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.waveAble = selection.length > 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.$router.push({ path: '/wms/shipmentOrder/edit' })
+			},
+			printOut(row, print) {
+				this.modalObj = {
+					show: true,
+					title: '选择打印方式',
+					width: '520px',
+					component: 'print-type',
+					form: {
+						value: 1,
+						row
+					},
+					ok: () => {
+						this.modalObj.show = false
+						if (this.modalObj.form.value === 1) {
+							this.doPrintOut(row, false)
+						} else {
+							this.windowPrintOut(row, print)
+						}
+					},
+					cancel: () => {
+						this.modalObj.show = false
+					}
+				}
+			},
+			doPrintOut(row, print) {
+				this.getDetail(row).then(result => {
+					if (print) {
+						this.$lodop.print(STOCK_OUT_TEMPLATE, [result])
+					} else {
+						this.$lodop.preview(STOCK_OUT_TEMPLATE, [result])
+					}
+				})
+			},
+			windowPrintOut(row, print) {
+				this.getDetail(row).then(res => {
+					if (print) {
+						this.modalObj.form.row = res
+						this.$nextTick(() => {
+							this.$refs['receiptOrderPrintRef'].start()
+						})
+						return
+					}
+					this.$nextTick(() => {
+						this.modalObj = {
+							show: true,
+							title: '浏览器打印预览',
+							width: '800px',
+							component: 'window-print-preview',
+							form: {
+								value: 1,
+								row,
+								print
+							},
+							ok: () => {
+								this.modalObj.show = false
+							},
+							cancel: () => {
+								this.modalObj.show = false
+							}
+						}
+					})
+				})
+			},
+			getDetail(row) {
+				//查询详情
+				return getWmsShipmentOrder(row.id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					let detailList = [],
+						totalCount = 0
+					details && details.forEach(it => {
+						const prod = map[it.itemId]
+						totalCount += it.planQuantity
+						let place = this.warehouseMap.get(it.warehouseId)
+						if (it.areaId) {
+							place += `/${this.areaMap.get(it.areaId)}`
+						}
+						if (it.rackId) {
+							place += `/${this.rackMap.get(it.rackId)}`
+						}
+						detailList.push({
+							itemName: prod.itemName,
+							itemNo: prod.itemNo,
+							itemType: prod.itemType,
+							planQuantity: it.planQuantity,
+							place
+						})
+					})
+					return {
+						remark: row.remark,
+						shipmentOrderNo: row.shipmentOrderNo,
+						customerName: this.customerMap.get(row.customerId),
+						orderNo: row.orderNo,
+						shipmentType: this.shipmentTypeMap.get(row.shipmentOrderType + ''),
+						createTime: row.createTime,
+						details: detailList,
+						totalCount
+					}
+				})
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/wms/shipmentOrder/edit', query: { id } })
+			},
+			handleStatus(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/wms/shipmentOrder/status', query: { id } })
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids
+				const shipmentOrderNo = row.shipmentOrderNo
+				this.$modal.confirm('是否确认删除出库单编号为"' + shipmentOrderNo + '"的数据项？').then(function () {
+					return delWmsShipmentOrder(ids)
+				}).then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				}).catch(() => {})
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams
+				this.$modal.confirm('是否确认导出所有出库单数据项？').then(() => {
+					this.exportLoading = true
+					return exportWmsShipmentOrder(queryParams)
+				}).then(response => {
+					this.$download.download(response)
+					this.exportLoading = false
+				}).catch(() => {})
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+	.popperOptions[x-placement^=left] .popper__arrow::after {
+		border-left-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=right] .popper__arrow::after {
+		border-right-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=bottom] .popper__arrow::after {
+		border-bottom-color: #565D6B;
+	}
+
+	.popperOptions[x-placement^=top] .popper__arrow::after {
+		border-top-color: #565D6B;
+	}
+
+	.popperOptions {
+		background-color: #565D6B;
+		color: #FFFFFF;
+		border: #565D6B;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/shipmentOrder/status.vue b/src/views/wms/shipmentOrder/status.vue
new file mode 100644
index 0000000..be7e3a5
--- /dev/null
+++ b/src/views/wms/shipmentOrder/status.vue
@@ -0,0 +1,449 @@
+<template>
+	<div class="shipment-order-status-wrapper app-container" v-loading="loading">
+		<div class="shipment-order-content">
+			<el-form label-width="108px" :model="form" ref="form" :rules="rules">
+				<el-row :gutter="20">
+					<el-col :span="10">
+						<el-form-item label="出库状态" prop="shipmentOrderNo">
+							<el-tag> {{ shipmentStatusMap.get(form.shipmentOrderStatus + '') }}</el-tag>
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="出库类型" prop="shipmentOrderType">
+							{{ selectDictLabel(dict.type.wms_shipment_type, form.shipmentOrderType) }}
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="10">
+						<el-form-item label="出库单号" prop="shipmentOrderNo">{{ form.shipmentOrderNo }}</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="订单号" prop="orderNo">{{ form.orderNo }}</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="10">
+						<el-form-item label="客户" prop="customerId">{{ customerMap.get(form.customerId) }}</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="备注" prop="remark">{{ form.remark }}</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-divider />
+
+			<div class="flex-center mb8">
+				<div class="flex-one large-tip bolder-font">物流信息</div>
+				<div class="ops">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="deliveryAdd">新增快递单号
+					</el-button>
+				</div>
+			</div>
+
+			<div class="table">
+				<WmsTable v-loading="loading" :data="form.delivery" @selection-change="handleSelectionChange">
+					<el-table-column label="出库单主表Id" align="center" prop="shipmentOrderId" v-if="columns[0].visible" />
+					<el-table-column label="承运商" align="center" :formatter="getCarrier" prop="carrierId" v-if="columns[1].visible" />
+					<el-table-column label="发货日期" align="center" prop="deliveryDate" width="180" v-if="columns[2].visible">
+						<template slot-scope="scope">
+							<span>{{ parseTime(scope.row.deliveryDate, '') }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="快递单号" align="center" prop="trackingNo" v-if="columns[3].visible">
+						<!--        https://www.kuaidi100.com/chaxun?com=[]&nu=[]-->
+						<template slot-scope="scope">
+							<a target="_blank" :href=" 'https://www.kuaidi100.com/chaxun?com='+getCarrier(scope.row)+'&nu='+scope.row.trackingNo">{{
+                  scope.row.trackingNo
+                }}
+							</a>
+						</template>
+					</el-table-column>
+					<el-table-column label="备注" align="center" prop="remark" v-if="columns[4].visible" />
+				</WmsTable>
+			</div>
+			<el-row class="mb8 mt10" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">物料明细</div>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+						批量设置仓库/库区
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="batch">批量设置出库状态
+					</el-button>
+				</el-col>
+
+				<el-col :span="1.5">
+					<el-button size="small" icon="el-icon-check" type="warning" plain="plain" @click="dialogFormVisible = true">
+						分配仓库/库区
+					</el-button>
+				</el-col>
+
+			</el-row>
+
+			<el-dialog title="请选择出库状态" :visible.sync="open" width="50%" append-to-body="append-to-body">
+				<DictRadio v-model="dialogStatus" :radioData="dialogStatusRange"></DictRadio>
+				<div class="dialog-footer" slot="footer">
+					<el-button type="primary" @click="dialogConfirm">确 定</el-button>
+					<el-button @click="cancelDialog">取 消</el-button>
+				</div>
+			</el-dialog>
+			<div class="table">
+				<el-form ref="form" :model="form" :show-message="false">
+					<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+						<el-table-column type="selection" width="55" align="center" :selectable="(row)=>!row.finish"></el-table-column>
+						<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+						<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+						<el-table-column label="物料类型" align="center" prop="prod.itemType"></el-table-column>
+						<el-table-column label="计划数量" align="center" prop="planQuantity"></el-table-column>
+						<el-table-column label="实际数量" align="center" width="150">
+							<template slot-scope="scope">
+								<el-input-number v-model="scope.row.realQuantity" :min="1" :max="2147483647" size="small" :disabled="scope.row.finish"></el-input-number>
+							</template>
+						</el-table-column>
+						<el-table-column label="仓库/库区" align="center" width="200">
+							<template slot-scope="scope">
+								<el-form-item :prop=" 'details.' + scope.$index + '.place' " :rules="[{ required: true, message: '请选择仓库/库区', trigger: 'change' }]" style="margin-bottom: 0!important;">
+									<WmsWarehouseCascader v-model="scope.row.place" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+								</el-form-item>
+							</template>
+						</el-table-column>
+						<el-table-column label="出库状态" width="150">
+							<template slot-scope="{ row }">
+								<DictSelect v-model="row.shipmentOrderStatus" :options="row.range" size="small" :disabled="row.finish"></DictSelect>
+							</template>
+						</el-table-column>
+					</WmsTable>
+				</el-form>
+				<el-empty v-if="!form.details || form.details.length === 0" :image-size="48"></el-empty>
+			</div>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary" :disabled="finish">保存</el-button>
+			</div>
+			<!-- 添加或修改发货记录对话框 -->
+			<el-dialog :title="deliveryTitle" :visible.sync="deliveryOpen" width="50%" append-to-body>
+				<el-form ref="deliveryForm" :model="deliveryForm" :rules="rules" label-width="108px" inline class="dialog-form-two">
+					<el-form-item label="出库单" prop="shipmentOrderId">
+						<el-input v-model="deliveryForm.shipmentOrderId" disabled placeholder="请输入出库单" />
+					</el-form-item>
+					<el-form-item label="承运商" prop="carrierId">
+						<wms-carrier-select v-model="deliveryForm.carrierId"></wms-carrier-select>
+					</el-form-item>
+					<el-form-item label="发货日期" prop="deliveryDate">
+						<el-date-picker clearable size="small" v-model="deliveryForm.deliveryDate" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择发货日期">
+						</el-date-picker>
+					</el-form-item>
+					<el-form-item label="快递单号" prop="trackingNo">
+						<el-input v-model="deliveryForm.trackingNo" placeholder="请输入快递单号" />
+					</el-form-item>
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="deliveryForm.remark" placeholder="请输入备注" />
+					</el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="primary" @click="submitdeliveryForm">确 定</el-button>
+					<el-button @click="canceldeliveryForm">取 消</el-button>
+				</div>
+			</el-dialog>
+			<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+			<el-dialog title="自动分配仓库/库区" :visible.sync="dialogFormVisible" width="400px">
+				<el-form :model="dialogForm">
+					<el-form-item label="分配策略" label-width="98px">
+						<el-select v-model="dialogForm.region" placeholder="请选择分配策略">
+							<el-option label="库存量小的库位优先" :value="1"></el-option>
+							<el-option label="库存量大的库位优先" :value="2"></el-option>
+							<el-option label="先入先出(FIFO)" :value="3" disabled></el-option>
+							<el-option label="先过期先出" :value="4" disabled></el-option>
+							<el-option label="适量库存优先" :value="5" disabled></el-option>
+						</el-select>
+					</el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button @click="dialogFormVisible = false">取 消</el-button>
+					<el-button type="primary" @click="allocated()">确 定</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
+</template>
+
+<script>
+	import { addOrUpdateWmsShipmentOrder, allocatedInventory, getWmsShipmentOrder } from '@/api/wms/shipmentOrder'
+	import ItemSelect from '@/views/components/ItemSelect'
+	import { mapGetters } from 'vuex'
+	import WmsCarrier from "@/views/wms/carrier/index.vue";
+	import { addWmsDelivery, updateWmsDelivery } from "@/api/wms/delivery";
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+	import { ShipmentOrderConstant } from "@/constant/ShipmentOrderConstant.ts";
+
+	export default {
+		name: 'WmsShipmentOrder',
+		components: { BatchWarehouseDialog, WmsCarrier, ItemSelect },
+		dicts: ['wms_shipment_type', 'wms_shipment_status'],
+		computed: {
+			ShipmentOrderConstant() {
+				return ShipmentOrderConstant
+			},
+			...mapGetters(['customerMap', 'carrierMap']),
+			shipmentStatusMap() {
+				let obj = this.dict.type.wms_shipment_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			mergeDetailStatusArray() {
+				const arr = this.sourceDetails || []
+				return [...new Set(arr.filter(it => it.shipmentOrderStatus !== null).map(it => it.shipmentOrderStatus))]
+			},
+			dialogStatusRange() {
+				if (this.mergeDetailStatusArray.length !== 1) {
+					return []
+				}
+				return this.getRange(this.mergeDetailStatusArray[0])
+			}
+		},
+		data() {
+			return {
+				// 分配仓库
+				dialogFormVisible: false,
+				dialogForm: {
+					date1: '',
+				},
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchForm: {
+					place: []
+				},
+				open: false,
+				// 遮罩层
+				loading: true,
+				ids: [],
+				// 表单参数
+				form: {
+					details: []
+				},
+				sourceDetails: [],
+				// 表单校验
+				rules: {},
+				dialogStatus: null,
+				// 非多个禁用
+				multiple: true,
+				finish: false,
+				// 物流管理
+				deliveryTitle: '',
+				shipmentOrderId: null,
+				deliveryOpen: false,
+				deliveryForm: {},
+				// 发货记录表格数据
+				wmsDeliveryList: [],
+				columns: [
+					{ key: 1, label: "出库单主表Id", visible: false },
+					{ key: 2, label: "承运商Id", visible: true },
+					{ key: 3, label: "发货日期", visible: true },
+					{ key: 4, label: "快递单号", visible: true },
+					{ key: 5, label: "备注", visible: true },
+				],
+			}
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.shipmentOrderId = id
+				this.loadDetail(id)
+			} else {
+				this.cancel()
+			}
+		},
+		methods: {
+			/** 自动分配 仓库/库区 */
+			allocated() {
+				allocatedInventory({ id: this.shipmentOrderId, type: this.dialogForm.region }).then(response => {
+					this.$modal.msgSuccess("分配成功");
+					this.dialogFormVisible = false;
+					this.loadDetail(this.shipmentOrderId)
+				});
+			},
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory() {
+				const { details } = this.form
+				if (!details || details.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+			},
+			/** 批量设置仓库/库区 完成事件 */
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.details.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it.place = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			// 格式化承运商
+			getCarrier(row, column) {
+				return this.carrierMap.get(row.carrierId)
+			},
+			// 新增物流对话框，提交按钮
+			submitdeliveryForm() {
+				this.$refs["deliveryForm"].validate(valid => {
+					if (valid) {
+						if (this.deliveryForm.id != null) {
+							updateWmsDelivery(this.deliveryForm).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.deliveryOpen = false;
+								this.loadDetail(this.shipmentOrderId)
+							});
+						} else {
+							addWmsDelivery(this.deliveryForm).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.deliveryOpen = false;
+								this.loadDetail(this.shipmentOrderId)
+							});
+						}
+					}
+				});
+			}, // 新增物流对话框，取消按钮
+			canceldeliveryForm() {
+				this.deliveryOpen = false
+			},
+			// 新增物流信息
+			deliveryAdd() {
+				this.deliveryTitle = "新增物流信息"
+				this.deliveryOpen = true
+				this.deliveryForm.shipmentOrderId = this.shipmentOrderId
+			},
+			dialogConfirm() {
+				if (!this.dialogStatus) {
+					this.$modal.alert('请选择出库状态')
+					return
+				}
+				this.form.details.forEach(detail => {
+					if (this.ids.includes(detail.id)) {
+						detail.shipmentOrderStatus = this.dialogStatus
+					}
+				})
+				this.cancelDialog()
+			},
+			cancelDialog() {
+				this.open = false
+				this.dialogStatus = null
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			batch() {
+				if (this.multiple) {
+					this.$modal.alert('请先选择物料')
+				} else {
+					this.open = true
+				}
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/shipmentOrder' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs['form'].validate(valid => {
+					if (!valid) {
+						this.$notify({
+							title: '警告',
+							message: "请完善表单信息",
+							type: 'warning'
+						});
+						return
+					}
+					const details = this.form.details.map(it => {
+						if (it.place) {
+							it.prod.warehouseId = it.place[0]
+							it.prod.areaId = it.place[1]
+							it.prod.rackId = it.place[2]
+						} else {
+							it.prod.warehouseId = null
+							it.prod.areaId = null
+							it.prod.rackId = null
+						}
+						return {
+							id: it.id,
+							itemId: it.prod.id,
+							rackId: it.prod.rackId,
+							areaId: it.prod.areaId,
+							warehouseId: it.prod.warehouseId,
+							planQuantity: it.planQuantity,
+							realQuantity: it.realQuantity,
+							shipmentOrderStatus: it.shipmentOrderStatus,
+							delFlag: 0
+						}
+					})
+					const req = { ...this.form, details }
+					addOrUpdateWmsShipmentOrder(req).then(response => {
+						if (response.code == 398) {
+							return
+						}
+						this.$modal.msgSuccess(this.form.id ? '修改成功' : '新增成功')
+						this.cancel()
+					})
+				})
+			},
+			loadDetail(id) {
+				this.loading = true
+				getWmsShipmentOrder(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					details && details.forEach(it => {
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place;
+						}
+						it.range = this.getRange(it.shipmentOrderStatus)
+						it.finish = it.shipmentOrderStatus === 13
+					})
+					this.sourceDetails = details.map(it => ({ ...it }))
+					this.finish = details.filter(it => !it.finish)?.length === 0
+					this.form = {
+						...response,
+						details
+					}
+				}).finally(() => {
+					this.loading = false
+				})
+			},
+			getRange(status) {
+				const arr = this.dict.type.wms_shipment_status
+				if (status === 4 || status === 3) {
+					return arr.filter(it => +it.value === status).map(it => ({ label: it.label, value: it.value }))
+				}
+				if (status === 2) {
+					return arr.filter(it => +it.value >= status && +it.value !== 4).map(it => ({
+						label: it.label,
+						value: it.value
+					}))
+				}
+				return arr.filter(it => +it.value >= status).map(it => ({ label: it.label, value: it.value }))
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.shipment-order-status-wrapper
+  .shipment-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/shipmentOrderDetail/index.vue b/src/views/wms/shipmentOrderDetail/index.vue
new file mode 100644
index 0000000..1229e18
--- /dev/null
+++ b/src/views/wms/shipmentOrderDetail/index.vue
@@ -0,0 +1,254 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="出库单" prop="shipmentOrderId">
+				<el-input v-model="queryParams.shipmentOrderId" placeholder="请输入出库单" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="物料" prop="itemId">
+				<el-input v-model="queryParams.itemId" placeholder="请输入物料" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="计划数量" prop="planQuantity">
+				<el-input v-model="queryParams.planQuantity" placeholder="请输入计划数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="实际数量" prop="realQuantity">
+				<el-input v-model="queryParams.realQuantity" placeholder="请输入实际数量" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="货架" prop="rackId">
+				<el-input v-model="queryParams.rackId" placeholder="请输入货架" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:shipmentOrderDetail:add']">新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['wms:shipmentOrderDetail:edit']">修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['wms:shipmentOrderDetail:remove']">删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['wms:shipmentOrderDetail:export']">导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsShipmentOrderDetailList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="出库单" align="center" prop="shipmentOrderId" v-if="columns[0].visible" />
+			<el-table-column label="物料" align="center" prop="itemId" v-if="columns[1].visible" />
+			<el-table-column label="计划数量" align="center" prop="planQuantity" v-if="columns[2].visible" />
+			<el-table-column label="实际数量" align="center" prop="realQuantity" v-if="columns[3].visible" />
+			<el-table-column label="货架" align="center" prop="rackId" v-if="columns[4].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:shipmentOrderDetail:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:shipmentOrderDetail:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改出库单详情对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="出库单" prop="shipmentOrderId">
+					<el-input v-model="form.shipmentOrderId" placeholder="请输入出库单" />
+				</el-form-item>
+				<el-form-item label="物料" prop="itemId">
+					<el-input v-model="form.itemId" placeholder="请输入物料" />
+				</el-form-item>
+				<el-form-item label="计划数量" prop="planQuantity">
+					<el-input v-model="form.planQuantity" placeholder="请输入计划数量" />
+				</el-form-item>
+				<el-form-item label="实际数量" prop="realQuantity">
+					<el-input v-model="form.realQuantity" placeholder="请输入实际数量" />
+				</el-form-item>
+				<el-form-item label="货架" prop="rackId">
+					<el-input v-model="form.rackId" placeholder="请输入货架" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsShipmentOrderDetail, getWmsShipmentOrderDetail, delWmsShipmentOrderDetail, addWmsShipmentOrderDetail, updateWmsShipmentOrderDetail, exportWmsShipmentOrderDetail } from "@/api/wms/shipmentOrderDetail";
+
+	export default {
+		name: "WmsShipmentOrderDetail",
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 出库单详情表格数据
+				wmsShipmentOrderDetailList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					shipmentOrderId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+					rackId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {},
+				columns: [
+					{ key: 1, label: "出库单", visible: true },
+					{ key: 2, label: "物料", visible: true },
+					{ key: 3, label: "计划数量", visible: true },
+					{ key: 4, label: "实际数量", visible: true },
+					{ key: 5, label: "货架", visible: true },
+					{ key: 7, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询出库单详情列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsShipmentOrderDetail(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsShipmentOrderDetailList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					shipmentOrderId: null,
+					itemId: null,
+					planQuantity: null,
+					realQuantity: null,
+					rackId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加出库单详情";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsShipmentOrderDetail(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改出库单详情";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsShipmentOrderDetail(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsShipmentOrderDetail(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除出库单详情编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsShipmentOrderDetail(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有出库单详情数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsShipmentOrderDetail(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
new file mode 100644
index 0000000..15bae75
--- /dev/null
+++ b/src/views/wms/supplier/index.vue
@@ -0,0 +1,421 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="编号" prop="supplierNo">
+				<el-input v-model="queryParams.supplierNo" placeholder="请输入编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="名称" prop="supplierName">
+				<el-input v-model="queryParams.supplierName" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="地址" prop="address">
+				<el-input v-model="queryParams.address" placeholder="请输入地址" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="手机号" prop="mobileNo">
+				<el-input v-model="queryParams.mobileNo" placeholder="请输入手机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="座机号" prop="telNo">
+				<el-input v-model="queryParams.telNo" placeholder="请输入座机号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="联系人" prop="contact">
+				<el-input v-model="queryParams.contact" placeholder="请输入联系人" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="级别" prop="level">
+				<el-select v-model="queryParams.level" placeholder="请选择级别" clearable size="small" @change="handleQuery">
+					<el-option v-for="dict in dict.type.wms_supplier_level" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+				</el-select>
+			</el-form-item>
+			<template v-if="showMoreCondition">
+				<el-form-item label="Email" prop="email">
+					<el-input v-model="queryParams.email" placeholder="请输入Email" clearable size="small" @keyup.enter.native="handleQuery" />
+				</el-form-item>
+			</template>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+				<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['wms:supplier:add']">新增</el-button>
+			</el-col>
+			<!-- <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['wms:supplier:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['wms:supplier:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
+          v-hasPermi="['wms:supplier:export']">导出</el-button>
+      </el-col> -->
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="wmsSupplierList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="编号" align="center" prop="supplierNo" v-if="columns[0].visible" />
+			<el-table-column label="名称" align="center" prop="supplierName" v-if="columns[1].visible" />
+			<el-table-column label="应付款" align="center" class-name="small-padding fixed-width" v-if="columns[2].visible">
+
+				<template slot-scope="scope">
+					<p> {{ scope.row.payableAmount }}</p>
+					<el-button size="mini" type="text" @click="handleEnter(scope.row)">+应付
+					</el-button>
+					<el-button size="mini" type="text" @click="handleExit(scope.row)">-结款
+					</el-button>
+					<el-button size="mini" type="text" @click="handleDetail(scope.row)">查看流水
+					</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column label="地址" align="center" prop="address" v-if="columns[3].visible" />
+			<el-table-column label="手机号" align="center" prop="mobileNo" v-if="columns[4].visible" />
+			<el-table-column label="座机号" align="center" prop="telNo" v-if="columns[5].visible" />
+			<el-table-column label="联系人" align="center" prop="contact" v-if="columns[6].visible" />
+			<el-table-column label="级别" align="center" prop="level" v-if="columns[7].visible" />
+			<el-table-column label="Email" align="center" prop="email" v-if="columns[8].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:supplier:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:supplier:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改供应商对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="supplierNo">
+					<el-input v-model="form.supplierNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="supplierName">
+					<el-input v-model="form.supplierName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="地址" prop="address">
+					<el-input v-model="form.address" placeholder="请输入地址" />
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobileNo">
+					<el-input v-model="form.mobileNo" placeholder="请输入手机号" />
+				</el-form-item>
+				<el-form-item label="开户行" prop="bankName">
+					<el-input v-model="form.bankName" placeholder="请输入开户行" />
+				</el-form-item>
+				<el-form-item label="银行卡号" prop="bankAccount">
+					<el-input v-model="form.bankAccount" placeholder="请输入银行卡号" />
+				</el-form-item>
+				<el-form-item label="座机号" prop="telNo">
+					<el-input v-model="form.telNo" placeholder="请输入座机号" />
+				</el-form-item>
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="form.contact" placeholder="请输入联系人" />
+				</el-form-item>
+				<el-form-item label="级别" prop="level">
+					<el-select v-model="form.level" placeholder="请选择级别">
+						<el-option v-for="dict in dict.type.wms_supplier_level" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="Email" prop="email">
+					<el-input v-model="form.email" placeholder="请输入Email" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+
+		<!-- 应付款 新增/结账 对话框 -->
+		<el-dialog :title="duePayForm.title" :visible.sync="duePayForm.open" width="500px" append-to-body>
+			<el-form ref="duePayForm" :model="duePayForm.form" :rules="duePayForm.rules" label-width="108px">
+
+				<el-form-item label="金额" prop="transactionAmount">
+					<el-input-number v-model="duePayForm.form.transactionAmount" :precision="2" :min="0" label="请输入金额"></el-input-number>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="duePayForm.form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitDuePayForm">确 定</el-button>
+				<el-button @click="cancelDuePayForm">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsSupplier, getWmsSupplier, delWmsSupplier, addWmsSupplier, updateWmsSupplier, exportWmsSupplier } from "@/api/wms/supplier";
+	import { randomId } from "@/utils/RandomUtils";
+	import { addWmsSupplierTransaction } from "@/api/wms/supplierTransaction";
+
+	/* 银行卡校验 */
+	var isbankAccount = (rule, value, callback) => {
+		const strBin =
+			"10,18,30,35,37,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,58,60,62,65,68,69,84,87,88,94,95,98,99";
+		if (!value) {
+			return callback(new Error("收款账户不能为空"));
+		} else if (!Number.isInteger(+value)) {
+			callback(new Error("银行卡号必须全为数字"));
+		} else if (value.trim().length < 12 || value.trim().length > 19) {
+			callback(new Error("银行卡号长度必须在12到19之间"));
+		} else if (strBin.indexOf(value.substring(0, 2)) === -1) {
+			callback(new Error("银行卡号开头6位不符合规范"));
+		} else {
+			callback();
+		}
+	};
+
+	export default {
+		name: "WmsSupplier",
+		dicts: ['wms_supplier_level'],
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 供应商表格数据
+				wmsSupplierList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					supplierNo: null,
+					supplierName: null,
+					address: null,
+					mobileNo: null,
+					telNo: null,
+					contact: null,
+					level: null,
+					email: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					supplierNo: [
+						{ required: true, message: "编号不能为空", trigger: "blur" }
+					],
+					supplierName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" }
+					],
+					bankAccount: [{ validator: isbankAccount, trigger: "blur" }, ]
+				},
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "应付款", visible: true },
+					{ key: 4, label: "地址", visible: false },
+					{ key: 5, label: "手机号", visible: false },
+					{ key: 6, label: "座机号", visible: false },
+					{ key: 7, label: "联系人", visible: true },
+					{ key: 8, label: "级别", visible: true },
+					{ key: 9, label: "Email", visible: false },
+					{ key: 10, label: "备注", visible: true },
+				],
+				showMoreCondition: false,
+				duePayForm: {
+					// 弹出层标题
+					title: "",
+					// 是否显示弹出层
+					open: false,
+					form: {}
+				}
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			/** 查询供应商列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsSupplier(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsSupplierList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			/** 应付款 取消按钮 */
+			cancelDuePayForm() {
+				this.duePayForm.open = false
+			},
+			/** 应付款 提交按钮 */
+			submitDuePayForm() {
+				this.$refs["duePayForm"].validate(valid => {
+					if (valid) {
+						addWmsSupplierTransaction(this.duePayForm.form).then(res => {
+							this.duePayForm.open = false
+							this.$store.dispatch('wms/getSuppliers')
+							this.$modal.msgSuccess("修改成功");
+							this.getList();
+
+						})
+
+					}
+				})
+
+			},
+			/** 查看流水 */
+			handleDetail(row) {
+				const id = row.id || this.ids
+				this.$router.push({ path: '/relation/supplierTransaction', query: { id } })
+			},
+			/* 新增 应付款 */
+			handleEnter(row) {
+				this.duePayForm.title = '新增应付款'
+				this.duePayForm.open = true
+
+				this.resetDueForm();
+				this.duePayForm.form.supplierId = row.id
+				this.duePayForm.form.transactionType = '22'
+
+			},
+			resetDueForm() {
+				this.duePayForm.form = {
+					transactionCode: 'TS-' + randomId(),
+					transactionAmount: 0.00,
+					remark: null
+				}
+			},
+			/* 结款 */
+			handleExit(row) {
+				this.duePayForm.title = '结款'
+				this.duePayForm.open = true
+
+				this.resetDueForm();
+				this.duePayForm.form.transactionType = '11'
+				this.duePayForm.form.supplierId = row.id
+
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					supplierNo: null,
+					supplierName: null,
+					address: null,
+					mobileNo: null,
+					telNo: null,
+					contact: null,
+					level: null,
+					email: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加供应商";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsSupplier(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改供应商";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsSupplier(this.form).then(response => {
+								this.$store.dispatch('wms/getSuppliers')
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsSupplier(this.form).then(response => {
+								this.$store.dispatch('wms/getSuppliers')
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除供应商编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsSupplier(ids);
+				}).then(() => {
+					this.$store.dispatch('wms/getSuppliers')
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有供应商数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsSupplier(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/supplierTransaction/index.vue b/src/views/wms/supplierTransaction/index.vue
new file mode 100644
index 0000000..2d0b820
--- /dev/null
+++ b/src/views/wms/supplierTransaction/index.vue
@@ -0,0 +1,342 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="交易编号" prop="transactionCode">
+				<el-input v-model="queryParams.transactionCode" placeholder="请输入交易编号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="交易类型" prop="transactionType">
+				<DictRadio v-model="queryParams.transactionType" @change="handleQuery" size="small" :radioData="dict.type.wms_supplier_transaction_type" :showAll="'all'" />
+			</el-form-item>
+			<el-form-item label="创建时间" prop="Time">
+				<el-date-picker v-model="queryParams.Time" type="datetimerange" :picker-options="pickerOptions" range-separator="至" size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" align="right" @change="handleChange">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<WmsTable v-loading="loading" :data="wmsSupplierTransactionList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="交易编号" align="center" prop="transactionCode" v-if="columns[0].visible" />
+			<el-table-column label="供应商" align="center" prop="supplierId" v-if="columns[1].visible">
+				<template slot-scope="scope">
+					{{ getSupplierName(scope.row) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="交易类型" align="center" prop="transactionType" v-if="columns[2].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_supplier_transaction_type" :value="scope.row.transactionType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="交易金额" align="center" prop="transactionAmount" v-if="columns[3].visible">
+				<template slot-scope="scope">
+					<span style="color:red">{{scope.row.transactionType==11 ? "-":"+"}} {{scope.row.transactionAmount}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="上期余额" align="center" prop="previousBalance" v-if="columns[4].visible" />
+			<el-table-column label="当前余额" align="center" prop="currentBalance" v-if="columns[5].visible" />
+			<el-table-column label="入库单号" align="center" prop="receiptOrderId" v-if="columns[6].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible" />
+			<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="columns[9].visible">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsSupplierTransaction:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsSupplierTransaction:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改供应商账户流水对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="交易编号" prop="transactionCode">
+					<el-input v-model="form.transactionCode" placeholder="请输入交易编号" />
+				</el-form-item>
+				<el-form-item label="供应商编号" prop="supplierId">
+					<el-input v-model="form.supplierId" placeholder="请输入供应商编号" />
+				</el-form-item>
+				<el-form-item label="交易类型" prop="transactionType">
+					<el-radio-group v-model="form.transactionType">
+						<el-radio v-for="dict in dict.type.wms_supplier_transaction_type" :key="dict.value" :label="dict.value">{{ dict.label }}
+						</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item label="交易金额" prop="transactionAmount">
+					<el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+				</el-form-item>
+				<el-form-item label="上期余额" prop="previousBalance">
+					<el-input v-model="form.previousBalance" placeholder="请输入上期余额" />
+				</el-form-item>
+				<el-form-item label="当前余额" prop="currentBalance">
+					<el-input v-model="form.currentBalance" placeholder="请输入当前余额" />
+				</el-form-item>
+				<el-form-item label="入库单号" prop="receiptOrderId">
+					<el-input v-model="form.receiptOrderId" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { listWmsSupplierTransaction, getWmsSupplierTransaction, delWmsSupplierTransaction, addWmsSupplierTransaction, updateWmsSupplierTransaction, exportWmsSupplierTransaction } from "@/api/wms/supplierTransaction";
+	import { mapGetters } from "vuex";
+
+	export default {
+		name: "WmsSupplierTransaction",
+		dicts: ["wms_supplier_transaction_type"],
+		computed: {
+			...mapGetters(['supplierMap']),
+		},
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 供应商账户流水表格数据
+				wmsSupplierTransactionList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					transactionCode: null,
+					supplierId: null,
+					transactionType: null,
+					transactionAmount: null,
+					previousBalance: null,
+					currentBalance: null,
+					receiptOrderId: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					transactionCode: [
+						{ required: true, message: "交易编号不能为空", trigger: "blur" }
+					],
+					supplierId: [
+						{ required: true, message: "供应商编号不能为空", trigger: "blur" }
+					],
+					transactionType: [
+						{ required: true, message: "交易类型  1：结款  2：应付 不能为空", trigger: "change" }
+					],
+					transactionAmount: [
+						{ required: true, message: "交易金额不能为空", trigger: "blur" }
+					],
+					previousBalance: [
+						{ required: true, message: "上期余额不能为空", trigger: "blur" }
+					],
+					currentBalance: [
+						{ required: true, message: "当前余额不能为空", trigger: "blur" }
+					],
+					createTime: [
+						{ required: true, message: "创建时间不能为空", trigger: "blur" }
+					],
+					updateTime: [
+						{ required: true, message: "更新时间不能为空", trigger: "blur" }
+					]
+				},
+				columns: [
+					{ key: 1, label: "交易编号", visible: true },
+					{ key: 2, label: "供应商编号", visible: true },
+					{ key: 3, label: "交易类型  1：结款  2：应付 ", visible: true },
+					{ key: 4, label: "交易金额", visible: true },
+					{ key: 5, label: "上期余额", visible: true },
+					{ key: 6, label: "当前余额", visible: true },
+					{ key: 7, label: "入库单号", visible: false },
+					{ key: 8, label: "备注", visible: true },
+					{ key: 8, label: "创建时间", visible: true },
+					{ key: 9, label: "操作", visible: false },
+
+				],
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				supplierId: null
+			};
+		},
+		created() {
+			const { id } = this.$route.query
+			if (id) {
+				this.supplierId = id
+				this.getList(id)
+			}
+		},
+		methods: {
+			cellStyle(row, column, rowIndex, columnIndex) { //根据报警级别显示颜色
+				return 'color:red'
+			},
+			getSupplierName(row) {
+				return this.supplierMap.get(Number(row.supplierId))
+			},
+			/** 查询供应商账户流水列表 */
+			getList() {
+				if (this.queryParams.Time) {
+					this.queryParams.startTime = this.queryParams.Time[0]
+					this.queryParams.endTime = this.queryParams.Time[1]
+				}
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, supplierId: this.supplierId };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWmsSupplierTransaction(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.wmsSupplierTransactionList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					transactionCode: null,
+					supplierId: null,
+					transactionType: null,
+					transactionAmount: null,
+					previousBalance: null,
+					currentBalance: null,
+					receiptOrderId: null,
+					remark: null,
+					createTime: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加供应商账户流水";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWmsSupplierTransaction(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改供应商账户流水";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWmsSupplierTransaction(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWmsSupplierTransaction(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				this.$modal.confirm('是否确认删除供应商账户流水编号为"' + ids + '"的数据项？').then(function () {
+					return delWmsSupplierTransaction(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有供应商账户流水数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWmsSupplierTransaction(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			},
+			handleChange(value) {
+				if (!value) {
+					this.queryParams.startTime = null;
+					this.queryParams.endTime = null;
+				}
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/warehouse/index.vue b/src/views/wms/warehouse/index.vue
new file mode 100644
index 0000000..1cb7ec2
--- /dev/null
+++ b/src/views/wms/warehouse/index.vue
@@ -0,0 +1,551 @@
+<template>
+	<div class="app-container">
+		<el-card style="margin-bottom: 12px;">
+			<div class="clearfix" style="margin-top: 10px;">
+				<div style="width: 200px;margin-bottom: 10px;" class="left">
+					<el-input placeholder="请输入仓库编号/名称" v-model="queryWarehouseParam" class="input-with-select" suffix-icon="el-icon-search" @keyup.enter.native="handleSearchWarehouse">
+					</el-input>
+				</div>
+				<div class="left">
+					<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddWarehouse" v-hasPermi="['wms:warehouse:add']" style="margin: 3px 10px;">新增仓库</el-button>
+				</div>
+			</div>
+		</el-card>
+		<el-empty description="暂无仓库" v-if="wmsWarehouseList.length == 0"></el-empty>
+		<el-card v-else>
+			<el-tabs :tab-position="tabPosition" style="height: 600px;" @tab-click="handleTabClick" ref="leftRef">
+				<el-tab-pane v-for="(it, index) in wmsWarehouseList" :label="it.warehouseName" :key="it.id">
+					<div class="content-wrapper">
+						<div class="clearfix">
+							<div style="color:#409EFF;font-weight: bold;font-size: 15px;" class="content-margin left">基本信息</div>
+							<el-link type="primary" plain size="mini" @click="handleUpdateWarehouse" v-hasPermi="['wms:warehouse:add']" class="left" style="margin-left: 10px;text-decoration: underline;" :underline="false">修改</el-link>
+							<el-link type="danger" plain size="mini" @click="handleDeleteWarehouse" v-hasPermi="['wms:warehouse:add']" class="left" style="margin-left: 10px;text-decoration: underline;" :underline="false">删除</el-link>
+						</div>
+						<div class="content-margin info-box">
+							<el-row :gutter="20">
+								<el-col :span="8">
+									<div>
+										<div style="font-weight: bold;">仓库名称</div>
+										<div style="margin-top: 10px;">{{ it.warehouseName }}</div>
+									</div>
+								</el-col>
+								<el-col :span="8">
+									<div>
+										<div style="font-weight: bold;">仓库编号</div>
+										<div style="margin-top: 10px;">{{ it.warehouseNo }}</div>
+									</div>
+								</el-col>
+								<el-col :span="8">
+									<div>
+										<div style="font-weight: bold;">仓库备注</div>
+										<div style="margin-top: 10px;">{{ it.remark }}</div>
+									</div>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+					<div class="content-wrapper">
+						<el-tabs v-model="activeName" @tab-click="handleClick">
+							<el-tab-pane label="库区信息" name="first">
+								<div class="clearfix oper_area">
+									<div class="left">
+										<el-input placeholder="请输入库区编号/名称" v-model="queryAreaParam" class="input-with-select" suffix-icon="el-icon-search" @keyup.enter.native="handleSearchArea">
+										</el-input>
+									</div>
+									<div class="left" style="margin: 3px 10px;">
+										<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddArea()" v-hasPermi="['wms:area:add']">新增库区</el-button>
+									</div>
+								</div>
+
+								<WmsTable v-loading="loading" :data="wmsAreaList">
+									<el-table-column label="编号" align="center" prop="areaNo" v-if="columns[0].visible" />
+									<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[2].visible" />
+									<el-table-column label="名称" align="center" prop="areaName" v-if="columns[1].visible" />
+									<el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible" />
+									<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+										<template slot-scope="scope">
+											<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdateArea(scope.row)" v-hasPermi="['wms:area:edit']">修改</el-button>
+											<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:area:remove']">删除</el-button>
+										</template>
+									</el-table-column>
+								</WmsTable>
+							</el-tab-pane>
+						</el-tabs>
+					</div>
+				</el-tab-pane>
+			</el-tabs>
+		</el-card>
+		<!-- 添加或修改仓库对话框 -->
+		<el-dialog :title="title" :visible.sync="openWarehouse" width="50%" append-to-body>
+			<el-form ref="warehouseForm" :model="warehouseForm" :rules="rules" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="warehouseNo">
+					<el-input v-model="warehouseForm.warehouseNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="warehouseName">
+					<el-input v-model="warehouseForm.warehouseName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="warehouseForm.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitWarehouseForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+		<!-- 添加或修改库区对话框 -->
+		<el-dialog :title="title" :visible.sync="openArea" width="50%" append-to-body>
+			<el-form ref="areaForm" :model="areaForm" :rules="rulesArea" label-width="108px" inline class="dialog-form-two">
+				<el-form-item label="编号" prop="areaNo">
+					<el-input v-model="areaForm.areaNo" placeholder="请输入编号" />
+				</el-form-item>
+				<el-form-item label="名称" prop="areaName">
+					<el-input v-model="areaForm.areaName" placeholder="请输入名称" />
+				</el-form-item>
+				<el-form-item label="所属仓库" prop="warehouseId">
+					<!-- <el-select v-model="form.warehouseId" placeholder="请输入货仓名称" clearable size="small">
+            <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+            </el-option>
+          </el-select> -->
+					<el-input v-model="areaForm.warehouseId" :disabled="true" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="areaForm.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitAreaForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import { mapGetters } from "vuex";
+	import {
+		listWmsWarehouse,
+		getWmsWarehouse,
+		delWmsWarehouse,
+		addWmsWarehouse,
+		updateWmsWarehouse,
+		exportWmsWarehouse,
+	} from "@/api/wms/warehouse";
+	import {
+		listWmsArea,
+		getWmsArea,
+		delWmsArea,
+		addWmsArea,
+		updateWmsArea,
+		exportWmsArea,
+	} from "@/api/wms/area";
+	export default {
+		name: "WmsWarehouse",
+
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 仓库表格数据
+				wmsWarehouseList: [],
+				// 库区表格数据
+				wmsAreaList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				openWarehouse: false,
+				openArea: false,
+				// 查询参数
+				queryParams: {
+					warehouseNo: null,
+					warehouseName: null,
+				},
+				queryAreaParams: {
+					areaNo: null,
+					areaNameLike: null,
+					warehouseId: null,
+					pageNum: 1,
+					pageSize: 10
+				},
+				// 表单参数
+				form: {},
+				warehouseForm: {},
+				areaForm: {},
+				// 表单校验
+				rules: {
+					warehouseNo: [
+						{ required: true, message: "编号不能为空", trigger: "blur" },
+					],
+					warehouseName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" },
+					],
+				},
+				// 表单校验
+				rulesArea: {
+					areaNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+					areaName: [
+						{ required: true, message: "名称不能为空", trigger: "blur" },
+					],
+					warehouseId: [
+						{ required: true, message: "所属仓库不能为空", trigger: "blur" },
+					],
+				},
+				// columns: [
+				//   { key: 1, label: "编号", visible: true },
+				//   { key: 2, label: "名称", visible: true },
+				//   { key: 4, label: "备注", visible: true },
+				// ],
+				columns: [
+					{ key: 1, label: "编号", visible: true },
+					{ key: 2, label: "名称", visible: true },
+					{ key: 3, label: "所属仓库", visible: false },
+					{ key: 4, label: "备注", visible: true },
+				],
+				// tab页位置
+				tabPosition: 'left',
+				selectedWarehouseId: null,
+				// 右侧横向tab默认选中
+				activeName: 'first',
+				// 查询库区参数
+				queryAreaParam: null,
+				queryWarehouseParam: null
+			};
+		},
+		computed: {
+			...mapGetters(["warehouseList", "warehouseMap", "areaList", "areaMap", "rackList", "rackMap", "userId"])
+		},
+		async created() {
+		},
+		methods: {
+			/** 查询仓库列表 */
+			getList() {
+				this.selectedWarehouseId = null
+				const query = {
+					...this.queryParams,
+					pageNum: undefined,
+					pageSize: undefined,
+				};
+				const pageReq = undefined;
+				listWmsWarehouse(query, pageReq).then((response) => {
+					const { content, totalElements } = response;
+					this.wmsWarehouseList = content;
+					this.setChildren();
+					this.loadAreas()
+				});
+			},
+
+			setChildren() {
+				let warehouseChildMap = new Map()
+				let areaChildMap = new Map()
+
+				this.rackList.forEach((rack) => {
+					let children = areaChildMap.get(rack.areaId)
+					if (!children) {
+						children = []
+					};
+					children.push({ key: 'rack' + rack.id, id: rack.id, warehouseName: rack.rackName, warehouseNo: rack.rackNo })
+					areaChildMap.set(rack.areaId, children)
+				});
+
+				this.areaList.forEach((area) => {
+					let children = warehouseChildMap.get(area.warehouseId)
+					if (!children) {
+						children = []
+					};
+					children.push({ key: 'area' + area.id, id: area.id, warehouseName: area.areaName, warehouseNo: area.areaNo, children: areaChildMap.get(area.id) })
+					warehouseChildMap.set(area.warehouseId, children)
+				});
+
+				this.wmsWarehouseList.forEach((warehouse) => {
+					warehouse.isParent = 1;
+					warehouse.key = warehouse.id
+					warehouse.children = warehouseChildMap.get(warehouse.id)
+				})
+
+			},
+
+
+			// 取消按钮
+			cancel() {
+				this.openWarehouse = false;
+				this.openArea = false;
+				this.resetWarehouseForm();
+				this.resetAreaForm();
+			},
+			// 表单重置
+			resetWarehouseForm() {
+				this.warehouseForm = {
+					id: null,
+					warehouseNo: null,
+					warehouseName: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+				};
+				this.resetForm("warehouseForm");
+			},
+			resetAreaForm() {
+				this.areaForm = {
+					id: null,
+					areaNo: null,
+					areaName: null,
+					warehouseId: null,
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+				};
+				this.resetForm("areaForm");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				// this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			/** 新增仓库按钮操作 */
+			handleAddWarehouse() {
+				this.resetWarehouseForm();
+				this.openWarehouse = true;
+				this.title = "添加仓库";
+			},
+			/** 新增库区按钮操作 */
+			handleAddArea() {
+				this.resetAreaForm();
+				this.areaForm.warehouseId = this.selectedWarehouseId;
+				this.openArea = true;
+				this.title = "添加库区";
+			},
+			/** 修改库区按钮操作 */
+			handleUpdateArea(row) {
+				this.resetAreaForm();
+				const id = row.id || this.ids;
+				getWmsArea(id).then((response) => {
+					this.areaForm = response;
+					this.openArea = true;
+					this.title = "修改库区";
+				});
+			},
+			/** 修改仓库按钮操作 */
+			handleUpdateWarehouse() {
+				this.resetWarehouseForm();
+				const id = this.selectedWarehouseId;
+				getWmsWarehouse(id).then((response) => {
+					this.warehouseForm = response;
+					this.openWarehouse = true;
+					this.title = "修改仓库";
+				});
+			},
+			/** 提交按钮（添加仓库） */
+			submitWarehouseForm() {
+				this.$refs["warehouseForm"].validate((valid) => {
+					if (valid) {
+						if (this.warehouseForm.id != null) {
+							updateWmsWarehouse(this.warehouseForm).then((response) => {
+								this.$store.dispatch("wms/getWarehouseList");
+								this.$modal.msgSuccess("修改成功");
+								this.openWarehouse = false;
+								this.getList();
+							});
+						} else {
+							addWmsWarehouse(this.warehouseForm).then((response) => {
+								this.$store.dispatch("wms/getWarehouseList");
+								this.$modal.msgSuccess("新增成功");
+								this.openWarehouse = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 提交按钮（添加库区） */
+			submitAreaForm() {
+				this.$refs["areaForm"].validate((valid) => {
+					if (valid) {
+						if (this.areaForm.id != null) {
+							updateWmsArea(this.areaForm).then((response) => {
+								this.$store.dispatch("wms/getAreaList");
+								this.$modal.msgSuccess("修改成功");
+								this.openArea = false;
+								this.loadAreas();
+							});
+						} else {
+							addWmsArea(this.areaForm).then((response) => {
+								this.$store.dispatch("wms/getAreaList");
+								this.$modal.msgSuccess("新增成功");
+								this.openArea = false;
+								this.loadAreas();
+							});
+						}
+					}
+				});
+			},
+			/**删除库区按钮 */
+			handleDelete(row) {
+				const ids = row.id;
+				this.$modal
+					.confirm('是否确认删除库区编号为"' + ids + '"的数据项？')
+					.then(function () {
+						return delWmsArea(ids);
+					})
+					.then(() => {
+						this.loadAreas();
+						this.$store.dispatch("wms/getAreaList");
+						this.$modal.msgSuccess("删除成功");
+					})
+					.catch(() => {});
+			},
+			/**删除仓库按钮 */
+			handleDeleteWarehouse() {
+				const warehouseId = this.selectedWarehouseId;
+				this.$modal
+					.confirm('是否确认删除仓库编号为"' + warehouseId + '"的数据项？')
+					.then(function () {
+						return delWmsWarehouse(warehouseId)
+					})
+					.then(() => {
+						this.getList();
+						if (this.wmsWarehouseList.length != 0) {
+							this.$refs.leftRef.currentName = '0'
+						}
+						this.$store.dispatch("wms/getWarehouseList");
+						this.$modal.msgSuccess("删除成功");
+					})
+					.catch(() => {})
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal
+					.confirm("是否确认导出所有仓库数据项？")
+					.then(() => {
+						this.exportLoading = true;
+						return exportWmsWarehouse(queryParams);
+					})
+					.then((response) => {
+						this.$download.download(response);
+						this.exportLoading = false;
+					})
+					.catch(() => {});
+			},
+			/** 左侧仓库标签页选中操作 */
+			handleTabClick(tab, event) {
+				this.queryAreaParam = null
+				this.selectedWarehouseId = this.wmsWarehouseList[tab.index].id
+				this.loadAreas()
+				// this.queryAreaParams.warehouseId = tab.warehouseId;
+				// this.loadAreas()
+			},
+			/** 加载选中仓库的库区信息 */
+			loadAreas() {
+				this.loading = true;
+				if (this.selectedWarehouseId == null) {
+					if (this.wmsWarehouseList.length == 0) {
+						this.wmsAreaList = [];
+						return;
+					}
+					this.queryAreaParams.warehouseId = this.wmsWarehouseList[0].id;
+					this.selectedWarehouseId = this.wmsWarehouseList[0].id;
+				} else {
+					this.queryAreaParams.warehouseId = this.selectedWarehouseId;
+				}
+				const { pageNum, pageSize } = this.queryAreaParams;
+				const query = {
+					...this.queryAreaParams,
+					pageNum: undefined,
+					pageSize: undefined,
+				};
+				const pageReq = undefined;
+				listWmsArea(query, pageReq).then((response) => {
+					const { content, totalElements } = response;
+					this.wmsAreaList = content;
+					this.total = totalElements;
+					this.loading = false;
+				})
+			},
+			// 仓库搜索按钮
+			handleSearchWarehouse() {
+				this.queryAreaParam = null
+				if (!this.queryWarehouseParam) {
+					this.wmsWarehouseList = this.warehouseList;
+				} else {
+					this.wmsWarehouseList = this.warehouseList.filter(it => it.warehouseNo == this.queryWarehouseParam || it.warehouseName == this.queryWarehouseParam)
+				}
+				this.loadAreas()
+			},
+			// 库区搜索按钮
+			handleSearchArea() {
+				if (!this.queryAreaParam) {
+					this.wmsAreaList = this.areaList.filter(it => it.warehouseId == this.selectedWarehouseId);
+					return;
+				}
+				this.wmsAreaList = this.areaList.filter(it => it.warehouseId == this.selectedWarehouseId && (it.areaNo == this.queryAreaParam || it.areaName == this.queryAreaParam));
+			}
+		},
+	};
+</script>
+<style>
+	.content-wrapper {
+		/* margin-left: 20px; */
+		/* width: 400px; */
+		margin-bottom: 16px;
+	}
+
+	.content-margin {
+		margin-bottom: 16px;
+	}
+
+	.info-box {
+		/* background-color: #F7FAFC; */
+		width: 500px;
+		height: 60px;
+		padding: 10px 10px;
+	}
+
+	.el-tabs__item {
+		width: 200px;
+	}
+
+	.clearfix:after {
+		content: ' ';
+		display: block;
+		height: 0;
+		clear: both;
+	}
+
+	.left {
+		float: left;
+	}
+
+	.right {
+		float: right;
+	}
+
+	.oper_area {
+		margin-bottom: 10px;
+	}
+
+	.title {
+		font-size: 18px;
+		font-weight: bold;
+		text-align: right;
+		width: 200px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wms/wave/index.vue b/src/views/wms/wave/index.vue
new file mode 100644
index 0000000..272a248
--- /dev/null
+++ b/src/views/wms/wave/index.vue
@@ -0,0 +1,219 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="波次号" prop="waveNo">
+				<el-input v-model.trim="queryParams.waveNo" placeholder="请输入波次号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="状态" prop="status">
+				<DictRadio v-model="queryParams.status" @change="handleQuery" size="small" :radioData="dict.type.wms_wave_status" :showAll="'all'" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="WaveList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="波次号" align="center" prop="waveNo" v-if="columns[0].visible" />
+			<el-table-column label="状态" align="center" prop="status" v-if="columns[1].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_wave_status" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[1].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[2].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<!--          <el-button-->
+					<!--            size="mini"-->
+					<!--            type="text"-->
+					<!--            icon="el-icon-edit"-->
+					<!--            @click="handleUpdate(scope.row)"-->
+					<!--            v-hasPermi="['wms:wave:edit']"-->
+					<!--          >修改</el-button>-->
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAllocation(scope.row)" v-hasPermi="['wms:wave:edit']">分配库存</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.status == 1" @click="handleDelete(scope.row)" v-hasPermi="['wms:wave:remove']">取消波次</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+	import { listWave, getWave, delWave, addWave, updateWave, exportWave } from "@/api/wms/wave";
+
+	export default {
+		name: "Wave",
+		dicts: ["wms_wave_status"],
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 波次表格数据
+				WaveList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					waveNo: null,
+					status: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					waveNo: [
+						{ required: true, message: "波次号不能为空", trigger: "blur" }
+					],
+				},
+				columns: [
+					{ key: 1, label: "波次号", visible: true },
+					{ key: 2, label: "状态", visible: true },
+					{ key: 3, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			handleAllocation(row) {
+				this.$router.push({
+					path: "/wms/wave/status",
+					query: {
+						id: row.id
+					}
+				});
+			},
+			/** 查询波次列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, type: 2 };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWave(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.WaveList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					waveNo: null,
+					status: "0",
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset();
+				this.open = true;
+				this.title = "添加波次";
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset();
+				const id = row.id || this.ids
+				getWave(id).then(response => {
+					this.form = response;
+					this.open = true;
+					this.title = "修改波次";
+				});
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.$refs["form"].validate(valid => {
+					if (valid) {
+						if (this.form.id != null) {
+							updateWave(this.form).then(response => {
+								this.$modal.msgSuccess("修改成功");
+								this.open = false;
+								this.getList();
+							});
+						} else {
+							addWave(this.form).then(response => {
+								this.$modal.msgSuccess("新增成功");
+								this.open = false;
+								this.getList();
+							});
+						}
+					}
+				});
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				const waveNo = row.waveNo;
+				this.$modal.confirm('是否确认删除波次编号为"' + waveNo + '"的数据项？').then(function () {
+					return delWave(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+			/** 导出按钮操作 */
+			handleExport() {
+				const queryParams = this.queryParams;
+				this.$modal.confirm('是否确认导出所有波次数据项？').then(() => {
+					this.exportLoading = true;
+					return exportWave(queryParams);
+				}).then(response => {
+					this.$download.download(response);
+					this.exportLoading = false;
+				}).catch(() => {});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/wave/receipt/index.vue b/src/views/wms/wave/receipt/index.vue
new file mode 100644
index 0000000..e357935
--- /dev/null
+++ b/src/views/wms/wave/receipt/index.vue
@@ -0,0 +1,164 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+			<el-form-item label="批次" prop="waveNo">
+				<el-input v-model.trim="queryParams.waveNo" placeholder="请输入批次号" clearable size="small" @keyup.enter.native="handleQuery" />
+			</el-form-item>
+			<el-form-item label="状态" prop="status">
+				<DictRadio v-model="queryParams.status" @change="handleQuery" size="small" :radioData="dict.type.wms_wave_status" :showAll="'all'" />
+			</el-form-item>
+			<el-form-item class="flex_one tr">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<WmsTable v-loading="loading" :data="WaveList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="批次号" align="center" prop="waveNo" v-if="columns[0].visible" />
+			<el-table-column label="状态" align="center" prop="status" v-if="columns[1].visible">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.wms_wave_status" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[1].visible" />
+			<el-table-column label="备注" align="center" prop="remark" v-if="columns[2].visible" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAllocation(scope.row)" v-hasPermi="['wms:wave:edit']">分配库存</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.status == 1" @click="handleDelete(scope.row)" v-hasPermi="['wms:wave:remove']">取消</el-button>
+				</template>
+			</el-table-column>
+		</WmsTable>
+
+		<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+	import { listWave, delWaveForReceipt } from '@/api/wms/wave'
+
+	export default {
+		dicts: ["wms_wave_status"],
+		data() {
+			return {
+				// 遮罩层
+				loading: true,
+				// 导出遮罩层
+				exportLoading: false,
+				// 选中数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 显示搜索条件
+				showSearch: true,
+				// 总条数
+				total: 0,
+				// 波次表格数据
+				WaveList: [],
+				// 弹出层标题
+				title: "",
+				// 是否显示弹出层
+				open: false,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					waveNo: null,
+					status: null,
+				},
+				// 表单参数
+				form: {},
+				// 表单校验
+				rules: {
+					waveNo: [
+						{ required: true, message: "批次号不能为空", trigger: "blur" }
+					],
+				},
+				columns: [
+					{ key: 1, label: "批次号", visible: true },
+					{ key: 2, label: "状态", visible: true },
+					{ key: 3, label: "备注", visible: true },
+				],
+			};
+		},
+		created() {
+			this.getList();
+		},
+		methods: {
+			handleAllocation(row) {
+				this.$router.push({
+					path: "/wms/wave/receipt/status",
+					query: {
+						id: row.id
+					}
+				});
+			},
+			/** 查询波次列表 */
+			getList() {
+				this.loading = true;
+				const { pageNum, pageSize } = this.queryParams;
+				const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined, type: 1 };
+				const pageReq = { page: pageNum - 1, size: pageSize };
+				listWave(query, pageReq).then(response => {
+					const { content, totalElements } = response
+					this.WaveList = content;
+					this.total = totalElements;
+					this.loading = false;
+				});
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false;
+				this.reset();
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					id: null,
+					waveNo: null,
+					status: "0",
+					remark: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null
+				};
+				this.resetForm("form");
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1;
+				this.getList();
+			},
+			/** 重置按钮操作 */
+			resetQuery() {
+				this.resetForm("queryForm");
+				this.handleQuery();
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.single = selection.length !== 1
+				this.multiple = !selection.length
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const ids = row.id || this.ids;
+				const waveNo = row.waveNo;
+				this.$modal.confirm('是否确认删除批次号为"' + waveNo + '"的数据项？').then(function () {
+					return delWaveForReceipt(ids);
+				}).then(() => {
+					this.getList();
+					this.$modal.msgSuccess("删除成功");
+				}).catch(() => {});
+			},
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/wms/wave/receipt/status.vue b/src/views/wms/wave/receipt/status.vue
new file mode 100644
index 0000000..cf7ac25
--- /dev/null
+++ b/src/views/wms/wave/receipt/status.vue
@@ -0,0 +1,374 @@
+<template>
+	<div class="shipment-order-status-wrapper app-container" v-loading="loading">
+		<div class="shipment-order-content">
+			<el-row class="mb8 mt10" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">入库单明细</div>
+				</el-col>
+			</el-row>
+
+			<el-dialog title="请选择入库状态" :visible.sync="open" width="50%" append-to-body="append-to-body">
+				<DictRadio v-model="dialogStatus" :radioData="dialogStatusRange"></DictRadio>
+				<div class="dialog-footer" slot="footer">
+					<el-button type="primary" @click="dialogConfirm">确 定</el-button>
+					<el-button @click="cancelDialog">取 消</el-button>
+				</div>
+			</el-dialog>
+
+			<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+				<el-table-column label="入库单" align="center" width="200" prop="orderNo" />
+				<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+				<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+				<el-table-column label="计划数量" align="center" prop="planQuantity"></el-table-column>
+			</WmsTable>
+			<el-row class="mb8 mt20" :gutter="10">
+				<el-col>
+					<div class="flex-one large-tip bolder-font">备注</div>
+					<el-input class="mt10" type="textarea" v-model="form.remark" />
+				</el-col>
+			</el-row>
+			<el-row class="mb8 mt20" :gutter="10">
+				<el-col :span="1.5" v-if="form.status === '1'">
+					<el-button size="small" icon="el-icon-check" type="warning" plain="plain" @click="dialogFormVisible = true">
+						分配仓库/库区
+					</el-button>
+				</el-col>
+				<!--        <el-col :span="1.5">-->
+				<!--          <el-button size="small" type="danger" plain="plain" @click="onCancelInventory">-->
+				<!--            取消分配-->
+				<!--          </el-button>-->
+				<!--        </el-col>-->
+				<el-col :span="1.5">
+					<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+						批量设置仓库/库区
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="batch"
+						>批量设置入库状态
+					</el-button>
+				</el-col>
+			</el-row>
+			<WmsTable :data="form.allocationDetails" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" align="center" :selectable="(row) => !row.finish"></el-table-column>
+				<el-table-column label="入库单" align="center" width="200" prop="orderNo" />
+				<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+				<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+				<el-table-column label="数量" align="center" prop="planQuantity"></el-table-column>
+				<el-table-column label="实际数量" align="center" width="150">
+					<template slot-scope="scope">
+						<el-input-number
+							v-model="scope.row.realQuantity"
+							:min="1"
+							:max="2147483647"
+							size="small"
+							:disabled="scope.row.finish"
+						></el-input-number>
+					</template>
+				</el-table-column>
+				<el-table-column label="仓库/库区" align="center" width="200">
+					<template slot-scope="scope">
+						<WmsWarehouseCascader v-model="scope.row.place" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+					</template>
+				</el-table-column>
+				<el-table-column label="入库状态" width="150">
+					<template slot-scope="{ row }">
+						<DictSelect v-model="row.receiptOrderStatus" :options="row.range" size="small" :disabled="row.finish"></DictSelect>
+					</template>
+				</el-table-column>
+			</WmsTable>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary" :disabled="finish">保存</el-button>
+			</div>
+			<BatchWarehouseDialog
+				:visible.sync="batchDialogVisible"
+				:form-data.sync="batchForm"
+				@confirmed="onBatchDialogFinished"
+			></BatchWarehouseDialog>
+			<el-dialog title="自动分配仓库/库区" :visible.sync="dialogFormVisible" width="400px">
+				<el-form :model="dialogForm">
+					<el-form-item label="分配策略" label-width="98px" :rules="[{ required: true, message: '请选择分配策略', trigger: 'change' }]">
+						<el-select v-model="dialogForm.region" placeholder="请选择分配策略">
+							<el-option label="库存量小的库位优先" :value="1"></el-option>
+							<el-option label="库存量大的库位优先" :value="2"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button @click="dialogFormVisible = false">取 消</el-button>
+					<el-button type="primary" @click="allocated()">确 定</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
+</template>
+
+<script>
+import ItemSelect from '@/views/components/ItemSelect'
+import { mapGetters } from 'vuex'
+import WmsCarrier from '@/views/wms/carrier/index.vue'
+import BatchWarehouseDialog from '@/views/components/wms/BatchWarehouseDialog/index.vue'
+import { ShipmentOrderConstant } from '@/constant/ShipmentOrderConstant.ts'
+import { cancelAllocatedInventoryForReceipt, confirmWaveForReceipt, getReceiptWave, waveAllocatedInventoryForReceipt } from '@/api/wms/wave'
+
+export default {
+	components: { BatchWarehouseDialog, WmsCarrier, ItemSelect },
+	dicts: ['wms_receipt_type', 'wms_receipt_status'],
+	computed: {
+		ShipmentOrderConstant() {
+			return ShipmentOrderConstant
+		},
+		...mapGetters(['customerMap', 'carrierMap']),
+		shipmentStatusMap() {
+			let obj = this.dict.type.wms_receipt_status.map((item) => [item.value, item.label])
+			let map = new Map(obj)
+			return map
+		},
+		mergeDetailStatusArray() {
+			const arr = this.sourceDetails || []
+			return [...new Set(arr.filter((it) => it.receiptOrderStatus !== null).map((it) => it.receiptOrderStatus))]
+		},
+		dialogStatusRange() {
+			if (this.mergeDetailStatusArray.length !== 1) {
+				return []
+			}
+			return this.getRange(this.mergeDetailStatusArray[0])
+		},
+	},
+	data() {
+		return {
+			// 分配仓库
+			dialogFormVisible: false,
+			dialogForm: {
+				region: 1,
+			},
+			// 批量设置仓库/库区
+			batchDialogVisible: false,
+			batchForm: {
+				place: [],
+			},
+			open: false,
+			// 遮罩层
+			loading: true,
+			ids: [],
+			// 表单参数
+			form: {
+				details: [],
+			},
+			sourceDetails: [],
+			// 表单校验
+			rules: {},
+			dialogStatus: null,
+			// 非多个禁用
+			multiple: true,
+			finish: false,
+			// 物流管理
+			deliveryTitle: '',
+			waveOrderId: null,
+			columns: [
+				{ key: 1, label: '出库单主表Id', visible: false },
+				{ key: 2, label: '承运商Id', visible: true },
+				{ key: 3, label: '发货日期', visible: true },
+				{ key: 4, label: '快递单号', visible: true },
+				{ key: 5, label: '备注', visible: true },
+			],
+		}
+	},
+	created() {
+		// console.log(this.$route.query, "this.$route.query")
+		const { id } = this.$route.query
+		if (id) {
+			this.waveOrderId = id
+			this.loadDetail(id)
+		} else {
+			this.cancel()
+		}
+	},
+	methods: {
+		/** 取消分配 */
+		onCancelInventory() {
+			cancelAllocatedInventoryForReceipt(this.waveOrderId).then((res) => {
+				this.$modal.msgSuccess(res ? '修改成功' : '修改失败')
+				this.cancel()
+			})
+		},
+		/** 自动分配 仓库/库区 */
+		allocated() {
+			waveAllocatedInventoryForReceipt({ id: this.waveOrderId, type: this.dialogForm.region }).then((response) => {
+				this.$modal.msgSuccess('分配成功')
+				this.dialogFormVisible = false
+				const { details, items, allocationDetails } = response
+				const map = {}
+				;(items || []).forEach((it) => {
+					map[it.id] = it
+				})
+				details &&
+					details.forEach((it) => {
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place
+						}
+						it.range = this.getRange(it.receiptOrderStatus)
+						it.finish = it.receiptOrderStatus === 3
+					})
+				let count = 1
+				allocationDetails &&
+					allocationDetails.forEach((it) => {
+						it.id = count++
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place
+						}
+						it.range = this.getRange(it.receiptOrderStatus)
+						it.finish = it.receiptOrderStatus === 3
+					})
+				this.sourceDetails = allocationDetails.map((it) => ({ ...it }))
+				this.finish = allocationDetails.filter((it) => !it.finish)?.length === 0
+				this.form = {
+					...response,
+					details,
+					allocationDetails,
+				}
+				// this.loadDetail(this.shipmentOrderId)
+			})
+		},
+		/** 批量设置仓库/库区 */
+		onBatchSetInventory() {
+			const { allocationDetails } = this.form
+			if (!allocationDetails || allocationDetails.length === 0) {
+				this.$modal.msgError('请先添加物料')
+				return
+			}
+			// 未选中
+			if (!this.ids.length) {
+				this.$modal.msgError('请先选择物料')
+				return
+			}
+			this.batchDialogVisible = true
+		},
+		/** 批量设置仓库/库区 完成事件 */
+		onBatchDialogFinished() {
+			this.batchDialogVisible = false
+			const [warehouseId, areaId, rackId] = this.batchForm.place || []
+			this.form.allocationDetails.forEach((it) => {
+				// 仅更新已选中
+				if (this.ids.includes(it.id)) {
+					it.place = [warehouseId, areaId, rackId].filter(Boolean)
+				}
+			})
+		},
+		// 格式化承运商
+		getCarrier(row, column) {
+			return this.carrierMap.get(row.carrierId)
+		},
+		dialogConfirm() {
+			if (!this.dialogStatus) {
+				this.$modal.alert('请选择出库状态')
+				return
+			}
+			this.form.allocationDetails.forEach((detail) => {
+				if (this.ids.includes(detail.id)) {
+					detail.receiptOrderStatus = this.dialogStatus
+				}
+			})
+			this.cancelDialog()
+		},
+		cancelDialog() {
+			this.open = false
+			this.dialogStatus = null
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map((item) => item.id)
+			this.multiple = !selection.length
+		},
+		batch() {
+			if (this.multiple) {
+				this.$modal.alert('请先选择物料')
+			} else {
+				this.open = true
+			}
+		},
+		cancel() {
+			this.$tab.closeOpenPage({ path: '/wms/receiptOrder' })
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.form.allocationDetails.forEach((it) => {
+				if (it.place) {
+					it.warehouseId = it.place[0]
+					it.areaId = it.place[1]
+					it.rackId = it.place[2]
+				} else {
+					it.warehouseId = null
+					it.areaId = null
+					it.rackId = null
+				}
+				it.delFlag = 0
+			})
+			const req = { ...this.form, id: this.waveOrderId, remark: this.form.remark }
+			confirmWaveForReceipt(req).then((response) => {
+				if (response.code == 398) {
+					return
+				}
+				this.$modal.msgSuccess('保存成功')
+				this.cancel()
+			})
+		},
+		loadDetail(id) {
+			this.loading = true
+			getReceiptWave(id)
+				.then((response) => {
+					const { details, items } = response
+					const map = {}
+					;(items || []).forEach((it) => {
+						map[it.id] = it
+					})
+					details &&
+						details.forEach((it) => {
+							it.prod = map[it.itemId]
+							if ((!it.place || it.place.length === 0) && it.prod) {
+								it.place = it.prod.place
+							}
+							it.range = this.getRange(it.receiptOrderStatus)
+							it.finish = it.receiptOrderStatus === 3
+						})
+					console.log(details)
+					this.sourceDetails = details.map((it) => ({ ...it }))
+					this.finish = details.filter((it) => !it.finish)?.length === 0
+					this.form = {
+						...response,
+						details,
+						allocationDetails: details.map((it) => ({ ...it })),
+					}
+				})
+				.finally(() => {
+					this.loading = false
+				})
+		},
+		getRange(status) {
+			const arr = this.dict.type.wms_receipt_status
+			if (status === 4 || status === 3) {
+				return arr.filter((it) => +it.value === status).map((it) => ({ label: it.label, value: it.value }))
+			}
+			if (status === 2) {
+				return arr
+					.filter((it) => +it.value >= status && +it.value !== 4)
+					.map((it) => ({
+						label: it.label,
+						value: it.value,
+					}))
+			}
+			return arr.filter((it) => +it.value >= status).map((it) => ({ label: it.label, value: it.value }))
+		},
+	},
+}
+</script>
+<style lang="stylus">
+.shipment-order-status-wrapper
+  .shipment-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
diff --git a/src/views/wms/wave/status-stylus.txt b/src/views/wms/wave/status-stylus.txt
new file mode 100644
index 0000000..575c573
--- /dev/null
+++ b/src/views/wms/wave/status-stylus.txt
@@ -0,0 +1,3 @@
+<style lang="stylus">
+	.shipment-order-status-wrapper .shipment-order-content width 70% min-width 900px margin 0 auto
+</style>
\ No newline at end of file
diff --git a/src/views/wms/wave/status.vue b/src/views/wms/wave/status.vue
new file mode 100644
index 0000000..71a2d91
--- /dev/null
+++ b/src/views/wms/wave/status.vue
@@ -0,0 +1,365 @@
+<template>
+	<div class="shipment-order-status-wrapper app-container" v-loading="loading">
+		<div class="shipment-order-content">
+			<el-row class="mb8 mt10" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">出库单明细</div>
+				</el-col>
+			</el-row>
+
+			<el-dialog title="请选择出库状态" :visible.sync="open" width="50%" append-to-body="append-to-body">
+				<DictRadio v-model="dialogStatus" :radioData="dialogStatusRange"></DictRadio>
+				<div class="dialog-footer" slot="footer">
+					<el-button type="primary" @click="dialogConfirm">确 定</el-button>
+					<el-button @click="cancelDialog">取 消</el-button>
+				</div>
+			</el-dialog>
+
+			<WmsTable :data="form.details" @selection-change="handleSelectionChange">
+				<el-table-column label="出库单" align="center" width="200" prop="orderNo" />
+				<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+				<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+				<el-table-column label="计划数量" align="center" prop="planQuantity"></el-table-column>
+
+			</WmsTable>
+			<el-row class="mb8 mt20" :gutter="10">
+				<el-col>
+					<div class="flex-one large-tip bolder-font">备注</div>
+					<el-input class="mt10" type="textarea" v-model="form.remark" />
+				</el-col>
+			</el-row>
+			<el-row class="mb8 mt20" :gutter="10">
+				<el-col :span="1.5">
+					<div class="flex-one large-tip bolder-font">拣货单明细</div>
+				</el-col>
+
+				<el-col :span="1.5">
+					<el-button size="small" icon="el-icon-check" type="warning" plain="plain" @click="dialogFormVisible = true">
+						分配仓库/库区
+					</el-button>
+				</el-col>
+				<!--        <el-col :span="1.5">-->
+				<!--          <el-button size="small" type="danger" plain="plain" @click="onCancelInventory">-->
+				<!--            取消分配-->
+				<!--          </el-button>-->
+				<!--        </el-col>-->
+				<el-col :span="1.5">
+					<el-button size="small" type="success" plain="plain" icon="el-icon-delete-location" @click="onBatchSetInventory">
+						批量设置仓库/库区
+					</el-button>
+				</el-col>
+				<el-col :span="1.5">
+					<el-button v-if="mergeDetailStatusArray.length === 1" type="primary" plain="plain" size="small" @click="batch">批量设置出库状态
+					</el-button>
+				</el-col>
+			</el-row>
+			<WmsTable :data="form.allocationDetails" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" align="center" :selectable="(row)=>!row.finish"></el-table-column>
+				<el-table-column label="出库单" align="center" width="200" prop="orderNo" />
+				<el-table-column label="物料名" align="center" prop="prod.itemName"></el-table-column>
+				<el-table-column label="物料编号" align="center" prop="prod.itemNo"></el-table-column>
+				<el-table-column label="数量" align="center" prop="planQuantity"></el-table-column>
+				<el-table-column label="实际数量" align="center" width="150">
+					<template slot-scope="scope">
+						<el-input-number v-model="scope.row.realQuantity" :min="1" :max="2147483647" size="small" :disabled="scope.row.finish"></el-input-number>
+					</template>
+				</el-table-column>
+				<el-table-column label="仓库/库区" align="center" width="200">
+					<template slot-scope="scope">
+						<WmsWarehouseCascader v-model="scope.row.place" size="small" :disabled="scope.row.finish"></WmsWarehouseCascader>
+					</template>
+				</el-table-column>
+				<el-table-column label="出库状态" width="150">
+					<template slot-scope="{ row }">
+						<DictSelect v-model="row.shipmentOrderStatus" :options="row.range" size="small" :disabled="row.finish"></DictSelect>
+					</template>
+				</el-table-column>
+			</WmsTable>
+			<div class="tc mt16">
+				<el-button @click="cancel">取消</el-button>
+				<el-button @click="submitForm" type="primary" :disabled="finish">保存</el-button>
+			</div>
+			<BatchWarehouseDialog :visible.sync="batchDialogVisible" :form-data.sync="batchForm" @confirmed="onBatchDialogFinished"></BatchWarehouseDialog>
+			<el-dialog title="自动分配仓库/库区" :visible.sync="dialogFormVisible" width="400px">
+				<el-form :model="dialogForm">
+					<el-form-item label="分配策略" label-width="98px" :rules="[{ required: true, message: '请选择分配策略', trigger: 'change' }]">
+						<el-select v-model="dialogForm.region" placeholder="请选择分配策略">
+							<el-option label="库存量小的库位优先" :value="1"></el-option>
+							<el-option label="库存量大的库位优先" :value="2"></el-option>
+							<el-option label="先入先出(FIFO)" :value="3" disabled></el-option>
+							<el-option label="先过期先出" :value="4" disabled></el-option>
+							<el-option label="适量库存优先" :value="5" disabled></el-option>
+						</el-select>
+					</el-form-item>
+				</el-form>
+				<div slot="footer" class="dialog-footer">
+					<el-button @click="dialogFormVisible = false">取 消</el-button>
+					<el-button type="primary" @click="allocated()">确 定</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
+</template>
+
+<script>
+	import ItemSelect from '@/views/components/ItemSelect'
+	import { mapGetters } from 'vuex'
+	import WmsCarrier from "@/views/wms/carrier/index.vue";
+	import BatchWarehouseDialog from "@/views/components/wms/BatchWarehouseDialog/index.vue";
+	import { ShipmentOrderConstant } from "@/constant/ShipmentOrderConstant.ts";
+	import { cancelAllocatedInventory, confirmWave, getWave, waveAllocatedInventory } from "@/api/wms/wave";
+
+	export default {
+		name: 'WmsShipmentOrder',
+		components: { BatchWarehouseDialog, WmsCarrier, ItemSelect },
+		dicts: ['wms_shipment_type', 'wms_shipment_status'],
+		computed: {
+			ShipmentOrderConstant() {
+				return ShipmentOrderConstant
+			},
+			...mapGetters(['customerMap', 'carrierMap']),
+			shipmentStatusMap() {
+				let obj = this.dict.type.wms_shipment_status.map(item => [item.value, item.label])
+				let map = new Map(obj)
+				return map
+			},
+			mergeDetailStatusArray() {
+				const arr = this.sourceDetails || []
+				return [...new Set(arr.filter(it => it.shipmentOrderStatus !== null).map(it => it.shipmentOrderStatus))]
+			},
+			dialogStatusRange() {
+				if (this.mergeDetailStatusArray.length !== 1) {
+					return []
+				}
+				return this.getRange(this.mergeDetailStatusArray[0])
+			}
+		},
+		data() {
+			return {
+				// 分配仓库
+				dialogFormVisible: false,
+				dialogForm: {
+					region: 1,
+				},
+				// 批量设置仓库/库区
+				batchDialogVisible: false,
+				batchForm: {
+					place: []
+				},
+				open: false,
+				// 遮罩层
+				loading: true,
+				ids: [],
+				// 表单参数
+				form: {
+					details: []
+				},
+				sourceDetails: [],
+				// 表单校验
+				rules: {},
+				dialogStatus: null,
+				// 非多个禁用
+				multiple: true,
+				finish: false,
+				// 物流管理
+				deliveryTitle: '',
+				waveOrderId: null,
+				columns: [
+					{ key: 1, label: "出库单主表Id", visible: false },
+					{ key: 2, label: "承运商Id", visible: true },
+					{ key: 3, label: "发货日期", visible: true },
+					{ key: 4, label: "快递单号", visible: true },
+					{ key: 5, label: "备注", visible: true },
+				],
+			}
+		},
+		created() {
+			// console.log(this.$route.query, "this.$route.query")
+			const { id } = this.$route.query
+			if (id) {
+				this.waveOrderId = id
+				this.loadDetail(id)
+			} else {
+				this.cancel()
+			}
+		},
+		methods: {
+			/** 取消分配 */
+			onCancelInventory() {
+				cancelAllocatedInventory(this.waveOrderId).then(res => {
+					this.$modal.msgSuccess(res ? '修改成功' : '修改失败')
+					this.cancel()
+				})
+			},
+			/** 自动分配 仓库/库区 */
+			allocated() {
+				waveAllocatedInventory({ id: this.waveOrderId, type: this.dialogForm.region }).then(response => {
+					this.$modal.msgSuccess("分配成功");
+					this.dialogFormVisible = false;
+					const { details, items, allocationDetails } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					details && details.forEach(it => {
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place;
+						}
+						it.range = this.getRange(it.shipmentOrderStatus)
+						it.finish = it.shipmentOrderStatus === 13
+					})
+					let count = 1;
+					allocationDetails && allocationDetails.forEach(it => {
+						it.id = count++;
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place;
+						}
+						it.range = this.getRange(it.shipmentOrderStatus)
+						it.finish = it.shipmentOrderStatus === 13
+					})
+					this.sourceDetails = allocationDetails.map(it => ({ ...it }))
+					this.finish = allocationDetails.filter(it => !it.finish)?.length === 0
+					this.form = {
+						...response,
+						details,
+						allocationDetails
+					}
+					// this.loadDetail(this.shipmentOrderId)
+				});
+			},
+			/** 批量设置仓库/库区 */
+			onBatchSetInventory() {
+				const { allocationDetails } = this.form
+				if (!allocationDetails || allocationDetails.length === 0) {
+					this.$modal.msgError('请先添加物料')
+					return
+				}
+				// 未选中
+				if (!this.ids.length) {
+					this.$modal.msgError('请先选择物料')
+					return
+				}
+				this.batchDialogVisible = true
+			},
+			/** 批量设置仓库/库区 完成事件 */
+			onBatchDialogFinished() {
+				this.batchDialogVisible = false
+				const [warehouseId, areaId, rackId] = this.batchForm.place || []
+				this.form.allocationDetails.forEach(it => {
+					// 仅更新已选中
+					if (this.ids.includes(it.id)) {
+						it.place = [warehouseId, areaId, rackId].filter(Boolean)
+					}
+				})
+			},
+			// 格式化承运商
+			getCarrier(row, column) {
+				return this.carrierMap.get(row.carrierId)
+			},
+			dialogConfirm() {
+				if (!this.dialogStatus) {
+					this.$modal.alert('请选择出库状态')
+					return
+				}
+				this.form.allocationDetails.forEach(detail => {
+					if (this.ids.includes(detail.id)) {
+						detail.shipmentOrderStatus = this.dialogStatus
+					}
+				})
+				this.cancelDialog()
+			},
+			cancelDialog() {
+				this.open = false
+				this.dialogStatus = null
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map(item => item.id)
+				this.multiple = !selection.length
+			},
+			batch() {
+				if (this.multiple) {
+					this.$modal.alert('请先选择物料')
+				} else {
+					this.open = true
+				}
+			},
+			cancel() {
+				this.$tab.closeOpenPage({ path: '/wms/shipmentOrder' })
+			},
+			/** 提交按钮 */
+			submitForm() {
+				this.form.allocationDetails.forEach(it => {
+					if (it.place) {
+						it.warehouseId = it.place[0]
+						it.areaId = it.place[1]
+						it.rackId = it.place[2]
+					} else {
+						it.warehouseId = null
+						it.areaId = null
+						it.rackId = null
+					}
+					it.delFlag = 0;
+				})
+				const req = { ...this.form, id: this.waveOrderId, remark: this.form.remark }
+				confirmWave(req).then(response => {
+					if (response.code == 398) {
+						return
+					}
+					this.$modal.msgSuccess('保存成功')
+					this.cancel()
+				})
+
+			},
+			loadDetail(id) {
+				this.loading = true
+				getWave(id).then(response => {
+					const { details, items } = response
+					const map = {};
+					(items || []).forEach(it => {
+						map[it.id] = it
+					})
+					details && details.forEach(it => {
+						it.prod = map[it.itemId]
+						if ((!it.place || it.place.length === 0) && it.prod) {
+							it.place = it.prod.place;
+						}
+						it.range = this.getRange(it.shipmentOrderStatus)
+						it.finish = it.shipmentOrderStatus === 13
+					})
+					this.sourceDetails = details.map(it => ({ ...it }))
+					this.finish = details.filter(it => !it.finish)?.length === 0
+					this.form = {
+						...response,
+						details,
+						allocationDetails: details.map(it => ({ ...it }))
+					}
+				}).finally(() => {
+					this.loading = false
+				})
+			},
+			getRange(status) {
+				const arr = this.dict.type.wms_shipment_status
+				if (status === 4 || status === 3) {
+					return arr.filter(it => +it.value === status).map(it => ({ label: it.label, value: it.value }))
+				}
+				if (status === 2) {
+					return arr.filter(it => +it.value >= status && +it.value !== 4).map(it => ({
+						label: it.label,
+						value: it.value
+					}))
+				}
+				return arr.filter(it => +it.value >= status).map(it => ({ label: it.label, value: it.value }))
+			}
+		}
+	}
+</script>
+<style lang="stylus">
+.shipment-order-status-wrapper
+  .shipment-order-content
+    width 70%
+    min-width 900px
+    margin 0 auto
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 1367a25..1366792 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,7 +3,7 @@ const path = require('path')
 const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+	return path.join(__dirname, dir)
 }
 
 const name = defaultSettings.title // 标题
@@ -11,119 +11,123 @@ const name = defaultSettings.title // 标题
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 module.exports = {
-  css: {
-    sourceMap: process.env.NODE_ENV == 'production' ? false : true, //开启css  source maps功能，前端可以看到css具体的行数
-    loaderOptions: {
-      sass: {
-        sassOptions: { outputStyle: 'expanded' },
-      },
-    },
-  },
-  // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.baidu.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.baidu.com/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.VUE_APP_ROUTER_PREFIX,
-  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
-  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
-  // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
-  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0', //项目启动host
-    port: 8887, // 项目启动port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: 'http://localhost:8888/', // 后端接口地址
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: '', //需要rewrite的
-        },
-      },
-      msgHub: {
-        target: 'http://localhost:8888/msgHub',
-        ws: true,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^/msgHub']: '', //需要rewrite的
-        },
-      },
-    
-    },
-    disableHostCheck: true,
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      //设置路径别名，@代表根目录， @代表 src/文件夹
-      alias: {
-        '@': resolve('src'),
-      },
-    },
-    plugins: [],
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+	css: {
+		sourceMap: process.env.NODE_ENV == 'production' ? false : true, //开启css  source maps功能，前端可以看到css具体的行数
+		loaderOptions: {
+			sass: {
+				sassOptions: { outputStyle: 'expanded' },
+			},
+		},
+	},
+	// 部署生产环境和开发环境下的URL。
+	// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+	// 例如 https://www.baidu.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.baidu.com/admin/，则设置 baseUrl 为 /admin/。
+	publicPath: process.env.VUE_APP_ROUTER_PREFIX,
+	// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+	outputDir: 'dist',
+	// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+	assetsDir: 'static',
+	// 是否开启eslint保存检测，有效值：ture | false | 'error'
+	lintOnSave: process.env.NODE_ENV === 'development',
+	// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+	productionSourceMap: false,
+	// webpack-dev-server 相关配置
+	devServer: {
+		host: '0.0.0.0', //项目启动host
+		port: 8887, // 项目启动port,
+		open: true,
+		proxy: {
+			'/wms': {
+				target: 'http://localhost:8000/', // 后端接口地址
+				changeOrigin: true,
+			},
+			// detail: https://cli.vuejs.org/config/#devserver-proxy
+			[process.env.VUE_APP_BASE_API]: {
+				target: 'http://localhost:8888/', // 后端接口地址
+				changeOrigin: true,
+				pathRewrite: {
+					['^' + process.env.VUE_APP_BASE_API]: '', //需要rewrite的
+				},
+			},
 
-    // set svg-sprite-loader
-    config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]',
-      })
-      .end()
+			msgHub: {
+				target: 'http://localhost:8888/msgHub',
+				ws: true,
+				changeOrigin: true,
+				pathRewrite: {
+					['^/msgHub']: '', //需要rewrite的
+				},
+			},
 
-    config.when(process.env.NODE_ENV !== 'development', (config) => {
-      config
-        .plugin('ScriptExtHtmlWebpackPlugin')
-        .after('html')
-        .use('script-ext-html-webpack-plugin', [
-          {
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-            inline: /runtime\..*\.js$/,
-          },
-        ])
-        .end()
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'chunk-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial', // only package third parties that are initially dependent
-          },
-          elementUI: {
-            name: 'chunk-elementUI', // split elementUI into a single package
-            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
-          },
-          commons: {
-            name: 'chunk-commons',
-            test: resolve('src/components'), // can customize your rules
-            minChunks: 3, //  minimum common number
-            priority: 5,
-            reuseExistingChunk: true,
-          },
-        },
-      })
-      config.optimization.runtimeChunk('single'),
-        {
-          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-          to: './', //到根目录下
-        }
-    })
-  },
-}
+		},
+		disableHostCheck: true,
+	},
+	configureWebpack: {
+		name: name,
+		resolve: {
+			//设置路径别名，@代表根目录， @代表 src/文件夹
+			alias: {
+				'@': resolve('src'),
+			},
+		},
+		plugins: [],
+	},
+	chainWebpack(config) {
+		config.plugins.delete('preload') // TODO: need test
+		config.plugins.delete('prefetch') // TODO: need test
+
+		// set svg-sprite-loader
+		config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
+		config.module
+			.rule('icons')
+			.test(/\.svg$/)
+			.include.add(resolve('src/assets/icons'))
+			.end()
+			.use('svg-sprite-loader')
+			.loader('svg-sprite-loader')
+			.options({
+				symbolId: 'icon-[name]',
+			})
+			.end()
+
+		config.when(process.env.NODE_ENV !== 'development', (config) => {
+			config
+				.plugin('ScriptExtHtmlWebpackPlugin')
+				.after('html')
+				.use('script-ext-html-webpack-plugin', [
+				{
+					// `runtime` must same as runtimeChunk name. default is `runtime`
+					inline: /runtime\..*\.js$/,
+				}, ])
+				.end()
+			config.optimization.splitChunks({
+				chunks: 'all',
+				cacheGroups: {
+					libs: {
+						name: 'chunk-libs',
+						test: /[\\/]node_modules[\\/]/,
+						priority: 10,
+						chunks: 'initial', // only package third parties that are initially dependent
+					},
+					elementUI: {
+						name: 'chunk-elementUI', // split elementUI into a single package
+						priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+						test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+					},
+					commons: {
+						name: 'chunk-commons',
+						test: resolve('src/components'), // can customize your rules
+						minChunks: 3, //  minimum common number
+						priority: 5,
+						reuseExistingChunk: true,
+					},
+				},
+			})
+			config.optimization.runtimeChunk('single'),
+			{
+				from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+				to: './', //到根目录下
+			}
+		})
+	},
+}
\ No newline at end of file