diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 962925b1..38ce3500 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -65,3 +65,21 @@ export function getMaterialCoilTrace(query) {
params: query
})
}
+
+// 查询各个库区中不同类型的钢卷分布情况
+export function getMaterialCoilDistributionByWarehouse(query) {
+ return request({
+ url: '/wms/materialCoil/distributionByWarehouse',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询不同类型的钢卷在不同库区的分布情况
+export function getMaterialCoilDistributionByType(query) {
+ return request({
+ url: '/wms/materialCoil/distributionByItemType',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/klp-ui/src/views/wms/coil/box.vue b/klp-ui/src/views/wms/coil/box.vue
new file mode 100644
index 00000000..d5e3797b
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/box.vue
@@ -0,0 +1,711 @@
+
+
+
+
+
+
+ 物料
+ 仓库
+
+
+
+
+
+
+
+
+
+
+
{{ queryParams.statType === '1' ? '物料库存分布矩形树图' : '仓库库存分布矩形树图' }}
+
+
+
+
+
+
{{ queryParams.statType === '1' ? '物料卷数对比柱状图' : '仓库卷数对比柱状图' }}
+
+
+
+
+
+
{{ queryParams.statType === '1' ? '物料库存占比饼图' : '仓库库存占比饼图' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
+
+
+
+
+ {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.productName || '未知' }}({{ product.productCode || '无编码' }})
+
+
+
+
+ {{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }})
+
+
+
+
+
+
+
+ {{ formatCoilStatus(scope.row.coilStatus) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 489aa8dc..cd0f95e7 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -64,6 +64,7 @@
+
@@ -120,8 +121,8 @@
-
+
+
@@ -151,7 +152,9 @@ import { listMaterialCoil, getMaterialCoil, delMaterialCoil, addMaterialCoil, up
import WarehouseSelect from "@/components/WarehouseSelect";
import QRCode from "../../print/components/QRCode.vue";
import { saveAsImage } from '@/utils/klp';
-import MaterialSelect from "@/components/KLPService/ProductSelect";
+import ProductSelect from "@/components/KLPService/ProductSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+// import MaterialSelect from "@/components/KLPService/ProductSelect";
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini";
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
@@ -165,7 +168,9 @@ export default {
components: {
WarehouseSelect,
QRCode,
- MaterialSelect,
+ // MaterialSelect,
+ ProductSelect,
+ RawMaterialSelect,
ProductInfo,
RawMaterialInfo,
BomInfoMini,
@@ -224,7 +229,6 @@ export default {
hasMergeSplit: undefined,
parentCoilNos: undefined,
itemId: undefined,
- itemType: undefined,
status: undefined,
},
// 表单参数
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index 51072fac..11f196f6 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -12,9 +12,9 @@
-
+
搜索
重置
@@ -52,16 +52,16 @@
-
-
-
-
+
+
+
+
-
+