From 364ecb3ab0599807f7c89946c5de722b7dd05b6b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 15 Jan 2026 15:14:41 +0800 Subject: [PATCH 01/39] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IWmsMaterialCoilService 中新增 getDuplicateCoilGroups 方法定义 - 在 WmsMaterialCoilController 中添加 /duplicateGroups 接口 - 在 WmsMaterialCoilServiceImpl 中实现重复钢卷分组逻辑 - 支持按入场钢卷号和当前钢卷号分别进行重复分组 - 返回结构包含 enterGroups 和 currentGroups 两个分组数组 - 自动过滤 data_type=1 且未删除的数据记录 - 批量填充关联对象信息以提高查询效率 --- .../controller/WmsMaterialCoilController.java | 11 ++++ .../klp/service/IWmsMaterialCoilService.java | 11 ++++ .../impl/WmsMaterialCoilServiceImpl.java | 66 +++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index c918b80d..6cc72830 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -288,5 +288,16 @@ public class WmsMaterialCoilController extends BaseController { return R.ok(result); } + /** + * 查询data_type=1的重复钢卷分组 + * - 入场钢卷号重复分组 + * - 当前钢卷号重复分组 + */ + @GetMapping("/duplicateGroups") + public R> getDuplicateCoilGroups() { + Map result = iWmsMaterialCoilService.getDuplicateCoilGroups(); + return R.ok(result); + } + } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index eef0c0c4..289c60da 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -137,5 +137,16 @@ public interface IWmsMaterialCoilService { * - prefix: 前缀值 */ Map getMaxEnterCoilNoByPrefix(String enterCoilNoPrefix); + + /** + * 查询data_type=1时的重复钢卷分组 + * 将入场钢卷号重复的分为一组，将当前钢卷号重复的分为一组 + * 返回结构： + * { + * enterGroups: [ { enterCoilNo: "xxx", coils: [WmsMaterialCoilVo...] }, ...], + * currentGroups: [ { currentCoilNo: "yyy", coils: [WmsMaterialCoilVo...] }, ...] + * } + */ + Map getDuplicateCoilGroups(); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 825a19ac..dde057d3 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -540,6 +540,72 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { return qw; } + @Override + public Map getDuplicateCoilGroups() { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsMaterialCoil::getDataType, 1); + lqw.eq(WmsMaterialCoil::getDelFlag, 0); + List all = baseMapper.selectList(lqw); + + Map> enterGrouped = all.stream() + .filter(e -> StringUtils.isNotBlank(e.getEnterCoilNo())) + .collect(Collectors.groupingBy(WmsMaterialCoil::getEnterCoilNo)); + Map> currentGrouped = all.stream() + .filter(e -> StringUtils.isNotBlank(e.getCurrentCoilNo())) + .collect(Collectors.groupingBy(WmsMaterialCoil::getCurrentCoilNo)); + + List> enterGroups = enterGrouped.entrySet().stream() + .filter(en -> en.getValue() != null && en.getValue().size() > 1) + .map(en -> { + List vos = en.getValue().stream().map(this::toVoBasic).collect(Collectors.toList()); + Map m = new HashMap<>(); + m.put("enterCoilNo", en.getKey()); + m.put("coils", vos); + return m; + }) + .collect(Collectors.toList()); + + List> currentGroups = currentGrouped.entrySet().stream() + .filter(en -> en.getValue() != null && en.getValue().size() > 1) + .map(en -> { + List vos = en.getValue().stream().map(this::toVoBasic).collect(Collectors.toList()); + Map m = new HashMap<>(); + m.put("currentCoilNo", en.getKey()); + m.put("coils", vos); + return m; + }) + .collect(Collectors.toList()); + + // 可选：批量填充关联对象信息 + List allVos = new ArrayList<>(); + for (Map g : enterGroups) { + Object list = g.get("coils"); + if (list instanceof List) { + allVos.addAll((List) list); + } + } + for (Map g : currentGroups) { + Object list = g.get("coils"); + if (list instanceof List) { + allVos.addAll((List) list); + } + } + if (!allVos.isEmpty()) { + fillRelatedObjectsBatch(allVos); + } + + Map result = new HashMap<>(); + result.put("enterGroups", enterGroups); + result.put("currentGroups", currentGroups); + return result; + } + + private WmsMaterialCoilVo toVoBasic(WmsMaterialCoil e) { + WmsMaterialCoilVo vo = new WmsMaterialCoilVo(); + BeanUtils.copyProperties(e, vo); + return vo; + } + /** * 构建 OR 连接的 LIKE 子句，使用 MyBatis-Plus apply 的 {index} 占位符并将参数加入 args。 * 例如：column = "p.product_name", values = "A,B" -> 返回 "(p.product_name LIKE {0} OR p.product_name LIKE {1})" From 0200900f1387aaf92b778f309108d487c55c03f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 15 Jan 2026 16:24:01 +0800 Subject: [PATCH 02/39] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E9=87=8D=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增钢卷重号查询页面，包含当前卷号和入厂卷号两个标签页 添加API接口获取重号钢卷数据 实现搜索过滤和刷新功能 --- klp-ui/src/api/wms/coil.js | 10 + klp-ui/src/views/wms/coil/repeated.vue | 297 +++++++++++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 klp-ui/src/views/wms/coil/repeated.vue diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index e9317e58..1dc86698 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -214,4 +214,14 @@ export function getMaxCoilNo(enterCoilNoPrefix) { enterCoilNoPrefix } }) +} + +/** + * 查询存在重号的钢卷 + */ +export function getDuplicateGroups() { + return request({ + url: '/wms/materialCoil/duplicateGroups', + method: 'get' + }) } \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/repeated.vue b/klp-ui/src/views/wms/coil/repeated.vue new file mode 100644 index 00000000..9e0367d4 --- /dev/null +++ b/klp-ui/src/views/wms/coil/repeated.vue @@ -0,0 +1,297 @@ + + + + + \ No newline at end of file From 79324c7fd06f4e37951e9b5a085ddd8a1189f980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 15 Jan 2026 16:24:12 +0800 Subject: [PATCH 03/39] =?UTF-8?q?feat(=E9=87=8D=E5=8F=B7=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2):=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8E=82=E5=8D=B7?= =?UTF-8?q?=E5=8F=B7=E9=87=8D=E5=8F=B7=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E4=BA=A4=E4=BA=92=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将查询条件中的仓库改为厂家，并添加查询按钮 将输入框的@input事件改为@change事件，提升搜索体验 --- klp-ui/src/views/wms/coil/repeated.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/klp-ui/src/views/wms/coil/repeated.vue b/klp-ui/src/views/wms/coil/repeated.vue index 9e0367d4..1aa55295 100644 --- a/klp-ui/src/views/wms/coil/repeated.vue +++ b/klp-ui/src/views/wms/coil/repeated.vue @@ -53,8 +53,10 @@
- + + 查询 刷新
@@ -229,9 +231,10 @@ export default { const currentNo = (item.currentCoilNo || '').toLowerCase() const spec = (item.productSpecification || '').toLowerCase() const material = (item.productMaterial || '').toLowerCase() - const warehouse = (item.warehouseName || '').toLowerCase() + const manufacturer = (item.manufacturer || '').toLowerCase() + // const warehouse = (item.warehouseName || '').toLowerCase() const matType = (item.materialType || '').toLowerCase() - return enterNo.includes(key) || currentNo.includes(key) || spec.includes(key) || material.includes(key) || warehouse.includes(key) || matType.includes(key) + return enterNo.includes(key) || currentNo.includes(key) || spec.includes(key) || material.includes(key) || manufacturer.includes(key) || matType.includes(key) }) return groupNo.includes(key) || hasMatchCoil }) From bad618deace40f7d3312dca6dbd983be3aef3efb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 15 Jan 2026 17:05:47 +0800 Subject: [PATCH 04/39] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BA=93=E5=8C=BAID=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsMaterialCoilBo中新增warehouseIds字段用于存储多个库区ID - 修改查询逻辑以同时支持单个warehouseId和多个warehouseIds的查询条件 - 实现字符串分割和数字转换功能处理逗号分隔的库区ID列表 - 使用IN查询替代EQ查询以支持多库区条件匹配 - 添加数据去重处理避免重复的库区ID影响查询结果 --- .../com/klp/domain/bo/WmsMaterialCoilBo.java | 5 +++++ .../impl/WmsMaterialCoilServiceImpl.java | 21 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 3f0cb3d8..c8575ccd 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -56,6 +56,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private Long warehouseId; + /** + * 所在库区IDs（逗号分隔） + */ + private String warehouseIds; + /** * 下一库区ID */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index dde057d3..6094e6fe 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -341,12 +341,31 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.like(StringUtils.isNotBlank(bo.getSupplierCoilNo()), "mc.supplier_coil_no", bo.getSupplierCoilNo()); qw.eq(bo.getDataType() != null, "mc.data_type", bo.getDataType()); qw.eq(bo.getMaterialType() != null, "mc.material_type", bo.getMaterialType()); - qw.eq(bo.getWarehouseId() != null, "mc.warehouse_id", bo.getWarehouseId()); qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit()); qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus()); qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "mc.create_by", bo.getCreateBy()); qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "mc.update_by", bo.getUpdateBy()); + // 统一处理 warehouseId 与 warehouseIds： + List warehouseIdList = new ArrayList<>(); + if (bo.getWarehouseId() != null) { + warehouseIdList.add(bo.getWarehouseId()); + } + if (StringUtils.isNotBlank(bo.getWarehouseIds())) { + String[] warehouseIdArray = bo.getWarehouseIds().split(","); + for (String warehouseIdStr : warehouseIdArray) { + if (StringUtils.isNotBlank(warehouseIdStr)) { + try { + warehouseIdList.add(Long.parseLong(warehouseIdStr.trim())); + } catch (NumberFormatException ignore) { + } + } + } + } + if (!warehouseIdList.isEmpty()) { + qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList())); + } + // 新增长度 qw.eq(bo.getLength() != null, "mc.length", bo.getLength()); // 如果actualWarehouseId不为空，则根据实际库区ID进行查询 如果为-1,则查询无库区的数据 From 45d09812cf00a9937b5b3719e2ea8377096e9c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 15 Jan 2026 17:13:07 +0800 Subject: [PATCH 05/39] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E5=9C=A8?= =?UTF-8?q?=E5=88=86=E6=9D=A1=E5=BA=93=E7=9A=84=E9=92=A2=E5=8D=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加onlySplit.vue文件，实现线圈分切页面的基础框架和配置，包括仓库ID、标签类型等参数设置 --- klp-ui/src/views/wms/coil/onlySplit.vue | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 klp-ui/src/views/wms/coil/onlySplit.vue diff --git a/klp-ui/src/views/wms/coil/onlySplit.vue b/klp-ui/src/views/wms/coil/onlySplit.vue new file mode 100644 index 00000000..c6a9a8a0 --- /dev/null +++ b/klp-ui/src/views/wms/coil/onlySplit.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file From 1b5efc00f6d4ab6915773a8aa277f61aa8c7d4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 15 Jan 2026 17:33:54 +0800 Subject: [PATCH 06/39] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E9=80=89=E6=8B=A9=E5=99=A8=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=8F=8A=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一钢卷选择器的selectType为'product'并添加status过滤 - 修复materialType与selectType的映射关系 - 移除分页组件的rangeMode条件限制 - 更新部分字段显示名称 --- klp-ui/src/components/CoilSelector/index.vue | 3 ++- klp-ui/src/views/wms/coil/do/ship.vue | 4 +++- klp-ui/src/views/wms/coil/panels/base.vue | 2 +- klp-ui/src/views/wms/delivery/mycoil/index.vue | 9 +++++---- klp-ui/src/views/wms/delivery/permi/index.vue | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index eb6ad4fa..5acd7105 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -161,7 +161,8 @@ export default { pageSize: 10, currentCoilNo: null, grade: null, - selectType: 'raw_material', + selectType: 'product', + status: 0, // 不包含已发货的钢卷 dataType: 1 // 只查询当前数据，不查询历史数据 }, columns: defaultColumns, diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue index b9149517..0ba03768 100644 --- a/klp-ui/src/views/wms/coil/do/ship.vue +++ b/klp-ui/src/views/wms/coil/do/ship.vue @@ -220,7 +220,9 @@ export default { // 钢卷选择器筛选参数 coilFilters: { dataType: 1, - materialType: '成品' + materialType: '成品', + selectType: 'product', + status: 0, }, coilSelectorVisible: false, loading: false, diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 60d980be..870aead8 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -633,7 +633,7 @@ export default { endTime: this.queryParams.updateTime?.[1], } // 如果没有设置itemType，则设置为raw_material - query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material'; + query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product'; listMaterialCoil(query).then(response => { if (this.querys.warehouseId != 111) { // 排除掉111仓库的 diff --git a/klp-ui/src/views/wms/delivery/mycoil/index.vue b/klp-ui/src/views/wms/delivery/mycoil/index.vue index 8eaf8c3e..1dd45857 100644 --- a/klp-ui/src/views/wms/delivery/mycoil/index.vue +++ b/klp-ui/src/views/wms/delivery/mycoil/index.vue @@ -36,7 +36,7 @@ - @@ -68,8 +68,9 @@ export default { currentCoilNo: null, grade: null, materialType: '成品', - selectType: 'raw_material', - dataType: 1 // 只查询当前数据，不查询历史数据 + selectType: 'product', + dataType: 1, // 只查询当前数据，不查询历史数据 + // status: 0 // 只查询未发货的数据 }, columns: [ { @@ -122,7 +123,7 @@ export default { width: '100' }, { - label: '库区', + label: '逻辑库区', align: 'center', prop: 'warehouseName', width: '120', diff --git a/klp-ui/src/views/wms/delivery/permi/index.vue b/klp-ui/src/views/wms/delivery/permi/index.vue index 76a52652..b2ff2470 100644 --- a/klp-ui/src/views/wms/delivery/permi/index.vue +++ b/klp-ui/src/views/wms/delivery/permi/index.vue @@ -223,6 +223,8 @@ export default { queryParamsWithSalesId: { selectType: 'product', materialType: '成品', + dataType: 1, + status: 0, saleId: undefined, pageNum: 1, pageSize: 10 @@ -231,6 +233,8 @@ export default { queryParamsWithUnAssignedId: { selectType: 'product', materialType: '成品', + dataType: 1, + status: 0, saleId: -1, pageNum: 1, pageSize: 10 From 0dfe7c233c65e97fd5004978df4f2669b62e7965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 16 Jan 2026 07:25:08 +0800 Subject: [PATCH 07/39] =?UTF-8?q?fix(wms):=20=E5=B0=86=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=A1=B5=E9=9D=A2=E7=9A=84selectType?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=94=B9=E4=B8=BAraw=5Fmaterial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- klp-ui/src/views/wms/report/receive.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index f3fb98d4..cec49e78 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -148,7 +148,7 @@ export default { // status: 1, byCreateTimeStart: startTime, byCreateTimeEnd: endTime, - selectType: 'product', + selectType: 'raw_material', enterCoilNo: '', currentCoilNo: '', warehouseId: '', From fe4f191293d61951f96486011639a29ab1718e26 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 16 Jan 2026 09:13:19 +0800 Subject: [PATCH 08/39] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在查询条件中添加数据类型过滤器 (dataType=1) - 确保只对特定类型的数据进行重复检查 - 修正了进入卷号和当前卷号的重复验证逻辑 --- .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 6094e6fe..314038be 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2600,7 +2600,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (StringUtils.isNotBlank(enterCoilNo)) { LambdaQueryWrapper enterWrapper = Wrappers.lambdaQuery(); enterWrapper.eq(WmsMaterialCoil::getEnterCoilNo, enterCoilNo) - .eq(WmsMaterialCoil::getDelFlag, 0); + .eq(WmsMaterialCoil::getDelFlag, 0) + .eq(WmsMaterialCoil::getDataType, 1); long enterCount = baseMapper.selectCount(enterWrapper); enterCoilNoDuplicate = enterCount > 0; } @@ -2609,7 +2610,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (StringUtils.isNotBlank(currentCoilNo)) { LambdaQueryWrapper currentWrapper = Wrappers.lambdaQuery(); currentWrapper.eq(WmsMaterialCoil::getCurrentCoilNo, currentCoilNo) - .eq(WmsMaterialCoil::getDelFlag, 0); + .eq(WmsMaterialCoil::getDelFlag, 0) + .eq(WmsMaterialCoil::getDataType, 1); + long currentCount = baseMapper.selectCount(currentWrapper); currentCoilNoDuplicate = currentCount > 0; } From f85cea4dca8aa0828c4d8bf32dfd138a298f6c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 16 Jan 2026 09:18:19 +0800 Subject: [PATCH 09/39] =?UTF-8?q?fix(wms):=20=E5=9C=A8=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?selectType=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为三个仓库的报表查询参数统一添加selectType字段，确保查询条件一致 --- klp-ui/src/views/wms/report/zha.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 64ef6096..e9f77d29 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -185,6 +185,7 @@ export default { pageSize: 9999, pageNum: 1, dataType: 1, + selectType: 'raw_material', createBy: 'suanzhakuguan', warehouseId: '1988150263284953089' }), @@ -194,6 +195,7 @@ export default { pageSize: 9999, pageNum: 1, dataType: 1, + selectType: 'raw_material', createBy: 'suanzhakuguan', warehouseId: '1988150545175736322' }), @@ -203,6 +205,7 @@ export default { pageSize: 9999, pageNum: 1, dataType: 1, + selectType: 'raw_material', createBy: 'suanzhakuguan', warehouseId: '1988150150521090049' }), From 57889781bbed7958b1c6c3f8de82e8b48115a675 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 16 Jan 2026 10:12:10 +0800 Subject: [PATCH 10/39] =?UTF-8?q?feat(wms):=20=E6=9B=B4=E6=96=B0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 checkCoilNoDuplicate 方法中添加 coilId 参数以支持修改操作 - 修改控制器层接口，增加可选的 coilId 请求参数 - 实现修改操作时排除自身的重复检查逻辑 - 添加历史数据类型验证，防止对已更新钢卷进行操作 - 在钢卷修改和删除方法中增加 dataType 为 0 的历史数据检查 --- .../controller/WmsMaterialCoilController.java | 3 ++- .../klp/service/IWmsMaterialCoilService.java | 2 +- .../impl/WmsMaterialCoilServiceImpl.java | 19 ++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index 6cc72830..bcb7254e 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -266,9 +266,10 @@ public class WmsMaterialCoilController extends BaseController { */ @GetMapping("/checkCoilNoDuplicate") public R> checkCoilNoDuplicate( + @RequestParam(required = false) Long coilId, @RequestParam(required = false) String enterCoilNo, @RequestParam(required = false) String currentCoilNo) { - Map result = iWmsMaterialCoilService.checkCoilNoDuplicate(enterCoilNo, currentCoilNo); + Map result = iWmsMaterialCoilService.checkCoilNoDuplicate(coilId,enterCoilNo, currentCoilNo); return R.ok(result); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index 289c60da..3b3f4f91 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -125,7 +125,7 @@ public interface IWmsMaterialCoilService { * - enterCoilNoDuplicate: 入场钢卷号是否重复 (true/false) * - currentCoilNoDuplicate: 当前钢卷号是否重复 (true/false) */ - Map checkCoilNoDuplicate(String enterCoilNo, String currentCoilNo); + Map checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo); /** * 根据入场钢卷号前缀查询最大的入场钢卷号 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 314038be..ecb2bf92 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -984,6 +984,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (oldCoil == null) { throw new RuntimeException("钢卷不存在"); } + // 判断数据类型 0=历史数据 1=正常数据 + if (oldCoil.getDataType() == 0) { + throw new RuntimeException("原钢卷已被更新"); + } // 若修改实际库位，先进行校验 if (bo.getActualWarehouseId() != null) { @@ -1033,6 +1037,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { throw new RuntimeException("原钢卷不存在"); } + // oldCoil 如果是历史卷也就是date_type=0 的时候就是历史钢卷 + if (oldCoil.getDataType() == 0) { + throw new RuntimeException("原钢卷已被更新"); + } + // 若修改实际库位，先进行校验 if (bo.getActualWarehouseId() != null) { Long ignoreOccupiedId = Objects.equals(bo.getActualWarehouseId(), oldCoil.getActualWarehouseId()) @@ -2590,7 +2599,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { * 根据入场钢卷号和当前钢卷号查询数据库，判断哪个钢卷号重复 */ @Override - public Map checkCoilNoDuplicate(String enterCoilNo, String currentCoilNo) { + public Map checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo) { Map result = new HashMap<>(); boolean enterCoilNoDuplicate = false; @@ -2602,6 +2611,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { enterWrapper.eq(WmsMaterialCoil::getEnterCoilNo, enterCoilNo) .eq(WmsMaterialCoil::getDelFlag, 0) .eq(WmsMaterialCoil::getDataType, 1); + // 如果是修改操作，排除自身 + if (coilId != null) { + enterWrapper.ne(WmsMaterialCoil::getCoilId, coilId); + } long enterCount = baseMapper.selectCount(enterWrapper); enterCoilNoDuplicate = enterCount > 0; } @@ -2612,6 +2625,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { currentWrapper.eq(WmsMaterialCoil::getCurrentCoilNo, currentCoilNo) .eq(WmsMaterialCoil::getDelFlag, 0) .eq(WmsMaterialCoil::getDataType, 1); + // 如果是修改操作，排除自身 + if (coilId != null) { + currentWrapper.ne(WmsMaterialCoil::getCoilId, coilId); + } long currentCount = baseMapper.selectCount(currentWrapper); currentCoilNoDuplicate = currentCount > 0; From 20d2ab1725550e465db4c73499e1b864ccf3179d Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 16 Jan 2026 11:17:00 +0800 Subject: [PATCH 11/39] =?UTF-8?q?fix(wms):=20=E8=A7=A3=E5=86=B3=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E9=92=A2=E5=8D=B7=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 ServiceException 导入用于异常处理 - 增加历史数据校验逻辑，防止历史数据钢卷被发货 - 当检测到历史数据时抛出运行时异常并提示相应信息 --- .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index ecb2bf92..5673312d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.exception.ServiceException; import com.klp.common.helper.LoginHelper; import com.klp.common.utils.StringUtils; import com.klp.common.utils.spring.SpringUtils; @@ -2225,6 +2226,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { WmsMaterialCoilVo wmsMaterialCoilVo = queryById(coilId); Long oldActualWarehouseId = wmsMaterialCoilVo != null ? wmsMaterialCoilVo.getActualWarehouseId() : null; + // 如果当前钢卷为历史数据应该抛异常 + if (wmsMaterialCoilVo != null && wmsMaterialCoilVo.getDataType() == 0) { + throw new RuntimeException("当前数据为历史数据，请勿发货！"); + } // 1. 更新钢卷为已发货，并记录发货时间，同时清空实际库区占用（改用Wrapper实现） int rows = 0; //获取当前调用接口的这个人的username From a643b25f9f0584e2c4aedf0479f14bce53acce24 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 16 Jan 2026 11:30:41 +0800 Subject: [PATCH 12/39] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8D=B7=E6=9D=90=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了当 hasSelectType 为 true 但 hasAnyItemFilter 为 false 时的条件判断问题 - 调整了筛选逻辑的位置，确保只在满足双重条件时执行相关筛选 - 移除了多余的右大括号，优化了代码结构 --- .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 5673312d..ecd10735 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -432,9 +432,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { } // 使用 EXISTS 针对 selectType 的细粒度筛选（使用参数占位符防注入） - if (hasSelectType) { - qw.eq("mc.item_type", bo.getSelectType()); - if (hasAnyItemFilter) { + if (hasSelectType && hasAnyItemFilter) { + // 执行筛选逻辑（和上面完全一样） + qw.eq("mc.item_type", bo.getSelectType()); StringBuilder existsSql = new StringBuilder(); List existsArgs = new ArrayList<>(); if ("product".equals(bo.getSelectType())) { @@ -474,7 +474,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.apply(existsSql.toString(), existsArgs.toArray()); } } - } // 显式 itemId 条件：与 EXISTS 共存时，语义为交集 if (CollectionUtils.isNotEmpty(explicitItemIds)) { From a3a04efd1aea5b79465c450b41a868b307cd3317 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 16 Jan 2026 11:53:21 +0800 Subject: [PATCH 13/39] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了对历史数据类型的验证逻辑 - 简化了钢卷更新时的数据校验流程 - 移除了 dataType 等于 0 时的异常抛出机制 --- .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index ecd10735..eb946d68 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -984,10 +984,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (oldCoil == null) { throw new RuntimeException("钢卷不存在"); } - // 判断数据类型 0=历史数据 1=正常数据 - if (oldCoil.getDataType() == 0) { - throw new RuntimeException("原钢卷已被更新"); - } // 若修改实际库位，先进行校验 if (bo.getActualWarehouseId() != null) { From ea9f7fce34c8dbe8a21bc5b394857b9970d89592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 16 Jan 2026 13:07:30 +0800 Subject: [PATCH 14/39] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8C=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复钢卷历史页面控制显示问题 - 在交货报表中添加dataType参数 - 修改checkCoilNo接口支持coilId参数 - 优化镀锌报表查询逻辑，使用Promise.all并行请求 - 修复轧硬报表仓库ID错误问题 - 移除钢卷入库页面的只读限制 - 修复钢卷删除功能，支持删除带coilId的记录 --- klp-ui/src/api/wms/coil.js | 5 +- klp-ui/src/views/wms/coil/do/warehousing.vue | 54 +++++++++++--------- klp-ui/src/views/wms/coil/history.vue | 2 +- klp-ui/src/views/wms/report/delivery.vue | 1 + klp-ui/src/views/wms/report/zha.vue | 13 ++--- klp-ui/src/views/wms/report/zinc.vue | 33 ++++++++---- 6 files changed, 64 insertions(+), 44 deletions(-) diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index 1dc86698..d6cd5583 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -194,13 +194,14 @@ export function cancelExportCoil(coilId) { } // 检查入场钢卷号或当前钢卷号是否合法（是否存在） -export function checkCoilNo({ currentCoilNo, enterCoilNo }) { +export function checkCoilNo({ currentCoilNo, enterCoilNo, coilId }) { return request({ url: '/wms/materialCoil/checkCoilNoDuplicate', method: 'get', params: { currentCoilNo, - enterCoilNo + enterCoilNo, + coilId } }) } diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 6ac42449..471c3e78 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -61,8 +61,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index a438499b..a8ca0940 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -202,7 +202,7 @@ - + From 6050abd89b842813d7e78f02ec04595f21d022ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 16 Jan 2026 15:09:45 +0800 Subject: [PATCH 16/39] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?):=20=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在标题下方添加状态说明文本 - 根据dataType动态设置钢卷卡片边框颜色 - 显示materialType字段并移除注释 - 调整footer按钮显示条件 - 合并重复的dicts配置 --- klp-ui/src/views/wms/coil/do/correct.vue | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index afc2b47f..62eebfb2 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -5,7 +5,11 @@
-

查找钢卷并修正

+

+ 查找钢卷并修正 + 绿色边框表示当前钢卷，灰色边框表示历史钢卷 +

+ 刷新
@@ -31,13 +35,13 @@

暂无待领物料

- +
+ :style="item.dataType === 0 ? 'border: 1.5px solid #e4e7ed' : item.dataType === 1 ? 'border: 1.5px solid green' : 'border: 1.5px solid yellow'">
{{ item.currentCoilNo }} - + {{ item.materialType || '原料' }}
@@ -178,7 +182,7 @@
-
+
修正 Date: Fri, 16 Jan 2026 15:39:02 +0800 Subject: [PATCH 17/39] =?UTF-8?q?fix(wms):=20=E5=A4=84=E7=90=86=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=BA=93=E5=8C=BAID=E4=B8=BA-1=E7=9A=84=E7=A9=BA?= =?UTF-8?q?=E7=BD=AE=E5=BA=93=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加对实际库区ID为-1的判断逻辑 - 将值为-1的库区ID统一转换为NULL - 防止空置库标识影响后续库存操作 --- .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index eb946d68..925a44ad 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -829,6 +829,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 2. 查找或创建stock findOrCreateStock(bo); + // 处理实际库区：-1 表示空置库，统一转 NULL + if (bo.getActualWarehouseId() != null && bo.getActualWarehouseId() == -1) { + bo.setActualWarehouseId(null); + } // 3. 插入钢卷数据 WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); if(bo.getDataType() != null && bo.getDataType() == 10){ From 57a62fcf048b951852bb295f678e6acc953ef1e8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 17 Jan 2026 09:06:33 +0800 Subject: [PATCH 18/39] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增历史记录数据类型判断，避免对历史数据进行重复检查 - 修改操作时根据coilId查询数据类型，历史记录直接返回无重复 - 钢卷号重复检查增加数据类型过滤条件，仅对当前数据生效 - 完善方法注释说明历史记录处理逻辑 --- .../service/impl/WmsMaterialCoilServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 925a44ad..0a1c3bc5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2601,11 +2601,25 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { /** * 检查钢卷号是否重复 * 根据入场钢卷号和当前钢卷号查询数据库，判断哪个钢卷号重复 + * 新增逻辑：修改历史记录时不检查重复 */ @Override public Map checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo) { Map result = new HashMap<>(); + // 新增核心逻辑：先判断是否操作的是历史记录 + // 1. 如果coilId不为空（修改操作），先查询该钢卷的dataType + if (coilId != null) { + WmsMaterialCoil coil = baseMapper.selectById(coilId); + // 2. 如果查询到钢卷且dataType!=1（说明是历史记录），直接返回无重复 + if (coil != null && coil.getDataType() != 1) { + result.put("duplicateType", "none"); + result.put("enterCoilNoDuplicate", false); + result.put("currentCoilNoDuplicate", false); + return result; // 直接返回，不执行后续检查 + } + } + boolean enterCoilNoDuplicate = false; boolean currentCoilNoDuplicate = false; @@ -2614,7 +2628,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { LambdaQueryWrapper enterWrapper = Wrappers.lambdaQuery(); enterWrapper.eq(WmsMaterialCoil::getEnterCoilNo, enterCoilNo) .eq(WmsMaterialCoil::getDelFlag, 0) - .eq(WmsMaterialCoil::getDataType, 1); + .eq(WmsMaterialCoil::getDataType, 1); // 过滤历史数据 // 如果是修改操作，排除自身 if (coilId != null) { enterWrapper.ne(WmsMaterialCoil::getCoilId, coilId); From 390859bf7ca06f1670b9f3f52749a0b6da2db18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 09:40:02 +0800 Subject: [PATCH 19/39] =?UTF-8?q?fix(wms/report):=20=E5=B0=86=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E4=BB=8E6?= =?UTF-8?q?=E7=82=B9=E8=B0=83=E6=95=B4=E4=B8=BA7=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改所有报告视图的默认时间区间，从昨天的6点到今天的6点调整为7点，以符合新的业务需求 --- klp-ui/src/views/wms/report/delivery.vue | 4 ++-- klp-ui/src/views/wms/report/receive.vue | 4 ++-- klp-ui/src/views/wms/report/zha.vue | 4 ++-- klp-ui/src/views/wms/report/zinc.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue index 5edd91d6..2244ca83 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -129,8 +129,8 @@ export default { const nowDay = addZero(now.getDate()) // ✅ 目标时间区间：昨天早上6点 至 今天早上6点 - const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00` - const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00` + const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00` + const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00` return { list: [], queryParams: { diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index cec49e78..95e17aba 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -138,8 +138,8 @@ export default { const nowDay = addZero(now.getDate()) // ✅ 目标时间区间：昨天早上6点 至 今天早上6点 - const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00` - const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00` + const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00` + const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00` return { list: [], queryParams: { diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 90fc386d..57d4fb04 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -128,8 +128,8 @@ export default { const nowDay = addZero(now.getDate()) // ✅ 目标时间区间：昨天早上6点 至 今天早上6点 - const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00` - const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00` + const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00` + const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00` return { list: [], queryParams: { diff --git a/klp-ui/src/views/wms/report/zinc.vue b/klp-ui/src/views/wms/report/zinc.vue index 25c32250..04698203 100644 --- a/klp-ui/src/views/wms/report/zinc.vue +++ b/klp-ui/src/views/wms/report/zinc.vue @@ -128,8 +128,8 @@ export default { const nowDay = addZero(now.getDate()) // ✅ 目标时间区间：昨天早上6点 至 今天早上6点 - const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00` - const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00` + const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00` + const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00` return { list: [], queryParams: { From e8fc900a02ba33079452bc37df0da262ee4f7ca1 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 17 Jan 2026 10:08:49 +0800 Subject: [PATCH 20/39] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7=E5=92=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=8A=A5=E9=A4=90=E4=B8=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建员工请假申请相关实体类、业务对象、视图对象和映射文件 - 实现员工请假申请的增删改查和分页查询功能 - 创建部门报餐主相关实体类、业务对象、视图对象和映射文件 - 实现部门报餐主的增删改查和分页查询功能 - 添加相应的控制器和服务层实现 - 集成Excel导出功能 - 添加数据校验和业务逻辑处理 --- .../controller/WmsLeaveRequestController.java | 99 +++++++++++++++ .../controller/WmsMealReportController.java | 99 +++++++++++++++ .../java/com/klp/domain/WmsLeaveRequest.java | 80 ++++++++++++ .../java/com/klp/domain/WmsMealReport.java | 71 +++++++++++ .../com/klp/domain/bo/WmsLeaveRequestBo.java | 84 +++++++++++++ .../com/klp/domain/bo/WmsMealReportBo.java | 73 +++++++++++ .../com/klp/domain/vo/WmsLeaveRequestVo.java | 101 +++++++++++++++ .../com/klp/domain/vo/WmsMealReportVo.java | 85 +++++++++++++ .../com/klp/mapper/WmsLeaveRequestMapper.java | 15 +++ .../com/klp/mapper/WmsMealReportMapper.java | 15 +++ .../klp/service/IWmsLeaveRequestService.java | 49 ++++++++ .../klp/service/IWmsMealReportService.java | 49 ++++++++ .../impl/WmsLeaveRequestServiceImpl.java | 118 ++++++++++++++++++ .../impl/WmsMealReportServiceImpl.java | 116 +++++++++++++++++ .../mapper/klp/WmsLeaveRequestMapper.xml | 28 +++++ .../mapper/klp/WmsMealReportMapper.xml | 26 ++++ 16 files changed, 1108 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsLeaveRequest.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsMealReport.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsMealReportBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsLeaveRequestMapper.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsMealReportMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsLeaveRequestMapper.xml create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsMealReportMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java new file mode 100644 index 00000000..2b221441 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsLeaveRequestVo; +import com.klp.domain.bo.WmsLeaveRequestBo; +import com.klp.service.IWmsLeaveRequestService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 员工请假申请 + * + * @author klp + * @date 2026-01-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/leaveRequest") +public class WmsLeaveRequestController extends BaseController { + + private final IWmsLeaveRequestService iWmsLeaveRequestService; + + /** + * 查询员工请假申请列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsLeaveRequestBo bo, PageQuery pageQuery) { + return iWmsLeaveRequestService.queryPageList(bo, pageQuery); + } + + /** + * 导出员工请假申请列表 + */ + @Log(title = "员工请假申请", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsLeaveRequestBo bo, HttpServletResponse response) { + List list = iWmsLeaveRequestService.queryList(bo); + ExcelUtil.exportExcel(list, "员工请假申请", WmsLeaveRequestVo.class, response); + } + + /** + * 获取员工请假申请详细信息 + * + * @param leaveId 主键 + */ + @GetMapping("/{leaveId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long leaveId) { + return R.ok(iWmsLeaveRequestService.queryById(leaveId)); + } + + /** + * 新增员工请假申请 + */ + @Log(title = "员工请假申请", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsLeaveRequestBo bo) { + return toAjax(iWmsLeaveRequestService.insertByBo(bo)); + } + + /** + * 修改员工请假申请 + */ + @Log(title = "员工请假申请", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsLeaveRequestBo bo) { + return toAjax(iWmsLeaveRequestService.updateByBo(bo)); + } + + /** + * 删除员工请假申请 + * + * @param leaveIds 主键串 + */ + @Log(title = "员工请假申请", businessType = BusinessType.DELETE) + @DeleteMapping("/{leaveIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] leaveIds) { + return toAjax(iWmsLeaveRequestService.deleteWithValidByIds(Arrays.asList(leaveIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java b/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java new file mode 100644 index 00000000..05c567a4 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsMealReportVo; +import com.klp.domain.bo.WmsMealReportBo; +import com.klp.service.IWmsMealReportService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 部门报餐主 + * + * @author klp + * @date 2026-01-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/mealReport") +public class WmsMealReportController extends BaseController { + + private final IWmsMealReportService iWmsMealReportService; + + /** + * 查询部门报餐主列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsMealReportBo bo, PageQuery pageQuery) { + return iWmsMealReportService.queryPageList(bo, pageQuery); + } + + /** + * 导出部门报餐主列表 + */ + @Log(title = "部门报餐主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsMealReportBo bo, HttpServletResponse response) { + List list = iWmsMealReportService.queryList(bo); + ExcelUtil.exportExcel(list, "部门报餐主", WmsMealReportVo.class, response); + } + + /** + * 获取部门报餐主详细信息 + * + * @param reportId 主键 + */ + @GetMapping("/{reportId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long reportId) { + return R.ok(iWmsMealReportService.queryById(reportId)); + } + + /** + * 新增部门报餐主 + */ + @Log(title = "部门报餐主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsMealReportBo bo) { + return toAjax(iWmsMealReportService.insertByBo(bo)); + } + + /** + * 修改部门报餐主 + */ + @Log(title = "部门报餐主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsMealReportBo bo) { + return toAjax(iWmsMealReportService.updateByBo(bo)); + } + + /** + * 删除部门报餐主 + * + * @param reportIds 主键串 + */ + @Log(title = "部门报餐主", businessType = BusinessType.DELETE) + @DeleteMapping("/{reportIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] reportIds) { + return toAjax(iWmsMealReportService.deleteWithValidByIds(Arrays.asList(reportIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsLeaveRequest.java b/klp-wms/src/main/java/com/klp/domain/WmsLeaveRequest.java new file mode 100644 index 00000000..20e22bcc --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsLeaveRequest.java @@ -0,0 +1,80 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 员工请假申请对象 wms_leave_request + * + * @author klp + * @date 2026-01-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_leave_request") +public class WmsLeaveRequest extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "leave_id") + private Long leaveId; + /** + * 请假标题 + */ + private String leaveTitle; + /** + * 请假类型（年假/事假/病假/调休/外出/出差等） + */ + private String leaveType; + /** + * 请假人姓名 + */ + private String applicantName; + /** + * 请假人部门名称 + */ + private String applicantDeptName; + /** + * 请假开始时间 + */ + private Date startTime; + /** + * 请假结束时间 + */ + private Date endTime; + /** + * 请假班次（早班/中班/晚班/夜班/全天等） + */ + private String leaveShift; + /** + * 请假天数 + */ + private BigDecimal leaveDays; + /** + * 请假原因 + */ + private String leaveReason; + /** + * 附件（病假证明等） + */ + private String attachmentUrls; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMealReport.java b/klp-wms/src/main/java/com/klp/domain/WmsMealReport.java new file mode 100644 index 00000000..f76a05f0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsMealReport.java @@ -0,0 +1,71 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 部门报餐主对象 wms_meal_report + * + * @author klp + * @date 2026-01-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_meal_report") +public class WmsMealReport extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "report_id") + private Long reportId; + /** + * 用餐日期 + */ + private Date reportDate; + /** + * 餐别：1早餐 2午餐 3晚餐 4夜宵 + */ + private Long mealType; + /** + * 部门名称 + */ + private String deptName; + /** + * 用餐总人数 + */ + private Long totalPeople; + /** + * 堂食人数 + */ + private Long dineInPeople; + /** + * 打包人数 + */ + private Long takeoutPeople; + /** + * 报餐人姓名 + */ + private String reportUserName; + /** + * 状态：1已提交 2已修改 3已作废 + */ + private Long status; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java new file mode 100644 index 00000000..a9b4411f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java @@ -0,0 +1,84 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 员工请假申请业务对象 wms_leave_request + * + * @author klp + * @date 2026-01-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsLeaveRequestBo extends BaseEntity { + + /** + * 主键ID + */ + private Long leaveId; + + /** + * 请假标题 + */ + private String leaveTitle; + + /** + * 请假类型（年假/事假/病假/调休/外出/出差等） + */ + private String leaveType; + + /** + * 请假人姓名 + */ + private String applicantName; + + /** + * 请假人部门名称 + */ + private String applicantDeptName; + + /** + * 请假开始时间 + */ + private Date startTime; + + /** + * 请假结束时间 + */ + private Date endTime; + + /** + * 请假班次（早班/中班/晚班/夜班/全天等） + */ + private String leaveShift; + + /** + * 请假天数 + */ + private BigDecimal leaveDays; + + /** + * 请假原因 + */ + private String leaveReason; + + /** + * 附件（病假证明等） + */ + private String attachmentUrls; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMealReportBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMealReportBo.java new file mode 100644 index 00000000..1fa8b447 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMealReportBo.java @@ -0,0 +1,73 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 部门报餐主业务对象 wms_meal_report + * + * @author klp + * @date 2026-01-17 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsMealReportBo extends BaseEntity { + + /** + * 主键ID + */ + private Long reportId; + + /** + * 用餐日期 + */ + private Date reportDate; + + /** + * 餐别：1早餐 2午餐 3晚餐 4夜宵 + */ + private Long mealType; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 用餐总人数 + */ + private Long totalPeople; + + /** + * 堂食人数 + */ + private Long dineInPeople; + + /** + * 打包人数 + */ + private Long takeoutPeople; + + /** + * 报餐人姓名 + */ + private String reportUserName; + + /** + * 状态：1已提交 2已修改 3已作废 + */ + private Long status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java new file mode 100644 index 00000000..3a3e3aa7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -0,0 +1,101 @@ +package com.klp.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 员工请假申请视图对象 wms_leave_request + * + * @author klp + * @date 2026-01-17 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsLeaveRequestVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long leaveId; + + /** + * 请假标题 + */ + @ExcelProperty(value = "请假标题") + private String leaveTitle; + + /** + * 请假类型（年假/事假/病假/调休/外出/出差等） + */ + @ExcelProperty(value = "请假类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "年=假/事假/病假/调休/外出/出差等") + private String leaveType; + + /** + * 请假人姓名 + */ + @ExcelProperty(value = "请假人姓名") + private String applicantName; + + /** + * 请假人部门名称 + */ + @ExcelProperty(value = "请假人部门名称") + private String applicantDeptName; + + /** + * 请假开始时间 + */ + @ExcelProperty(value = "请假开始时间") + private Date startTime; + + /** + * 请假结束时间 + */ + @ExcelProperty(value = "请假结束时间") + private Date endTime; + + /** + * 请假班次（早班/中班/晚班/夜班/全天等） + */ + @ExcelProperty(value = "请假班次", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "早=班/中班/晚班/夜班/全天等") + private String leaveShift; + + /** + * 请假天数 + */ + @ExcelProperty(value = "请假天数") + private BigDecimal leaveDays; + + /** + * 请假原因 + */ + @ExcelProperty(value = "请假原因") + private String leaveReason; + + /** + * 附件（病假证明等） + */ + @ExcelProperty(value = "附件", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "病=假证明等") + private String attachmentUrls; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java new file mode 100644 index 00000000..668c4c15 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java @@ -0,0 +1,85 @@ +package com.klp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 部门报餐主视图对象 wms_meal_report + * + * @author klp + * @date 2026-01-17 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsMealReportVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long reportId; + + /** + * 用餐日期 + */ + @ExcelProperty(value = "用餐日期") + private Date reportDate; + + /** + * 餐别：1早餐 2午餐 3晚餐 4夜宵 + */ + @ExcelProperty(value = "餐别：1早餐 2午餐 3晚餐 4夜宵") + private Long mealType; + + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 用餐总人数 + */ + @ExcelProperty(value = "用餐总人数") + private Long totalPeople; + + /** + * 堂食人数 + */ + @ExcelProperty(value = "堂食人数") + private Long dineInPeople; + + /** + * 打包人数 + */ + @ExcelProperty(value = "打包人数") + private Long takeoutPeople; + + /** + * 报餐人姓名 + */ + @ExcelProperty(value = "报餐人姓名") + private String reportUserName; + + /** + * 状态：1已提交 2已修改 3已作废 + */ + @ExcelProperty(value = "状态：1已提交 2已修改 3已作废") + private Long status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsLeaveRequestMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsLeaveRequestMapper.java new file mode 100644 index 00000000..0973284c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsLeaveRequestMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsLeaveRequest; +import com.klp.domain.vo.WmsLeaveRequestVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 员工请假申请Mapper接口 + * + * @author klp + * @date 2026-01-17 + */ +public interface WmsLeaveRequestMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMealReportMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMealReportMapper.java new file mode 100644 index 00000000..e0d1799e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsMealReportMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsMealReport; +import com.klp.domain.vo.WmsMealReportVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 部门报餐主Mapper接口 + * + * @author klp + * @date 2026-01-17 + */ +public interface WmsMealReportMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java new file mode 100644 index 00000000..2d7a766e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsLeaveRequest; +import com.klp.domain.vo.WmsLeaveRequestVo; +import com.klp.domain.bo.WmsLeaveRequestBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 员工请假申请Service接口 + * + * @author klp + * @date 2026-01-17 + */ +public interface IWmsLeaveRequestService { + + /** + * 查询员工请假申请 + */ + WmsLeaveRequestVo queryById(Long leaveId); + + /** + * 查询员工请假申请列表 + */ + TableDataInfo queryPageList(WmsLeaveRequestBo bo, PageQuery pageQuery); + + /** + * 查询员工请假申请列表 + */ + List queryList(WmsLeaveRequestBo bo); + + /** + * 新增员工请假申请 + */ + Boolean insertByBo(WmsLeaveRequestBo bo); + + /** + * 修改员工请假申请 + */ + Boolean updateByBo(WmsLeaveRequestBo bo); + + /** + * 校验并批量删除员工请假申请信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java b/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java new file mode 100644 index 00000000..a34d3228 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsMealReport; +import com.klp.domain.vo.WmsMealReportVo; +import com.klp.domain.bo.WmsMealReportBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 部门报餐主Service接口 + * + * @author klp + * @date 2026-01-17 + */ +public interface IWmsMealReportService { + + /** + * 查询部门报餐主 + */ + WmsMealReportVo queryById(Long reportId); + + /** + * 查询部门报餐主列表 + */ + TableDataInfo queryPageList(WmsMealReportBo bo, PageQuery pageQuery); + + /** + * 查询部门报餐主列表 + */ + List queryList(WmsMealReportBo bo); + + /** + * 新增部门报餐主 + */ + Boolean insertByBo(WmsMealReportBo bo); + + /** + * 修改部门报餐主 + */ + Boolean updateByBo(WmsMealReportBo bo); + + /** + * 校验并批量删除部门报餐主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java new file mode 100644 index 00000000..4e2e8979 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -0,0 +1,118 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsLeaveRequestBo; +import com.klp.domain.vo.WmsLeaveRequestVo; +import com.klp.domain.WmsLeaveRequest; +import com.klp.mapper.WmsLeaveRequestMapper; +import com.klp.service.IWmsLeaveRequestService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 员工请假申请Service业务层处理 + * + * @author klp + * @date 2026-01-17 + */ +@RequiredArgsConstructor +@Service +public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { + + private final WmsLeaveRequestMapper baseMapper; + + /** + * 查询员工请假申请 + */ + @Override + public WmsLeaveRequestVo queryById(Long leaveId){ + return baseMapper.selectVoById(leaveId); + } + + /** + * 查询员工请假申请列表 + */ + @Override + public TableDataInfo queryPageList(WmsLeaveRequestBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询员工请假申请列表 + */ + @Override + public List queryList(WmsLeaveRequestBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsLeaveRequestBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveTitle()), WmsLeaveRequest::getLeaveTitle, bo.getLeaveTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), WmsLeaveRequest::getLeaveType, bo.getLeaveType()); + lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsLeaveRequest::getApplicantName, bo.getApplicantName()); + lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName()); + lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime()); + lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift()); + lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachmentUrls()), WmsLeaveRequest::getAttachmentUrls, bo.getAttachmentUrls()); + return lqw; + } + + /** + * 新增员工请假申请 + */ + @Override + public Boolean insertByBo(WmsLeaveRequestBo bo) { + WmsLeaveRequest add = BeanUtil.toBean(bo, WmsLeaveRequest.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setLeaveId(add.getLeaveId()); + } + return flag; + } + + /** + * 修改员工请假申请 + */ + @Override + public Boolean updateByBo(WmsLeaveRequestBo bo) { + WmsLeaveRequest update = BeanUtil.toBean(bo, WmsLeaveRequest.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsLeaveRequest entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除员工请假申请 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java new file mode 100644 index 00000000..b1ecf1d0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java @@ -0,0 +1,116 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsMealReportBo; +import com.klp.domain.vo.WmsMealReportVo; +import com.klp.domain.WmsMealReport; +import com.klp.mapper.WmsMealReportMapper; +import com.klp.service.IWmsMealReportService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 部门报餐主Service业务层处理 + * + * @author klp + * @date 2026-01-17 + */ +@RequiredArgsConstructor +@Service +public class WmsMealReportServiceImpl implements IWmsMealReportService { + + private final WmsMealReportMapper baseMapper; + + /** + * 查询部门报餐主 + */ + @Override + public WmsMealReportVo queryById(Long reportId){ + return baseMapper.selectVoById(reportId); + } + + /** + * 查询部门报餐主列表 + */ + @Override + public TableDataInfo queryPageList(WmsMealReportBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询部门报餐主列表 + */ + @Override + public List queryList(WmsMealReportBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsMealReportBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getReportDate() != null, WmsMealReport::getReportDate, bo.getReportDate()); + lqw.eq(bo.getMealType() != null, WmsMealReport::getMealType, bo.getMealType()); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), WmsMealReport::getDeptName, bo.getDeptName()); + lqw.eq(bo.getTotalPeople() != null, WmsMealReport::getTotalPeople, bo.getTotalPeople()); + lqw.eq(bo.getDineInPeople() != null, WmsMealReport::getDineInPeople, bo.getDineInPeople()); + lqw.eq(bo.getTakeoutPeople() != null, WmsMealReport::getTakeoutPeople, bo.getTakeoutPeople()); + lqw.like(StringUtils.isNotBlank(bo.getReportUserName()), WmsMealReport::getReportUserName, bo.getReportUserName()); + lqw.eq(bo.getStatus() != null, WmsMealReport::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增部门报餐主 + */ + @Override + public Boolean insertByBo(WmsMealReportBo bo) { + WmsMealReport add = BeanUtil.toBean(bo, WmsMealReport.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setReportId(add.getReportId()); + } + return flag; + } + + /** + * 修改部门报餐主 + */ + @Override + public Boolean updateByBo(WmsMealReportBo bo) { + WmsMealReport update = BeanUtil.toBean(bo, WmsMealReport.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsMealReport entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除部门报餐主 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsLeaveRequestMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsLeaveRequestMapper.xml new file mode 100644 index 00000000..c53294e5 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsLeaveRequestMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMealReportMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMealReportMapper.xml new file mode 100644 index 00000000..515f6209 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsMealReportMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + From c408d15f854b363727198c0cbf2ccd777babdd6e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 17 Jan 2026 10:18:42 +0800 Subject: [PATCH 21/39] =?UTF-8?q?feat(wms):=20=E4=B8=BAVO=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E5=AE=9E=E4=BD=93=E7=BB=A7?= =?UTF-8?q?=E6=89=BF=E5=B9=B6=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - WmsLeaveRequestVo继承BaseEntity类 - WmsMealReportVo继承BaseEntity类 - WmsMaterialCoilExportVo新增dataType字段 - 在WmsMaterialCoilMapper.xml中映射数据类型字段 - 实现历史数据处理逻辑，当dataType为0时将实际库区设为null --- .../src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java | 3 ++- .../main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java | 3 +++ klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java | 3 ++- .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 5 +++++ .../src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java index 3a3e3aa7..d44e2b7a 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; @@ -18,7 +19,7 @@ import lombok.Data; */ @Data @ExcelIgnoreUnannotated -public class WmsLeaveRequestVo { +public class WmsLeaveRequestVo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java index 9624b5fa..928c630e 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java @@ -166,4 +166,7 @@ public class WmsMaterialCoilExportVo { * 更新时间（仅临时存储，不导出，用于发货时间为空时兜底） */ private Date updateTime; + + // 数据类型 + private Integer dataType; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java index 668c4c15..5a9faba7 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; @@ -17,7 +18,7 @@ import lombok.Data; */ @Data @ExcelIgnoreUnannotated -public class WmsMealReportVo { +public class WmsMealReportVo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 0a1c3bc5..b324a0e4 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2210,6 +2210,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { vo.setCreateTime(finalDate); } // 非1的情况，保持原有create_time不变 + + // 如果是dataType=0的历史数据，将实际库区设置为null + if (vo.getDataType() != null && vo.getDataType() == 0) { + vo.setActualWarehouseName(null); + } }); return wmsMaterialCoilExportVos; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index d74429fe..9b28ee82 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -350,6 +350,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END AS itemTypeDesc, -- 物品ID mc.item_id AS itemId, + -- 数据类型 + mc.data_type AS dataType, -- 逻辑库区 w.warehouse_name AS warehouseName, -- 实际库区 From 672fbefca3e959906ba5b751c4c3d1e6e10fd395 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 17 Jan 2026 10:36:24 +0800 Subject: [PATCH 22/39] =?UTF-8?q?feat(report):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=92=8C=E6=8A=A5=E9=A4=90=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在IWmsLeaveRequestService接口中新增按请假类型、部门、月份统计的方法 - 在IWmsMealReportService接口中新增按餐别、部门、日期统计的方法 - 在WmsLeaveRequestController中添加请假统计报表相关API端点 - 在WmsMealReportController中添加报餐统计报表相关API端点 - 在WmsLeaveRequestServiceImpl中实现请假统计报表的数据查询逻辑 - 在WmsMealReportServiceImpl中实现报餐统计报表的数据查询逻辑 - 使用QueryWrapper构建统计查询条件，支持多维度筛选和分组统计 - 统一返回Map格式的统计数据，便于前端展示报表图表 --- .../controller/WmsLeaveRequestController.java | 26 +++++++ .../controller/WmsMealReportController.java | 26 +++++++ .../klp/service/IWmsLeaveRequestService.java | 16 +++++ .../klp/service/IWmsMealReportService.java | 16 +++++ .../impl/WmsLeaveRequestServiceImpl.java | 58 +++++++++++++++ .../impl/WmsMealReportServiceImpl.java | 72 +++++++++++++++++++ 6 files changed, 214 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java index 2b221441..9c4379d1 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java @@ -21,6 +21,8 @@ import com.klp.domain.vo.WmsLeaveRequestVo; import com.klp.domain.bo.WmsLeaveRequestBo; import com.klp.service.IWmsLeaveRequestService; import com.klp.common.core.page.TableDataInfo; +import java.util.List; +import java.util.Map; /** * 员工请假申请 @@ -96,4 +98,28 @@ public class WmsLeaveRequestController extends BaseController { @PathVariable Long[] leaveIds) { return toAjax(iWmsLeaveRequestService.deleteWithValidByIds(Arrays.asList(leaveIds), true)); } + + /** + * 请假统计报表 - 按请假类型统计 + */ + @GetMapping("/report/leaveType") + public R>> getLeaveTypeReport(WmsLeaveRequestBo bo) { + return R.ok(iWmsLeaveRequestService.getLeaveTypeReport(bo)); + } + + /** + * 请假统计报表 - 按部门统计 + */ + @GetMapping("/report/dept") + public R>> getLeaveDeptReport(WmsLeaveRequestBo bo) { + return R.ok(iWmsLeaveRequestService.getLeaveDeptReport(bo)); + } + + /** + * 请假统计报表 - 按月份统计 + */ + @GetMapping("/report/monthly") + public R>> getLeaveMonthlyReport(WmsLeaveRequestBo bo) { + return R.ok(iWmsLeaveRequestService.getLeaveMonthlyReport(bo)); + } } diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java b/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java index 05c567a4..a22ec4c1 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMealReportController.java @@ -21,6 +21,8 @@ import com.klp.domain.vo.WmsMealReportVo; import com.klp.domain.bo.WmsMealReportBo; import com.klp.service.IWmsMealReportService; import com.klp.common.core.page.TableDataInfo; +import java.util.List; +import java.util.Map; /** * 部门报餐主 @@ -96,4 +98,28 @@ public class WmsMealReportController extends BaseController { @PathVariable Long[] reportIds) { return toAjax(iWmsMealReportService.deleteWithValidByIds(Arrays.asList(reportIds), true)); } + + /** + * 报餐统计报表 - 按餐别统计 + */ + @GetMapping("/report/mealType") + public R>> getMealTypeReport(WmsMealReportBo bo) { + return R.ok(iWmsMealReportService.getMealTypeReport(bo)); + } + + /** + * 报餐统计报表 - 按部门统计 + */ + @GetMapping("/report/dept") + public R>> getMealDeptReport(WmsMealReportBo bo) { + return R.ok(iWmsMealReportService.getMealDeptReport(bo)); + } + + /** + * 报餐统计报表 - 按日期统计 + */ + @GetMapping("/report/date") + public R>> getMealDateReport(WmsMealReportBo bo) { + return R.ok(iWmsMealReportService.getMealDateReport(bo)); + } } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java index 2d7a766e..2ed7e2f9 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java @@ -8,6 +8,7 @@ import com.klp.common.core.domain.PageQuery; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 员工请假申请Service接口 @@ -46,4 +47,19 @@ public interface IWmsLeaveRequestService { * 校验并批量删除员工请假申请信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 请假统计报表 - 按请假类型统计 + */ + List> getLeaveTypeReport(WmsLeaveRequestBo bo); + + /** + * 请假统计报表 - 按部门统计 + */ + List> getLeaveDeptReport(WmsLeaveRequestBo bo); + + /** + * 请假统计报表 - 按月份统计 + */ + List> getLeaveMonthlyReport(WmsLeaveRequestBo bo); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java b/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java index a34d3228..a93555ed 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMealReportService.java @@ -8,6 +8,7 @@ import com.klp.common.core.domain.PageQuery; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 部门报餐主Service接口 @@ -46,4 +47,19 @@ public interface IWmsMealReportService { * 校验并批量删除部门报餐主信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 报餐统计报表 - 按餐别统计 + */ + List> getMealTypeReport(WmsMealReportBo bo); + + /** + * 报餐统计报表 - 按部门统计 + */ + List> getMealDeptReport(WmsMealReportBo bo); + + /** + * 报餐统计报表 - 按日期统计 + */ + List> getMealDateReport(WmsMealReportBo bo); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index 4e2e8979..f079496f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -18,6 +18,8 @@ import com.klp.service.IWmsLeaveRequestService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.Date; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** * 员工请假申请Service业务层处理 @@ -115,4 +117,60 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { } return baseMapper.deleteBatchIds(ids) > 0; } + + /** + * 请假统计报表 - 按请假类型统计 + */ + @Override + public List> getLeaveTypeReport(WmsLeaveRequestBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("leave_type as type", + "COUNT(*) as count", + "SUM(leave_days) as total_days") + .eq(bo.getApplicantDeptName() != null, "applicant_dept_name", bo.getApplicantDeptName()) + .ge(bo.getStartTime() != null, "start_time", bo.getStartTime()) + .le(bo.getEndTime() != null, "end_time", bo.getEndTime()) + .eq("del_flag", 0) + .groupBy("leave_type") + .orderByDesc("total_days"); + return baseMapper.selectMaps(qw); + } + + /** + * 请假统计报表 - 按部门统计 + */ + @Override + public List> getLeaveDeptReport(WmsLeaveRequestBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("applicant_dept_name as dept_name", + "COUNT(*) as count", + "SUM(leave_days) as total_days") + .isNotNull("applicant_dept_name") + .eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType()) + .ge(bo.getStartTime() != null, "start_time", bo.getStartTime()) + .le(bo.getEndTime() != null, "end_time", bo.getEndTime()) + .eq("del_flag", 0) + .groupBy("applicant_dept_name") + .orderByDesc("total_days"); + return baseMapper.selectMaps(qw); + } + + /** + * 请假统计报表 - 按月份统计 + */ + @Override + public List> getLeaveMonthlyReport(WmsLeaveRequestBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("DATE_FORMAT(start_time, '%Y-%m') as month", + "COUNT(*) as count", + "SUM(leave_days) as total_days") + .ge(bo.getStartTime() != null, "start_time", bo.getStartTime()) + .le(bo.getEndTime() != null, "end_time", bo.getEndTime()) + .eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType()) + .eq(bo.getApplicantDeptName() != null, "applicant_dept_name", bo.getApplicantDeptName()) + .eq("del_flag", 0) + .groupBy("month") + .orderByAsc("month"); + return baseMapper.selectMaps(qw); + } } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java index b1ecf1d0..6ecc2bf4 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java @@ -18,6 +18,8 @@ import com.klp.service.IWmsMealReportService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.Date; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** * 部门报餐主Service业务层处理 @@ -113,4 +115,74 @@ public class WmsMealReportServiceImpl implements IWmsMealReportService { } return baseMapper.deleteBatchIds(ids) > 0; } + + /** + * 报餐统计报表 - 按餐别统计 + */ + @Override + public List> getMealTypeReport(WmsMealReportBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("CASE meal_type " + + "WHEN 1 THEN '早餐' " + + "WHEN 2 THEN '午餐' " + + "WHEN 3 THEN '晚餐' " + + "WHEN 4 THEN '夜宵' " + + "ELSE '未知' END as meal_name", + "SUM(total_people) as total_people", + "SUM(dine_in_people) as total_dine_in", + "SUM(takeout_people) as total_takeout", + "COUNT(*) as report_count") + .eq(StringUtils.isNotBlank(bo.getDeptName()), "dept_name", bo.getDeptName()) + .ge(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .le(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .eq("del_flag", 0) + .eq(bo.getStatus() != null, "status", bo.getStatus()) + .groupBy("meal_type") + .orderByAsc("meal_type"); + return baseMapper.selectMaps(qw); + } + + /** + * 报餐统计报表 - 按部门统计 + */ + @Override + public List> getMealDeptReport(WmsMealReportBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("dept_name", + "SUM(total_people) as total_people", + "SUM(dine_in_people) as total_dine_in", + "SUM(takeout_people) as total_takeout", + "COUNT(*) as report_count", + "AVG(total_people) as avg_people") + .eq(bo.getMealType() != null, "meal_type", bo.getMealType()) + .ge(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .le(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .eq("del_flag", 0) + .eq(bo.getStatus() != null, "status", bo.getStatus()) + .groupBy("dept_name") + .orderByDesc("total_people"); + return baseMapper.selectMaps(qw); + } + + /** + * 报餐统计报表 - 按日期统计 + */ + @Override + public List> getMealDateReport(WmsMealReportBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("report_date", + "SUM(total_people) as total_people", + "SUM(dine_in_people) as total_dine_in", + "SUM(takeout_people) as total_takeout", + "COUNT(*) as report_count") + .eq(StringUtils.isNotBlank(bo.getDeptName()), "dept_name", bo.getDeptName()) + .eq(bo.getMealType() != null, "meal_type", bo.getMealType()) + .ge(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .le(bo.getReportDate() != null, "report_date", bo.getReportDate()) + .eq("del_flag", 0) + .eq(bo.getStatus() != null, "status", bo.getStatus()) + .groupBy("report_date") + .orderByAsc("report_date"); + return baseMapper.selectMaps(qw); + } } From c178eb71029782c78c2395806cefd657d1648b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 10:55:44 +0800 Subject: [PATCH 23/39] =?UTF-8?q?feat(coil):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=BD=91=E6=A0=BC=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增删除钢卷功能按钮及相关API调用 - 将卡片网格布局从6列调整为5列 - 更新异常按钮样式为警告类型 --- klp-ui/src/views/wms/coil/do/correct.vue | 25 ++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index 62eebfb2..49266c28 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -9,7 +9,7 @@ 查找钢卷并修正 绿色边框表示当前钢卷，灰色边框表示历史钢卷 - + 刷新
@@ -185,7 +185,9 @@
修正 - 删除 + 异常 ({{ item.abnormalCount }}) @@ -335,7 +337,7 @@ \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/mealReport.vue b/klp-ui/src/views/wms/hrm/mealReport.vue new file mode 100644 index 00000000..7f291acb --- /dev/null +++ b/klp-ui/src/views/wms/hrm/mealReport.vue @@ -0,0 +1,364 @@ + + + \ No newline at end of file From 2a501c5486e45b971a67c1241bf04c528adcabe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 14:51:01 +0800 Subject: [PATCH 27/39] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=8A=A5=E9=A4=90=E5=92=8C=E8=AF=B7=E5=81=87=E7=94=B3?= =?UTF-8?q?=E8=AF=B7API=E5=8F=8A=E5=AD=97=E5=85=B8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增部门报餐和员工请假申请的API接口文件，包含列表查询、详情获取、新增、修改和删除功能 添加可编辑的字典选择组件DictSelect，支持字典项的双击编辑、快速新增和刷新功能 --- klp-ui/src/api/wms/leaveRequest.js | 44 +++ klp-ui/src/api/wms/mealReport.js | 44 +++ klp-ui/src/components/DictSelect/index.vue | 317 +++++++++++++++++++++ 3 files changed, 405 insertions(+) create mode 100644 klp-ui/src/api/wms/leaveRequest.js create mode 100644 klp-ui/src/api/wms/mealReport.js create mode 100644 klp-ui/src/components/DictSelect/index.vue diff --git a/klp-ui/src/api/wms/leaveRequest.js b/klp-ui/src/api/wms/leaveRequest.js new file mode 100644 index 00000000..1b4a7615 --- /dev/null +++ b/klp-ui/src/api/wms/leaveRequest.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询员工请假申请列表 +export function listLeaveRequest(query) { + return request({ + url: '/wms/leaveRequest/list', + method: 'get', + params: query + }) +} + +// 查询员工请假申请详细 +export function getLeaveRequest(leaveId) { + return request({ + url: '/wms/leaveRequest/' + leaveId, + method: 'get' + }) +} + +// 新增员工请假申请 +export function addLeaveRequest(data) { + return request({ + url: '/wms/leaveRequest', + method: 'post', + data: data + }) +} + +// 修改员工请假申请 +export function updateLeaveRequest(data) { + return request({ + url: '/wms/leaveRequest', + method: 'put', + data: data + }) +} + +// 删除员工请假申请 +export function delLeaveRequest(leaveId) { + return request({ + url: '/wms/leaveRequest/' + leaveId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/mealReport.js b/klp-ui/src/api/wms/mealReport.js new file mode 100644 index 00000000..47ec98c6 --- /dev/null +++ b/klp-ui/src/api/wms/mealReport.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询部门报餐主列表 +export function listMealReport(query) { + return request({ + url: '/wms/mealReport/list', + method: 'get', + params: query + }) +} + +// 查询部门报餐主详细 +export function getMealReport(reportId) { + return request({ + url: '/wms/mealReport/' + reportId, + method: 'get' + }) +} + +// 新增部门报餐主 +export function addMealReport(data) { + return request({ + url: '/wms/mealReport', + method: 'post', + data: data + }) +} + +// 修改部门报餐主 +export function updateMealReport(data) { + return request({ + url: '/wms/mealReport', + method: 'put', + data: data + }) +} + +// 删除部门报餐主 +export function delMealReport(reportId) { + return request({ + url: '/wms/mealReport/' + reportId, + method: 'delete' + }) +} diff --git a/klp-ui/src/components/DictSelect/index.vue b/klp-ui/src/components/DictSelect/index.vue new file mode 100644 index 00000000..3b1a6126 --- /dev/null +++ b/klp-ui/src/components/DictSelect/index.vue @@ -0,0 +1,317 @@ + + + \ No newline at end of file From d85beb3359d54e66eca0280ef058c058416ccd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 16:16:07 +0800 Subject: [PATCH 28/39] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AF=B7=E5=81=87=E5=92=8C=E6=8A=A5=E9=A4=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加报表统计接口和页面，包含以下功能： 1. 请假统计：按类型、部门和月份展示数据 2. 报餐统计：按餐别、部门和日期展示数据 3. 使用echarts实现多种图表展示方式 --- klp-ui/src/api/wms/leaveRequest.js | 28 ++ klp-ui/src/api/wms/mealReport.js | 28 ++ klp-ui/src/views/wms/hrm/report.vue | 402 ++++++++++++++++++++++++++++ 3 files changed, 458 insertions(+) create mode 100644 klp-ui/src/views/wms/hrm/report.vue diff --git a/klp-ui/src/api/wms/leaveRequest.js b/klp-ui/src/api/wms/leaveRequest.js index 1b4a7615..b84ff2e1 100644 --- a/klp-ui/src/api/wms/leaveRequest.js +++ b/klp-ui/src/api/wms/leaveRequest.js @@ -42,3 +42,31 @@ export function delLeaveRequest(leaveId) { method: 'delete' }) } + +// 报表相关接口 +// 按请假类型统计 +export function getLeaveTypeCount(query) { + return request({ + url: '/wms/leaveRequest/report/leaveType', + method: 'get', + params: query + }) +} + +// 按部门统计 +export function getDeptCount(query) { + return request({ + url: '/wms/leaveRequest/report/dept', + method: 'get', + params: query + }) +} + +// 按月份统计 +export function getMonthCount(query) { + return request({ + url: '/wms/leaveRequest/report/monthly', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/klp-ui/src/api/wms/mealReport.js b/klp-ui/src/api/wms/mealReport.js index 47ec98c6..56d543f0 100644 --- a/klp-ui/src/api/wms/mealReport.js +++ b/klp-ui/src/api/wms/mealReport.js @@ -42,3 +42,31 @@ export function delMealReport(reportId) { method: 'delete' }) } + +// 报表相关接口 +// 按餐别统计 +export function getMealTypeCount(query) { + return request({ + url: '/wms/mealReport/report/mealType', + method: 'get', + params: query + }) +} + +// 按部门统计 +export function getDeptCount(query) { + return request({ + url: '/wms/mealReport/report/dept', + method: 'get', + params: query + }) +} + +// 按日期统计 +export function getDateCount(query) { + return request({ + url: '/wms/mealReport/report/date', + method: 'get', + params: query + }) +} diff --git a/klp-ui/src/views/wms/hrm/report.vue b/klp-ui/src/views/wms/hrm/report.vue new file mode 100644 index 00000000..0d60e89e --- /dev/null +++ b/klp-ui/src/views/wms/hrm/report.vue @@ -0,0 +1,402 @@ + + + + + \ No newline at end of file From baf7c814b21fdb24eba222e3563d597be72d7a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 16:52:08 +0800 Subject: [PATCH 29/39] =?UTF-8?q?refactor(=E6=8A=A5=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2):=20=E9=87=8D=E6=9E=84HRM=E6=8A=A5=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=E5=92=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除卡片容器，直接使用栅格布局 - 调整图表分布和尺寸比例 - 优化图表标题样式和容器边框 - 简化整体页面结构 --- klp-ui/src/views/wms/hrm/report.vue | 105 ++++++++++++++-------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/klp-ui/src/views/wms/hrm/report.vue b/klp-ui/src/views/wms/hrm/report.vue index 0d60e89e..95d1f034 100644 --- a/klp-ui/src/views/wms/hrm/report.vue +++ b/klp-ui/src/views/wms/hrm/report.vue @@ -1,57 +1,53 @@ @@ -366,35 +362,42 @@ export default { .app-container { padding: 20px; } + .page-title { font-size: 18px; font-weight: bold; color: #333; margin-bottom: 20px; } + /* 卡片样式 */ .mb15 { margin-bottom: 15px; } + .card-header { font-size: 16px; font-weight: bold; color: #333; } + /* 图表标题 */ .chart-title { font-size: 14px; font-weight: 500; color: #666; + background-color: #fff; margin-bottom: 10px; text-align: center; } + /* 图表容器基础样式 */ .chart-container { width: 100%; height: 300px; - border-radius: 8px; + border: 2px solid #fff; } + /* 大图表样式 */ .big-chart { height: 400px; From 3a3169ca676a3dae6eaaa1eee01884fc677b9ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 17:06:36 +0800 Subject: [PATCH 30/39] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?):=20=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=8F=91=E8=B4=A7=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加蓝色边框样式和"已发货"标签用于区分已发货钢卷，同时重构边框样式和类型标签为独立方法 --- klp-ui/src/views/wms/coil/do/correct.vue | 43 +++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index c1f61220..56904af3 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -7,7 +7,7 @@

查找钢卷并修正 - 绿色边框表示当前钢卷，灰色边框表示历史钢卷 + 绿色边框表示当前钢卷，灰色边框表示历史钢卷, 蓝色边框表示已发货钢卷

刷新 @@ -35,12 +35,12 @@

暂无待领物料

-
+ :style="getBorderStyle(item)">
{{ item.currentCoilNo }} + {{ getTypeLabel(item) }} {{ item.materialType || '原料' }} @@ -383,7 +383,7 @@ export default { pageNum: 1, pageSize: 20, // dataType: 1, - status: 0, + // status: 0, enterCoilNo: null, currentCoilNo: null }, @@ -568,6 +568,41 @@ export default { }, methods: { parseTime, + getBorderStyle(row) { + console.log(row); + // 已发货 + if (row.status == 1) { + return {border: '1.5px solid #007bff'} + } + // 历史钢卷 + if (row.dataType == 0) { + return {border: '1.5px solid #6c757d'} + } + // 当前钢卷 + if (row.dataType == 1) { + return {border: '1.5px solid #28a745'} + } + // 还未入库的钢卷 + if (row.dataType == 10) { + return {border: '1.5px solid #ffc107'} + } + return {border: '1.5px solid #e4e7ed'} + }, + getTypeLabel(row) { + if (row.status == 1) { + return '已发货' + } + if (row.dataType == 0) { + return '历史钢卷' + } + if (row.dataType == 1) { + return '当前钢卷' + } + if (row.dataType == 10) { + return '还未入库的钢卷' + } + return '未知' + }, /** 查询用户列表 */ getUsers() { listUser({ pageNum: 1, pageSize: 1000 }).then(response => { From b157affdcf0ee2845e04dd8ae2db718f3a8b332a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 17 Jan 2026 20:59:10 +0800 Subject: [PATCH 31/39] =?UTF-8?q?fix(coil):=20=E4=BF=AE=E5=A4=8D=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=90=8E=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复入库成功后表单重置不完整的问题，添加materialType字段 修正planId重置错误，使用当前表单的planId而非todayPlanId 使用$set方法更新enterCoilNo以确保响应式更新 添加入库后自动获取最大钢卷号功能 --- klp-ui/src/views/wms/coil/do/warehousing.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 471c3e78..014fc406 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -607,9 +607,11 @@ export default { handleCoil(COIL_ACTIONS.RECEIVE, this.form, this.form.planId) .then(res => { this.$modal.msgSuccess("入库成功"); + this.form = { itemId: null, itemType: 'raw_material', + materialType: '原料', warehouseId: '1988150044862377986', // 酸连轧原料库 netWeight: null, grossWeight: null, @@ -618,8 +620,9 @@ export default { trimmingRequirement: null, packingStatus: null, packagingRequirement: null, - planId: this.todayPlanId, + planId: this.form.planId, } + this.getMaxCoilNoByPrefix() this.getList() }).finally(() => { this.buttonLoading = false; @@ -731,7 +734,7 @@ export default { getMaxCoilNo(prefix).then(res => { console.log(res) // 扣掉最后一位 - this.form.enterCoilNo = res.data.maxEnterCoilNo.slice(0, -1); + this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); }) }, // 检查钢卷号是否合法（后端检查） From 813464b16659ec639e98d6f101485bb7fb5659ca Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 19 Jan 2026 09:19:51 +0800 Subject: [PATCH 32/39] =?UTF-8?q?chore(build):=20=E7=A7=BB=E9=99=A4=20klp-?= =?UTF-8?q?hrm=20=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉 klp-admin 模块中的 klp-hrm 依赖项 - 注释掉根 pom 中的 klp-hrm 依赖项 - 注释掉父级模块配置中的 klp-hrm 模块引用 --- klp-admin/pom.xml | 8 ++++---- pom.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/klp-admin/pom.xml b/klp-admin/pom.xml index c7d88bc5..9fba3ee5 100644 --- a/klp-admin/pom.xml +++ b/klp-admin/pom.xml @@ -102,10 +102,10 @@ com.klp klp-erp - - com.klp - klp-hrm - + + + + com.klp klp-crm diff --git a/pom.xml b/pom.xml index 87fcb6b1..65101cc6 100644 --- a/pom.xml +++ b/pom.xml @@ -384,11 +384,11 @@ klp-erp ${klp-flowable-plus.version} - - com.klp - klp-hrm - ${klp-flowable-plus.version} - + + + + + com.klp klp-crm @@ -416,7 +416,7 @@ klp-ems klp-pocket klp-erp - klp-hrm + klp-crm pom From a25a90ffbf665708555f44fca71413572976b4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 19 Jan 2026 09:21:54 +0800 Subject: [PATCH 33/39] =?UTF-8?q?feat(wms):=20=E9=87=8D=E6=9E=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=BA=93=E4=BD=8D=E9=80=89=E6=8B=A9=E4=B8=BA=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将仓库选择组件替换为支持多选的el-select组件 - 使用warehouseQueryMap和warehouseIds动态生成查询参数 - 优化数据获取逻辑，使用flatMap处理多仓库查询结果 --- klp-ui/src/views/wms/report/zha.vue | 141 ++++++++++++++++++--------- klp-ui/src/views/wms/report/zinc.vue | 80 ++++++++++----- 2 files changed, 150 insertions(+), 71 deletions(-) diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 57d4fb04..994b6e03 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -19,8 +19,11 @@ @keyup.enter.native="handleQuery" /> - + + + + num.toString().padStart(2, '0') const now = new Date() // 当前本地北京时间 @@ -148,6 +151,40 @@ export default { itemManufacturer: '', }, loading: false, + warehouseIds: [ + '1988150099140866050', + '1988150263284953089', + '1988150545175736322', + '1988150150521090049', + ], + warehouseOptions: [ + { label: '酸连轧成品库', value: '1988150099140866050' }, + { label: '镀锌原料库', value: '1988150263284953089' }, + { label: '脱脂原料库', value: '1988150545175736322' }, + { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' }, + ], + warehouseQueryMap: { + '1988150099140866050': { + selectType: 'product', + createBy: 'suanzhakuguan', + warehouseId: '1988150099140866050' + }, + '1988150263284953089': { + selectType: 'raw_material', + createBy: 'suanzhakuguan', + warehouseId: '1988150263284953089' + }, + '1988150545175736322': { + selectType: 'raw_material', + createBy: 'suanzhakuguan', + warehouseId: '1988150545175736322' + }, + '1988150150521090049': { + selectType: 'raw_material', + createBy: 'suanzhakuguan', + warehouseId: '1988150150521090049' + }, + } } }, computed: { @@ -166,49 +203,61 @@ export default { methods: { getList() { this.loading = true - Promise.all([ - // 酸连轧成品库 - listCoilWithIds({ - ...this.queryParams, - pageSize: 9999, - pageNum: 1, - // dataType: 1, - createBy: 'suanzhakuguan', - warehouseId: '1988150099140866050' - }), - // 镀锌原料库 - listCoilWithIds({ - ...this.queryParams, - pageSize: 9999, - pageNum: 1, - // dataType: 1, - selectType: 'raw_material', - createBy: 'suanzhakuguan', - warehouseId: '1988150263284953089' - }), - // 脱脂原料库 - listCoilWithIds({ - ...this.queryParams, - pageSize: 9999, - pageNum: 1, - // dataType: 1, - selectType: 'raw_material', - createBy: 'suanzhakuguan', - warehouseId: '1988150545175736322' - }), - // 酸连轧纵剪分条原料库1988150150521090049 - listCoilWithIds({ - ...this.queryParams, - pageSize: 9999, - pageNum: 1, - // dataType: 1, - selectType: 'raw_material', - createBy: 'suanzhakuguan', - warehouseId: '1988150150521090049' - }), - ]).then(([res1, res2, res3, res4]) => { - console.log(res1, res2, res3, res4) - const list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows] + Promise.all( + this.warehouseIds.map(warehouseId => { + const params = this.warehouseQueryMap[warehouseId] + return listCoilWithIds({ + ...this.queryParams, + pageSize: 9999, + pageNum: 1, + // dataType: 1, + ...params + }) + }) + // [ + // // 酸连轧成品库 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // createBy: 'suanzhakuguan', + // warehouseId: '1988150099140866050' + // }), + // // 镀锌原料库 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // selectType: 'raw_material', + // createBy: 'suanzhakuguan', + // warehouseId: '1988150263284953089' + // }), + // // 脱脂原料库 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // selectType: 'raw_material', + // createBy: 'suanzhakuguan', + // warehouseId: '1988150545175736322' + // }), + // // 酸连轧纵剪分条原料库1988150150521090049 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // selectType: 'raw_material', + // createBy: 'suanzhakuguan', + // warehouseId: '1988150150521090049' + // }), + // ] + ).then((resList) => { + console.log(resList) + const list = resList.flatMap(res => res.rows) // 按照createTime 降序排序 this.list = list.sort( (a, b) => new Date(b.createTime) - new Date(a.createTime) diff --git a/klp-ui/src/views/wms/report/zinc.vue b/klp-ui/src/views/wms/report/zinc.vue index 04698203..850f2d5b 100644 --- a/klp-ui/src/views/wms/report/zinc.vue +++ b/klp-ui/src/views/wms/report/zinc.vue @@ -19,8 +19,11 @@ @keyup.enter.native="handleQuery" /> - + + + + { - console.log(res1, res2) - const list = [...res1.rows, ...res2.rows] + ...this.warehouseIds.map(warehouseId => listCoilWithIds({ + ...this.queryParams, + ...this.warehouseQueryMap[warehouseId], + pageSize: 9999, + pageNum: 1, + // dataType: 1, + })) + // // 镀锌成品库 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // selectType: 'product', + // // createBy: 'suanzhakuguan', + // warehouseId: '1988150323162836993' + // }), + // // 镀锌纵剪分条原料库 + // listCoilWithIds({ + // ...this.queryParams, + // pageSize: 9999, + // pageNum: 1, + // // dataType: 1, + // selectType: 'raw_material', + // // createBy: 'suanzhakuguan', + // warehouseId: '1988150487185289217' + // }), + ]).then((resList) => { + console.log(resList) + const list = resList.flatMap(res => res.rows) // 按照createTime 降序排序 this.list = list.sort( (a, b) => new Date(b.createTime) - new Date(a.createTime) From a378a90dc8795e69df7a9135567b9b18fa0732e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 19 Jan 2026 09:48:45 +0800 Subject: [PATCH 34/39] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=85=A5=E5=BA=93=E6=97=B6=E5=BD=93=E5=89=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E6=9C=AA=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在获取最大入库钢卷号时，同时设置当前钢卷号为去掉最后一位的钢卷号，确保表单数据完整 --- klp-ui/src/views/wms/coil/do/warehousing.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 014fc406..3759be4d 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -735,6 +735,7 @@ export default { console.log(res) // 扣掉最后一位 this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); + this.$set(this.form, 'currentCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); }) }, // 检查钢卷号是否合法（后端检查） From d17272fbe4fc905ced15ee40f1e3b73b4e0bf759 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 19 Jan 2026 10:16:00 +0800 Subject: [PATCH 35/39] =?UTF-8?q?feat(leave):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增根据请假人分组获取请假信息的接口方法 - 在WmsLeaveRequestBo中添加beginTime、endTimeParam和leaveIds字段 - 重构buildQueryWrapper方法支持按ID列表查询和时间范围交叉查询 - 添加按请假人分组统计的数据库查询实现 - 移除WmsLeaveRequestVo中leaveId和attachmentUrls的Excel导出注解 - 在WmsMealReportService中添加用户昵称映射功能 - 为WmsMealReportVo添加创建人和更新人姓名字段 --- .../controller/WmsLeaveRequestController.java | 11 +++ .../com/klp/domain/bo/WmsLeaveRequestBo.java | 15 +++ .../com/klp/domain/vo/WmsLeaveRequestVo.java | 3 - .../com/klp/domain/vo/WmsMealReportVo.java | 4 + .../klp/service/IWmsLeaveRequestService.java | 5 + .../impl/WmsLeaveRequestServiceImpl.java | 95 ++++++++++++++++--- .../impl/WmsMealReportServiceImpl.java | 36 ++++++- 7 files changed, 148 insertions(+), 21 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java index 9c4379d1..20929711 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsLeaveRequestController.java @@ -122,4 +122,15 @@ public class WmsLeaveRequestController extends BaseController { public R>> getLeaveMonthlyReport(WmsLeaveRequestBo bo) { return R.ok(iWmsLeaveRequestService.getLeaveMonthlyReport(bo)); } + + /** + * 根据请假人分组获取请假信息 + */ + @GetMapping("/grouped") + public R>> getLeaveListGroupedByApplicant(WmsLeaveRequestBo bo) { + return R.ok(iWmsLeaveRequestService.getLeaveListGroupedByApplicant(bo)); + } + + + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java index a9b4411f..2887fb52 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java @@ -55,6 +55,21 @@ public class WmsLeaveRequestBo extends BaseEntity { */ private Date endTime; + /** + * 查询开始时间（用于筛选请假时间范围） + */ + private Date beginTime; + + /** + * 查询结束时间（用于筛选请假时间范围） + */ + private Date endTimeParam; + + /** + * 导出ID列表（逗号分隔） + */ + private String leaveIds; + /** * 请假班次（早班/中班/晚班/夜班/全天等） */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java index d44e2b7a..c8679eb0 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -26,7 +26,6 @@ public class WmsLeaveRequestVo extends BaseEntity { /** * 主键ID */ - @ExcelProperty(value = "主键ID") private Long leaveId; /** @@ -88,8 +87,6 @@ public class WmsLeaveRequestVo extends BaseEntity { /** * 附件（病假证明等） */ - @ExcelProperty(value = "附件", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "病=假证明等") private String attachmentUrls; /** diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java index 5a9faba7..6ec48c9a 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import com.klp.common.core.domain.BaseEntity; +import com.klp.common.utils.StringUtils; import lombok.Data; @@ -83,4 +84,7 @@ public class WmsMealReportVo extends BaseEntity { private String remark; + private String createByName; + private String updateByName; + } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java index 2ed7e2f9..d256a1e4 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsLeaveRequestService.java @@ -62,4 +62,9 @@ public interface IWmsLeaveRequestService { * 请假统计报表 - 按月份统计 */ List> getLeaveMonthlyReport(WmsLeaveRequestBo bo); + + /** + * 根据请假人分组获取请假信息 + */ + List> getLeaveListGroupedByApplicant(WmsLeaveRequestBo bo); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index f079496f..126db7f1 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -15,10 +15,8 @@ import com.klp.domain.WmsLeaveRequest; import com.klp.mapper.WmsLeaveRequestMapper; import com.klp.service.IWmsLeaveRequestService; -import java.util.List; -import java.util.Map; -import java.util.Collection; -import java.util.Date; +import java.util.*; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** @@ -63,16 +61,52 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { private LambdaQueryWrapper buildQueryWrapper(WmsLeaveRequestBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getLeaveTitle()), WmsLeaveRequest::getLeaveTitle, bo.getLeaveTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), WmsLeaveRequest::getLeaveType, bo.getLeaveType()); - lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsLeaveRequest::getApplicantName, bo.getApplicantName()); - lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName()); - lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime()); - lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime()); - lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift()); - lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays()); - lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason()); - lqw.eq(StringUtils.isNotBlank(bo.getAttachmentUrls()), WmsLeaveRequest::getAttachmentUrls, bo.getAttachmentUrls()); + + // 如果传入了ids，则按ids筛选，否则按其他条件筛选 + if (StringUtils.isNotBlank(bo.getLeaveIds())) { + String[] idArray = bo.getLeaveIds().split(","); + List idList = new ArrayList<>(); + for (String id : idArray) { + if (StringUtils.isNotBlank(id)) { + try { + idList.add(Long.parseLong(id.trim())); + } catch (NumberFormatException e) { + // 忽略无效的ID + } + } + } + if (!idList.isEmpty()) { + lqw.in(WmsLeaveRequest::getLeaveId, idList); + } + } else { + // 正常的条件筛选 + lqw.eq(StringUtils.isNotBlank(bo.getLeaveTitle()), WmsLeaveRequest::getLeaveTitle, bo.getLeaveTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), WmsLeaveRequest::getLeaveType, bo.getLeaveType()); + lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsLeaveRequest::getApplicantName, bo.getApplicantName()); + lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName()); + + // 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录 + // 条件：(start_time <= endTimeParam AND end_time >= beginTime) + if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) { + lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam()) + .ge(WmsLeaveRequest::getEndTime, bo.getBeginTime()); + } else if (bo.getBeginTime() != null) { + lqw.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime()); + } else if (bo.getEndTimeParam() != null) { + lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam()); + } + + lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime()); + lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift()); + lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays()); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachmentUrls()), WmsLeaveRequest::getAttachmentUrls, bo.getAttachmentUrls()); + } + + // 按请假开始时间倒序排列 + lqw.orderByDesc(WmsLeaveRequest::getStartTime); + return lqw; } @@ -173,4 +207,37 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { .orderByAsc("month"); return baseMapper.selectMaps(qw); } + + /** + * 根据请假人分组获取请假信息 + */ + @Override + public List> getLeaveListGroupedByApplicant(WmsLeaveRequestBo bo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.select("applicant_name", + "applicant_dept_name", + "GROUP_CONCAT(CONCAT(leave_type, ':', DATE_FORMAT(start_time, '%Y-%m-%d %H:%i'), '~', DATE_FORMAT(end_time, '%Y-%m-%d %H:%i'), '(', leave_days, '天)') ORDER BY start_time SEPARATOR '; ') as leave_details", + "SUM(leave_days) as total_days", + "COUNT(*) as leave_count") + .eq("del_flag", 0); + + // 时间范围筛选 + if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) { + qw.le("start_time", bo.getEndTimeParam()) + .ge("end_time", bo.getBeginTime()); + } else if (bo.getBeginTime() != null) { + qw.ge("end_time", bo.getBeginTime()); + } else if (bo.getEndTimeParam() != null) { + qw.le("start_time", bo.getEndTimeParam()); + } + + // 其他筛选条件 + qw.eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType()) + .like(StringUtils.isNotBlank(bo.getApplicantName()), "applicant_name", bo.getApplicantName()) + .like(StringUtils.isNotBlank(bo.getApplicantDeptName()), "applicant_dept_name", bo.getApplicantDeptName()) + .groupBy("applicant_name", "applicant_dept_name") + .orderByDesc("total_days"); + + return baseMapper.selectMaps(qw); + } } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java index 29ca1a15..a31f9b2b 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; +import com.klp.domain.vo.WmsMaterialCoilVo; +import com.klp.system.service.impl.SysUserServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsMealReportBo; @@ -18,10 +20,9 @@ import com.klp.service.IWmsMealReportService; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.util.List; -import java.util.Map; -import java.util.Collection; -import java.util.Date; +import java.util.*; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** @@ -35,6 +36,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; public class WmsMealReportServiceImpl implements IWmsMealReportService { private final WmsMealReportMapper baseMapper; + private final SysUserServiceImpl userService; /** * 查询部门报餐主 @@ -51,6 +53,32 @@ public class WmsMealReportServiceImpl implements IWmsMealReportService { public TableDataInfo queryPageList(WmsMealReportBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + if (records == null || records.isEmpty()) { + return TableDataInfo.build(result); + } + + Set userNames = records.stream() + .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy())) + .filter(StringUtils::isNotBlank) + .collect(Collectors.toSet()); + + Map nickMap = Collections.emptyMap(); + if (!userNames.isEmpty()) { + nickMap = userService.selectNickNameMapByUserNames(new ArrayList<>(userNames)); + } + + // 单次遍历：填充创建/更新/发货人昵称，并构建物料/产品对象 + for (WmsMealReportVo vo : records) { + if (!nickMap.isEmpty()) { + if (StringUtils.isNotBlank(vo.getCreateBy())) { + vo.setCreateByName(nickMap.getOrDefault(vo.getCreateBy(), vo.getCreateBy())); + } + if (StringUtils.isNotBlank(vo.getUpdateBy())) { + vo.setUpdateByName(nickMap.getOrDefault(vo.getUpdateBy(), vo.getUpdateBy())); + } + } + } return TableDataInfo.build(result); } From 926977bc6c319180952c15e66ec9f97a3c46e039 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 19 Jan 2026 10:59:59 +0800 Subject: [PATCH 36/39] =?UTF-8?q?refactor(leave):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除多余的 beginTime 和 endTimeParam 字段 - 为 startTime 和 endTime 添加 JsonFormat 和 DateTimeFormat 注解 - 更新服务层时间范围筛选逻辑，使用 startTime 和 endTime 替代旧字段 - 统一时间格式化为 yyyy-MM-dd 格式 - 简化查询条件中的时间比较逻辑 --- .../com/klp/domain/bo/WmsLeaveRequestBo.java | 15 ++++------ .../impl/WmsLeaveRequestServiceImpl.java | 30 +++++++++---------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java index 2887fb52..795c2400 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 员工请假申请业务对象 wms_leave_request @@ -48,23 +49,17 @@ public class WmsLeaveRequestBo extends BaseEntity { /** * 请假开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; /** * 请假结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; - /** - * 查询开始时间（用于筛选请假时间范围） - */ - private Date beginTime; - - /** - * 查询结束时间（用于筛选请假时间范围） - */ - private Date endTimeParam; - /** * 导出ID列表（逗号分隔） */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index 126db7f1..768832f8 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -86,14 +86,14 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName()); // 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录 - // 条件：(start_time <= endTimeParam AND end_time >= beginTime) - if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) { - lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam()) - .ge(WmsLeaveRequest::getEndTime, bo.getBeginTime()); - } else if (bo.getBeginTime() != null) { - lqw.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime()); - } else if (bo.getEndTimeParam() != null) { - lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam()); + // 条件：(start_time <= endTime AND end_time >= startTime) + if (bo.getStartTime() != null && bo.getEndTime() != null) { + lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime()) + .ge(WmsLeaveRequest::getEndTime, bo.getStartTime()); + } else if (bo.getStartTime() != null) { + lqw.ge(WmsLeaveRequest::getEndTime, bo.getStartTime()); + } else if (bo.getEndTime() != null) { + lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime()); } lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime()); @@ -222,13 +222,13 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { .eq("del_flag", 0); // 时间范围筛选 - if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) { - qw.le("start_time", bo.getEndTimeParam()) - .ge("end_time", bo.getBeginTime()); - } else if (bo.getBeginTime() != null) { - qw.ge("end_time", bo.getBeginTime()); - } else if (bo.getEndTimeParam() != null) { - qw.le("start_time", bo.getEndTimeParam()); + if (bo.getStartTime() != null && bo.getEndTime() != null) { + qw.le("start_time", bo.getEndTime()) + .ge("end_time", bo.getStartTime()); + } else if (bo.getStartTime() != null) { + qw.ge("end_time", bo.getStartTime()); + } else if (bo.getEndTime() != null) { + qw.le("start_time", bo.getEndTime()); } // 其他筛选条件 From e2d0f07b40eb239389d5eb751b373b75232e56d7 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 19 Jan 2026 11:54:39 +0800 Subject: [PATCH 37/39] =?UTF-8?q?refactor(domain):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E8=AF=B7=E6=B1=82VO=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E5=85=B8=E8=BD=AC=E6=8D=A2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了leaveType字段的ExcelDictFormat注解配置 - 移除了leaveShift字段的ExcelDictFormat注解配置 - 简化了VO类的字典转换设置 - 优化了Excel导入导出的数据处理逻辑 --- klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java index c8679eb0..6946a8b3 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -38,7 +38,6 @@ public class WmsLeaveRequestVo extends BaseEntity { * 请假类型（年假/事假/病假/调休/外出/出差等） */ @ExcelProperty(value = "请假类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "年=假/事假/病假/调休/外出/出差等") private String leaveType; /** @@ -69,7 +68,6 @@ public class WmsLeaveRequestVo extends BaseEntity { * 请假班次（早班/中班/晚班/夜班/全天等） */ @ExcelProperty(value = "请假班次", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "早=班/中班/晚班/夜班/全天等") private String leaveShift; /** From f6000018d851f7c56c1af4923fda95f226db28e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 19 Jan 2026 13:28:45 +0800 Subject: [PATCH 38/39] =?UTF-8?q?feat(hrm):=20=E6=96=B0=E5=A2=9E=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E4=BC=98=E5=8C=96=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增请假统计报表页面，包含趋势图、部门统计图、类型统计图和表格展示 优化请假申请页面布局和字段展示 添加多个图表组件用于数据可视化展示 调整样式和表单验证规则 --- .../wms/hrm/components/LeaveDeptChart.vue | 48 ++++ .../wms/hrm/components/LeaveRecordTable.vue | 38 +++ .../wms/hrm/components/LeaveTrendChart.vue | 68 +++++ .../wms/hrm/components/LeaveTypeChart.vue | 60 ++++ klp-ui/src/views/wms/hrm/leaveReport.vue | 256 ++++++++++++++++++ klp-ui/src/views/wms/hrm/leaveRequest.vue | 33 +-- klp-ui/src/views/wms/hrm/mealReport.vue | 5 + klp-ui/src/views/wms/hrm/report.vue | 2 +- 8 files changed, 493 insertions(+), 17 deletions(-) create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue create mode 100644 klp-ui/src/views/wms/hrm/leaveReport.vue diff --git a/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue new file mode 100644 index 00000000..a51f316c --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue @@ -0,0 +1,48 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue new file mode 100644 index 00000000..2291d07b --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue new file mode 100644 index 00000000..e3eff65c --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue new file mode 100644 index 00000000..0491445d --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/leaveReport.vue b/klp-ui/src/views/wms/hrm/leaveReport.vue new file mode 100644 index 00000000..e8c9f4a1 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/leaveReport.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/leaveRequest.vue b/klp-ui/src/views/wms/hrm/leaveRequest.vue index 23fa7f19..d552c40d 100644 --- a/klp-ui/src/views/wms/hrm/leaveRequest.vue +++ b/klp-ui/src/views/wms/hrm/leaveRequest.vue @@ -46,9 +46,7 @@ - - - + + +