DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangyu
2025-11-11 22:30:14 +08:00
parent ff88c2c04a
commit 2c46526a98
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-ui/src/views/wms/coil/box2.vue
View File

@@ -106,12 +106,12 @@
<template slot-scope="scope"> <template slot-scope="scope">
<ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId"> <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
<template #default="{ product }"> <template #default="{ product }">
{{ product.productName || '未知' }}({{ product.productCode || '无编码' }}) {{ product.itemName || '未知' }}({{ product.itemCode || '无编码' }})
</template> </template>
</ProductInfo> </ProductInfo>
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId"> <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :materialId="scope.row.itemId">
<template #default="{ material }"> <template #default="{ material }">
{{ material.rawMaterialName || '未知' }}({{ material.rawMaterialCode || '无编码' }}) {{ material.itemName || '未知' }}({{ material.itemCode || '无编码' }})
</template> </template>
</RawMaterialInfo> </RawMaterialInfo>
</template> </template>
@@ -712,4 +712,4 @@ h3 {
border-radius: 6px !important; border-radius: 6px !important;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important; box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;
} }
</style> </style>

24
klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
View File

@@ -103,12 +103,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.warehouse_name, w.warehouse_name,
COUNT(mc.coil_id) as coil_count, COUNT(mc.coil_id) as coil_count,
COALESCE(SUM(mc.gross_weight), 0) as total_gross_weight, COALESCE(SUM(mc.gross_weight), 0) as total_gross_weight,
COALESCE(SUM(mc.net_weight), 0) as total_net_weight COALESCE(SUM(mc.net_weight), 0) as total_net_weight,
CASE
WHEN mc.item_type = 'raw_material' THEN rm.raw_material_name
WHEN mc.item_type = 'product' THEN p.product_name
ELSE NULL
END as itemName,
CASE
WHEN mc.item_type = 'raw_material' THEN rm.raw_material_code
WHEN mc.item_type = 'product' THEN p.product_code
ELSE NULL
END as itemCode
FROM wms_material_coil mc FROM wms_material_coil mc
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
WHERE mc.data_type = 1 WHERE mc.data_type = 1
AND mc.del_flag = '0' AND mc.del_flag = '0'
AND (w.del_flag = '0' OR w.del_flag IS NULL) AND (w.del_flag = '0' OR w.del_flag IS NULL)
and (mc.material_type='成品' or mc.material_type='原料')
and mc.status!=1
<if test="itemType != null and itemType != ''"> <if test="itemType != null and itemType != ''">
AND mc.item_type = #{itemType} AND mc.item_type = #{itemType}
</if> </if>
@@ -123,17 +137,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.warehouse_name AS warehouseName, w.warehouse_name AS warehouseName,
aw.warehouse_name AS actualWarehouseName, aw.warehouse_name AS actualWarehouseName,
CASE CASE
WHEN mc.item_type = 'row_material' THEN rm.raw_material_name WHEN mc.item_type = 'raw_material' THEN rm.raw_material_name
WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'product' THEN p.product_name
ELSE NULL ELSE NULL
END as itemName, END as itemName,
CASE CASE
WHEN mc.item_type = 'row_material' THEN rm.raw_material_code WHEN mc.item_type = 'raw_material' THEN rm.raw_material_code
WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'product' THEN p.product_code
ELSE NULL ELSE NULL
END as itemCode END as itemCode
FROM wms_material_coil mc FROM wms_material_coil mc
LEFT JOIN wms_raw_material rm ON mc.item_type = 'row_material' AND mc.item_id = rm.raw_material_id LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
@@ -150,6 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN wms_material_coil mc ON w.actual_warehouse_id = mc.actual_warehouse_id LEFT JOIN wms_material_coil mc ON w.actual_warehouse_id = mc.actual_warehouse_id
AND mc.data_type = 1 AND mc.data_type = 1
AND mc.del_flag = '0' AND mc.del_flag = '0'
and (mc.material_type='成品' or mc.material_type='原料')
and mc.status!=2
WHERE w.del_flag = '0' WHERE w.del_flag = '0'
<if test="itemType != null and itemType != ''"> <if test="itemType != null and itemType != ''">
AND mc.item_type = #{itemType} AND mc.item_type = #{itemType}