Compare commits

..

118 Commits

Author SHA1 Message Date
29d99a4f8d Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-22 18:04:15 +08:00
416202360b feat(material): 添加钢卷原料厚度自动提取功能
- 新增 WmsMaterialCoilMapper.selectRawMaterialThicknessByEnterCoilNos 方法
- 添加 MyBatis 映射查询热轧卷板原料规格
- 在 WmsMaterialCoilServiceImpl 中实现 fillRawMaterialThickness 方法
- 自动从规格字段提取 * 前的数字作为厚度值
- 在 WmsMaterialCoilVo 中新增 rawMaterialThickness 字段
- 分页查询时自动填充原料厚度信息
2026-06-22 18:04:07 +08:00
fd6c568d19 style: 格式化轧辊磨削页面代码,优化排版可读性
将页面内的模板标签、样式代码统一调整为多行缩进规范,合并冗余的单行代码,统一代码书写格式,提升页面代码的可维护性和阅读体验
2026-06-22 17:56:33 +08:00
7efa20dd94 feat(mes): 添加轧辊磨削复核人字段
- 在前端表格中新增复核人列,支持编辑和显示功能
- 在 MesRollGrind 实体类中添加 reviewer 字段
- 在 MesRollGrindBo 和 MesRollGrindVo 中添加 reviewer 字段
- 更新数据库查询映射文件,包含 reviewer 字段的查询
- 初始化新增行时将 reviewer 设置为 undefined
2026-06-22 17:49:14 +08:00
b5a269a37a feat(wms): 优化钢卷库区操作记录吞吐报表统计功能
- 后端新增 statistics 接口聚合图表数据,避免前端遍历计算
- 新增 WmsCoilWarehouseOperationLogStatisticsVo 数据传输对象
- 实现按操作人汇总、按日趋势、汇总指标三个维度的数据查询
- 前端 record 页面集成统计卡片、趋势图、饼图、柱状图展示
- 优化分页逻辑,移除前端全量数据存储和分页计算
- 添加完整的 SQL 统计查询语句支持多维度数据聚合
2026-06-22 17:27:08 +08:00
6436d56ab8 feat(flow): 添加盘库管理相关实体和服务接口
- 创建盘库差异记录实体类InvCountDiscrepancy及对应的BO、VO
- 创建盘库计划主实体类InvCountPlan及对应的BO、VO
- 创建盘库计划-库区关联实体类InvCountPlanWarehouse及对应的BO、VO
- 实现盘库差异记录的增删改查服务接口IInvCountDiscrepancyService
- 实现盘库计划主的增删改查服务接口IInvCountPlanService
- 实现盘库计划-库区关联的服务接口IInvCountPlanWarehouseService
- 添加对应的控制器InvCountDiscrepancyController和InvCountPlanController
- 创建相应的数据库映射文件和XML配置
- 实现服务接口的具体业务逻辑实现类
2026-06-22 16:38:02 +08:00
eda206a4d5 fix(wms/coil/materialWarning): 优化物料告警页面的操作权限和选择逻辑
1. 新增表格行选择校验,仅未处理告警可被选中
2. 给处理、忽略按钮新增未处理状态校验,仅未处理告警显示操作按钮
3. 优化批量处理/忽略逻辑,过滤已处理的选中项并更新提示文案
4. 移除单条处理的确认弹窗逻辑
2026-06-22 14:48:14 +08:00
15703216c3 Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-22 14:42:49 +08:00
3e640b4a4d feat: 新增业务员、合同号查询与展示,优化钢卷管理功能
1.  在钢卷相关API中新增对saleName和contractNo字段的过滤逻辑,避免数据覆盖
2.  多个报表页面新增业务员和合同号查询条件
3.  钢卷物料页面重构表单布局,新增生产耗时计算、合同绑定功能
4.  告警页面优化UI展示,新增详情弹窗和备注处理流程
5.  多处代码格式化与注释优化
2026-06-22 14:42:46 +08:00
b5708ea8f0 fix(wms): 修正销售员姓名查询字段
- 将查询条件从 su.nick_name 改为 mc.sale_name
- 修复材料卷销售员姓名模糊查询功能
2026-06-22 13:43:23 +08:00
1167bc117b feat(WmsMaterialCoilController): 添加合同编号字段到自定义导出
- 在控制器中添加合同编号字段映射
- 更新列配置以包含合同编号显示
2026-06-22 13:32:17 +08:00
5f142050a9 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-22 13:25:40 +08:00
26c834780c feat(order): 订单变更时同步更新钢卷的业务员和合同编号
- 在 CrmOrderServiceImpl 中查询旧订单时同时获取原合同编号
- 当销售员或合同编号变更时同步更新关联钢卷的业务员名称和合同编号
- 在 WmsCoilContractRelMapper 中新增批量更新钢卷业务员和合同编号的方法
- 为钢卷相关实体类添加 contractNo 字段支持
- 修改数据库表结构为 wms_material_coil 表添加 contract_no 字段
- 更新钢卷导出功能以包含合同编号字段
- 实现根据合同ID查询业务员和合同编号信息的功能
2026-06-22 13:25:31 +08:00
0fe9bce02a feat: 新增售后异议管理全流程功能
本次提交完成售后异议管理模块的开发,主要包括以下内容:
1. 新增售后异议主页面、待办页面和意见填写页面
2. 新增5个通用业务组件用于页面渲染
3. 新增4个业务API接口文件
4. 优化流程图表单描述、文件列表样式和钢卷信息展示
5. 完善投诉受理单的日期格式化和实体类继承
2026-06-22 13:06:57 +08:00
2e79a5beb0 feat(crm/contract): 优化产品表格表头展示与导出配置功能
1.  将产品表格表头文本拆分为多行显示,优化视觉排版
2.  调整表格列的grid布局宽度适配新的表头样式
3.  新增产品导出列的自定义编辑与重置功能,支持自定义表头文本
4.  重构导出预览的表头生成逻辑,支持动态渲染自定义列名与适配宽度
2026-06-22 13:06:46 +08:00
119b9105c7 fix(TsComplaintAcceptController): 修改反馈下发接口参数处理逻辑
- 添加了java.util.stream.Collectors导入
- 将deptIds参数从List<Long>类型改为String类型
- 实现字符串转Long列表的转换逻辑
- 使用Arrays.stream和map方法解析逗号分隔的部门ID
2026-06-22 10:45:15 +08:00
4aba91abd9 feat(flow): 修改反馈下发功能支持传入部门参数
- 更新 ITsComplaintAcceptService 接口方法 feedbackDispatch,增加 deptIds 参数
- 修改 TsComplaintAcceptController 控制器,调整接口路径并接收部门ID列表参数
- 实现 TsComplaintAcceptServiceImpl 服务类,移除字典查询逻辑改为使用传入的部门ID列表
- 更新反馈下发业务逻辑,直接使用传入的部门ID创建执行反馈记录
- 移除对 flow_coil_objection 字典类型的依赖
- 调整参数验证逻辑,确保接受ID和部门ID列表均不为空
2026-06-22 10:41:59 +08:00
7ec3f49c73 feat(flow): 添加受理单ID批量查询功能并优化任务关联信息展示
- 在TsComplaintAcceptBo中新增acceptIds字段用于批量查询
- 实现基于受理单ID列表的批量查询条件构建
- 添加工具方法enrichWithAcceptInfo批量填充受理单信息到任务VO
- 为TsComplaintTaskVo和TsPlanExecuteRelVo添加acceptInfo关联字段
- 优化查询逻辑支持实时关联受理单信息展示
2026-06-22 10:12:56 +08:00
1a0a904903 refactor(flow): 优化投诉受理服务中的字典数据查询方式
- 移除对 DictUtils 的依赖
- 引入 ISysDictDataService 接口进行字典数据查询
- 将缓存字典数据改为实时查询数据库
- 统一两个方法中的字典查询逻辑为直接访问 sys_dict_data 表
- 提高字典数据获取的准确性和实时性
2026-06-22 09:28:08 +08:00
de5a82d0a7 refactor(TsComplaintAcceptService): 优化钢卷关联插入逻辑
- 将单条插入改为批量插入以提升性能
- 使用Stream API重构钢卷关联数据构建过程
- 减少了数据库操作次数,提高处理效率
2026-06-21 15:40:25 +08:00
a07ced4b25 feat(flow): 新增投诉受理单关联钢卷功能
- 在TsComplaintAcceptBo中添加coilIds字段用于存储关联的钢卷ID列表
- 新增TsAcceptCoilRel实体类和对应的数据库映射
- 在投诉受理单创建时自动插入钢卷关联记录到ts_accept_coil_rel表
- 实现了批量关联多个钢卷ID的业务逻辑
- 完善了受理单与钢卷之间的多
2026-06-21 15:35:59 +08:00
b939052a88 feat(flow): 添加钢卷关联合同订单信息查询功能
- 引入 WmsCoilContractRelVo 和 WmsCoilContractRelMapper 依赖
- 在 TsAcceptCoilRelServiceImpl 中添加 wmsCoilContractRelMapper 注入
- 修改 enrichWithCoilInfo 方法同时查询钢卷关联的合同/订单信息
- 通过一次 SQL JOIN 查询批量获取钢卷合同关系数据
- 按 coilId 分组合同订单信息并填充到钢卷信息中
- 优化查询性能减少数据库访问次数
2026-06-21 15:11:27 +08:00
c33b27d174 feat(flow): 添加意见下发和反馈下发功能
- 在ITsComplaintAcceptService中新增opinionDispatch和feedbackDispatch方法
- 在TsComplaintAcceptController中添加对应的意见下发和反馈下发接口
- 实现opinionDispatch功能:修改flow_status=2并按字典创建代办任务
- 实现feedbackDispatch功能:修改flow_status=4并按字典创建执行反馈记录
- 调整同步流程状态逻辑,移除重复的状态更新代码
- 新增相关实体类和服务层依赖注入
2026-06-21 14:57:38 +08:00
691c8289dd feat(flow): 添加投诉任务和执行反馈的流程状态同步功能
- 在TsComplaintTaskServiceImpl中新增syncAcceptFlowStatus方法
- 在TsPlanExecuteRelServiceImpl中新增syncAcceptFlowStatus方法
- 添加TsComplaintAcceptMapper依赖注入
- 实现任务状态变更时自动同步受理单流程状态
- 完善部门意见填写和执行反馈的状态判断逻辑
- 添加必要的LambdaUpdateWrapper和相关导入包
2026-06-21 14:46:06 +08:00
ca094574f5 feat(coil): 添加钢卷查询排除已受理功能
- 在 WmsMaterialCoilBo 中新增 excludeAccepted 字段用于控制是否排除已受理钢卷
- 在 WmsMaterialCoilServiceImpl 中实现排除已受理钢卷的查询逻辑
- 防止多个受理单重复绑定同一钢卷的问题
- 通过 NOT EXISTS 子查询优化钢卷查询性能
2026-06-21 14:23:55 +08:00
f068daba0b feat(flow): 添加钢卷信息关联查询功能
- 在pom.xml中添加klp-wms依赖模块
- 引入WmsMaterialCoil和WmsMaterialCoilVo相关类
- 注入WmsMaterialCoilMapper用于钢卷信息查询
- 实现enrichWithCoilInfo方法批量获取钢卷详情
- 优化查询逻辑支持单条和分页查询的钢卷信息填充
- 在TsAcceptCoilRelVo中新增coilInfo字段存储钢卷信息
2026-06-21 14:15:54 +08:00
0c05455ae3 feat: 新增业务员列并调整部分表格列宽,注释操作记录标签页
1. 在CoilSelector相关数据和报表设置列配置中新增业务员字段
2. 调整逻辑库位、实际库区的表格列宽
3. 注释crm合同页的操作记录标签页
2026-06-21 11:45:56 +08:00
274671f309 feat(wms): 新增钢卷合同号自动填充功能
1. 在钢卷合并、分卷、打钢印、计划拆分、退火计划页面添加合同号自动拉取逻辑
2. 优化合同选择组件,补全不存在于列表的已选合同
3. 移除split.vue中冗余的注释代码
2026-06-21 11:32:02 +08:00
b4fba79838 feat(order): 订单销售员变更时同步更新关联钢卷业务员
- 在订单更新逻辑中增加销售员变更检测功能
- 新增数据库方法批量更新关联钢卷的业务员名称
- 实现订单销售员变更时自动同步到相关钢卷记录
- 添加钢卷与合同关联时的业务员同步机制
- 增加修改关联关系时的业务员信息同步处理
- 完善数据一致性保障机制
2026-06-21 10:40:07 +08:00
6910278ba7 feat(wms): 添加业务员相关代码
- 在WmsCoilContractRelMapper中新增selectSalesmanByOrderId方法
- 在WmsCoilContractRelMapper.xml中添加对应的SQL查询语句
- 在WmsMaterialCoilServiceImpl中新增setSaleNameFromContract私有方法
- 在多个钢卷创建场景中调用setSaleNameFromContract方法设置销售员姓名
- 实现了根据合同ID自动获取并设置业务员信息的功能
2026-06-21 10:14:26 +08:00
491eed3dad refactor(ContractSelect): 优化选中合同的加载逻辑
将原有的列表搜索获取选中合同的方式,改为直接调用getOrder接口单个查询,简化代码逻辑并提升查询效率
2026-06-19 13:14:02 +08:00
66838b6c69 feat: 优化合同选择组件与钢卷修正页面功能
1. 重构ContractSelect组件,新增all模式支持远程搜索
2. 修正钢卷修正弹窗布局为两列排版,扩大弹窗宽度
3. 为钢卷修正页面添加合同绑定功能,支持新增/更新合同关联关系
2026-06-19 12:45:07 +08:00
c8c2523fe7 feat(wms): 新增多项功能并优化标签展示逻辑
1. 异常管理页面默认显示继承按钮,新增继承弹窗传参
2. 多标签页优化订货单位展示:移除"有限公司"后缀并自适应字体大小
3. 基础面板新增备注查询条件和表格列展示
4. 流程页面新增节点点击交互和悬停效果
2026-06-19 12:30:18 +08:00
d0afe5eaaf feat(wms/coil): 新增发货单状态筛选视图
1. 在ship.vue页面新增isShipView参数并默认开启
2. 在base面板新增货单状态筛选 radio 组
3. 根据isShipView切换查询逻辑和表格列展示
4. 新增对应统计计数逻辑
2026-06-18 17:00:03 +08:00
7374b810c1 feat(wms/coil/label): 优化多规格标签的订货单位显示适配
1.  修复订货单位截断逻辑,保留完整客户名称
2.  新增根据订货单位长度动态调整字体大小的功能,适配长文本显示
2026-06-18 15:49:24 +08:00
041e5aef0e feat(contract-select): 为合同选择组件添加分页功能并优化搜索逻辑
1.  移除了vis-network依赖包
2.  重构两个合同选择页面的搜索与列表逻辑,移除本地合并合同数据的操作,改为直接使用接口返回数据
3.  为所有合同tab添加分页组件,支持分页查询、搜索重置页码
4.  调整表格高度优化布局,更新搜索触发事件为失焦、回车和清空按钮
5.  新增搜索查询按钮,优化搜索交互体验
2026-06-18 15:39:42 +08:00
6120e87966 feat(wms): 新增仓储售后流程页面,添加beautiful-mermaid依赖
1. 新增wms售后流程可视化页面,支持生产全链路和售后处理两种流程图切换展示
2. 安装beautiful-mermaid依赖并配置到transpileDependencies中
2026-06-18 14:50:51 +08:00
5828dbd133 feat(hrm/meal&employee): 新增员工吃辣偏好字段与就餐统计矩阵
1.  在员工入职/信息页面新增是否吃辣单选表单字段
2.  重构就餐统计模块,替换原有简单统计为吃辣/不吃辣 × 堂食/打包 × 有效/无效的三维交叉统计矩阵
3.  新增员工吃辣偏好映射接口,自动获取员工饮食偏好进行分类统计
2026-06-18 13:50:46 +08:00
ee49fbdcc0 feat: 新增合同配置页面,优化多页面合同关联逻辑
1.  新增crm/contract/selectConfig页面,支持本地配置可选合同列表,区分手动/接口同步来源
2.  优化ContractSelect组件,新增上次选中合同置顶、本地存储选中记录功能
3.  为合卷、分条、退火计划、钢卷编辑页面添加合同必填校验与自动关联逻辑
4.  移除各业务页面冗余的合同关系手动调用代码,统一关联逻辑
2026-06-18 13:49:52 +08:00
7f1a89eb61 feat(furnace-plan): 添加合同ID字段并实现合同关联功能
- 在 WmsFurnacePlanLocationItemBo 中新增 contractId 字段
- 实现合同ID映射关系构建和数据流转
- 移除二维码步骤类型的空值检查条件
- 完成合同信息在退火加工流程中的传递
2026-06-18 13:34:47 +08:00
759bbbed63 feat(wms): 钢卷加工必须绑定合同
- 在 WmsMaterialCoilBo 中新增 contractId 字段
- 添加 IWmsCoilContractRelService 依赖注入
- 实现加工操作必须绑定合同的验证逻辑
- 添加分卷、合卷、单个更新等操作的合同验证
- 实现插入钢卷合同关联记录的功能
- 在各种钢卷操作完成后自动插入合同关联记录
2026-06-18 13:25:16 +08:00
5b0cb314e4 feat(flow): 添加投诉处理流程模块及相关服务接口
- 创建受理单关联钢卷中间表服务接口及实现类
- 添加投诉受理单主服务接口及相应控制器
- 实现各部门投诉代办任务服务功能
- 集成最终方案下发部门及执行反馈服务
- 在员工信息表中新增是否吃辣字段
- 配置klp-flow模块依赖并注册到系统中
2026-06-18 11:19:55 +08:00
2fc4bf4043 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-18 10:39:16 +08:00
2fb5a64124 feat(employee): 添加员工是否吃辣字段支持
- 在 WmsEmployeeInfo 实体类中新增 isSpicyEater 字段
- 在 WmsEmployeeInfoBo 业务对象中添加 isSpicyEater 属性
- 更新 WmsEmployeeInfoMapper.xml 映射文件配置
- 在查询条件中添加 isSpicyEater 过滤逻辑
- 在 WmsEmployeeInfoVo 视图对象中添加 Excel 导出支持
2026-06-18 10:39:00 +08:00
379aa9d44b feat(crm): 优化合同模板管理和订单明细页面功能
1. 合同模板管理:添加选中状态高亮样式,新增当前选中模板状态管理
2. 订单明细页面:
   - 合并搜索框为产品名称/材质统一搜索
   - 重构表格数据结构,拆分合同与产品明细展示
   - 添加批量/单行保存功能,自动计算产品金额字段
   - 优化筛选条件和默认日期范围,调整表格列样式与配置
2026-06-18 10:27:09 +08:00
b4a9a48ae6 refactor(wms/report/split): 统一拆分报表页面模板组件
将所有分条相关报表页面替换为通用ActionTemplate组件,移除冗余的单独模板导入,统一配置报表参数,减少重复代码
2026-06-18 10:27:00 +08:00
41716b3430 feat(wms/coil): 新增钢卷加工链追溯功能并优化成本信息展示
1. 新增钢卷加工链双向追溯API接口getCoilChain
2. 替换原有的递归 lineage 构建逻辑,使用新接口获取完整加工链数据
3. 补充完善工序类型枚举映射,新增修复工序和退火工序
4. 重构加工路径图构建逻辑,使用接口返回的depth字段计算层级
2026-06-18 09:31:32 +08:00
585017873c feat(wms): 添加钢卷加工链追溯功能
- 在IWmsMaterialCoilService中新增queryCoilChain方法实现双向追溯
- 在WmsMaterialCoilController中添加/chain/all/{coilId}接口
- 在WmsMaterialCoilMapper中新增selectByParentCoilIds批量查询方法
- 在Mapper XML中实现FIND_IN_SET匹配逗号分隔的parent_coil_id查询
- 实现完整的双向追溯逻辑:向上追溯祖先向下查找后代支持合卷场景
- 创建CoilChainVo数据传输对象包含追溯结果和节点关系信息
- 实现BFS算法构建完整的加工链父子关系映射和深度计算
2026-06-17 16:49:19 +08:00
605f7b85a1 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-17 15:28:49 +08:00
192a27afbc fix(wms): 修复卷材子记录缺少父级ID关联问题
- 在新增卷材记录时设置parentCoilId字段
- 确保新创建的卷材能够正确关联到原始卷材记录
- 解决了卷材拆分或复制操作后数据关系不完整的问题
2026-06-17 15:28:37 +08:00
768b18c22a feat(cost+wms): 新增生产指标标签功能并优化钢卷成本展示
1. 为生产指标实体、BO、VO新增tags标签字段并完善MyBatis映射
2. 在生产指标查询中添加标签模糊筛选条件
3. 新增生产指标计算结果API接口
4. 优化成本综合页面:支持标签字段的增改查,新增指标结果批量保存逻辑
5. 移除废弃的costDataService文件,重构钢卷详情页成本展示模块,新增加工路径可视化和吨钢成本计算展示
6. 注释并禁用了原有的检验任务相关代码逻辑
2026-06-17 15:09:08 +08:00
3719416cbf fix(cost): 修复报表日期格式化问题
- 修改了报告日期的格式化逻辑,使用 SimpleDateFormat 替代直接字符串拼接
- 确保日期格式统一为 yyyy-MM 格式进行查询匹配
- 避免了可能的日期格式不一致导致的查询错误
2026-06-17 14:40:39 +08:00
791be3e1a5 feat: 新增多类业务功能并优化页面展示
1. 新增钢卷周期对比查询API,增加冷轧卷、花纹板物料类型
2. 优化库存积压统计逻辑,支持成品和原料数据合并计算
3. 新增告警统计功能,实现长度/厚度告警的数量和重量统计
4. 替换岗位管理页面为冷轧厂业务流程泳道图页面
2026-06-17 11:01:47 +08:00
7b7f4b902e feat(cost): 添加生产指标计算结果批量保存功能
- 在CostProdMetricResultBo中新增resultIds和prodMetricResultList字段
- 添加/batch接口支持批量保存生产指标计算结果
- 实现batchSaveWithDelete方法支持先删除再插入操作
- 使用事务注解确保批量操作的数据一致性
- 集成CollUtil工具类处理集合操作
- 完善相关的Service接口定义
2026-06-17 10:11:10 +08:00
c547456108 feat(cost): 添加生产指标计算结果模块
- 创建 CostProdMetricResult 实体类,包含主键、报表ID、指标ID、计算日期、班组、计算值等字段
- 创建 CostProdMetricResultBo 业务对象,用于接收前端参数并进行验证
- 创建 CostProdMetricResultVo 视图对象,用于返回给前端的数据结构
- 实现 CostProdMetricResultController 控制器,提供增删改查和导出功能
- 创建 CostProdMetricResultMapper 数据访问接口,继承 BaseMapperPlus
- 实现 CostProdMetricResultServiceImpl 服务类,处理业务逻辑和数据操作
- 配置 CostProdMetricResultMapper.xml 映射文件,定义结果映射关系
- 添加完整的 CRUD 操作支持,包括分页查询、单条查询、新增、修改、删除和批量导出功能
- 集成 MyBatis-Plus 分页插件和 LambdaQueryWrapper 查询构建器
- 实现数据校验机制和 Excel 导出功能
2026-06-17 09:57:00 +08:00
931fc74ed7 feat(wms): 添加钢卷环比报表功能
- 在 IWmsMaterialCoilService 中新增 queryPeriodComparisonList 方法
- 在 WmsMaterialCoilController 中新增 /listForPeriodComparison 接口
- 在 WmsMaterialCoilMapper 中新增 selectPeriodComparisonList 查询方法
- 修改原 selectPageReportList 为 selectReportList 并调整相关调用
- 新增 WmsMaterialCoilPeriodComparisonVo 数据传输对象
- 添加环比报表专用的 SQL 查询语句,包含实际长度、理论长度、理论厚度字段
2026-06-17 08:21:42 +08:00
e7f1e584eb Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-16 17:02:31 +08:00
b43b44d044 feat(wms): 新增钢卷告警历史批量处理功能
新增批量处理历史告警接口,支持将今天以前的告警标记为指定状态,前端添加对应操作按钮,可一键处理或忽略历史告警
2026-06-16 17:02:25 +08:00
d053dd0319 refactor(domain): 将检验结果值数据类型从BigDecimal改为String
- 修改WmsInspectionDetail实体类中的itemValue字段类型为String
- 修改WmsInspectionDetailBo业务对象中的itemValue字段类型为String
- 修改WmsInspectionDetailVo视图对象中的itemValue字段类型为String
2026-06-16 16:51:33 +08:00
3b1ce45043 feat: 新增钢卷成本信息展示与能耗辅料成本报表页面
1. 在钢卷详情页新增成本信息模块,展示产线类型、投入产出量、报表信息和总成本
2. 新增成本数据服务类,支持按日期和产线获取完整成本明细与计算数据
3. 新增能耗和辅料两类成本报表页面,支持按产线筛选查看报表
4. 优化岗位管理页面,替换vis.js为ECharts实现岗位树图,新增职责弹窗查看功能
5. 优化综合成本页面,隐藏部分反填按钮和操作入口
2026-06-16 16:33:27 +08:00
5473fbf28f feat(wms): 新增岗位管理与岗位职责管理功能
1. 新增依赖包vis-network用于可视化岗位树
2. 新增岗位相关API接口,包含增删改查功能
3. 新增岗位职责相关API接口,包含增删改查功能
4. 新增岗位管理页面,支持岗位树可视化、岗位CRUD以及关联的岗位职责管理
2026-06-16 13:42:12 +08:00
2874f1727a feat(cost): 新增成本综合页面的辅料能耗反填功能
本次提交新增了全量反填、单行反填、单元格反填的批量/单独反填能力,支持辅料和能耗类型的数据反填入库,同时新增了反填进度弹窗、优化了表格列头布局和输入框后缀操作按钮样式,补充了对应的API引入和反填处理器注册逻辑。
2026-06-16 11:52:34 +08:00
a3a4986cb8 feat(wms/report): 新增产线报表页面,支持多维度数据统计与可视化
该页面实现了产线相关的钢卷产出、消耗、品质、异常库位等数据的统计分析,支持按日/周/月维度拆分数据,提供折线图可视化展示与明细表格查询,包含快捷时间范围选择、多条件筛选功能
2026-06-16 11:52:22 +08:00
f525770094 fix(wms/coil): 调整酸洗轧制动作类型区间范围并注释完成待办逻辑
1. 将acidRollingActionType判断区间从200-299修正为200-210
2. 注释掉stepSplit.vue中调用completeAction完成待办的代码逻辑
2026-06-16 11:52:10 +08:00
25beef5517 Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-16 11:41:40 +08:00
e6b1e31bd1 feat(wms/coil): 优化钢卷生命周期追踪的步骤插槽数据传递
1. 给CoilTraceResult的stepBody插槽新增allSteps参数传递标准化后的全量步骤列表
2. 在LifecycleTrace中新增getCreationCoils方法,实现创建步骤钢卷列表的兜底获取逻辑:
   - 优先使用步骤自身的newCoilInfoList
   - 若为空则通过全量步骤匹配获取前序步骤的旧钢卷信息
   - 最后兜底使用当前钢卷信息
3. 修复入库步骤空钢卷判断和列表渲染的逻辑
2026-06-16 11:41:33 +08:00
8c3a3eec28 fix(wms): 钢卷退火绑定的限制
- 添加详细的锁定状态描述映射
- 区分不同锁定状态的具体业务场景
- 提供更精确的错误提示信息
- 增强用户体验和问题定位效率
2026-06-16 09:26:25 +08:00
1510f43aee refactor(WmsMaterialCoilService): 简化待操作记录状态更新逻辑
- 使用新的 completeAction 方法替代手动设置状态和时间
- 移除冗余的状态赋值和时间设置代码
- 通过方法调用统一处理操作完成逻辑
2026-06-15 18:06:34 +08:00
cb8fce435c fix(wms): 修复分卷取消操作中的逻辑错误
- 移除过早删除待操作记录的代码
- 保留母卷独占锁释放功能但暂时注释
- 重新调整代码执行顺序确保业务逻辑正确性
- 修复可能导致数据不一致的操作步骤
2026-06-15 17:49:28 +08:00
7bb68483e6 feat(wms): 添加批量处理和批量忽略功能 2026-06-15 16:22:20 +08:00
696280bd47 feat(wms): 添加调拨单按时间倒序排序功能
- 在调拨单查询中增加按调拨时间倒序排序逻辑
- 确保最新的调拨单记录优先显示
- 提升调拨单列表的数据展示体验
2026-06-15 14:26:37 +08:00
bdf01feacb feat(warning): 添加钢卷告警批量处理功能
- 在 IWmsMaterialWarningService 中添加 batchHandle 方法接口
- 在 WmsMaterialWarningBo 中新增 warningIds 字段用于存储 ID 集合
- 在 WmsMaterialWarningController 中添加 /batchHandle 接口
- 在 WmsMaterialWarningServiceImpl 中实现批量处理逻辑
- 更新 Excel 导出标题中的分隔符为中文顿号
- 批量处理时自动填充处理人、处理时间和处理状态信息
2026-06-15 13:55:36 +08:00
120320c800 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-15 13:33:34 +08:00
3db1651efd feat(wms): 添加岗位和岗位职责管理功能
- 创建岗位实体类 WmsPost 和岗位职责实体类 WmsPostDuty
- 实现岗位和岗位职责的业务对象 BO 和视图对象 VO
- 开发岗位和岗位职责的服务接口及实现类
- 添加岗位和岗位职责的控制器提供 REST API 接口
- 配置 MyBatis Plus 的 Mapper 接口和 XML 映射文件
- 实现岗位和岗位职责的增删改查、分页查询和导出功能
- 添加数据验证、日志记录和防止重复提交功能
2026-06-15 13:33:23 +08:00
9d679954fa fix(wms/coil): 修复钢卷领料和合并相关的逻辑问题
1. 新增根据酸洗动作类型设置锁值的逻辑
2. 修复合并页面钢卷选择器的筛选条件和匹配逻辑
2026-06-15 13:21:54 +08:00
a2844ec54a fix(service): 修复钢卷操作中的空指针异常和逻辑错误
- 在 WmsCoilPendingActionServiceImpl 中添加钢卷存在性检查,避免空指针异常
- 当关联钢卷不存在时抛出运行时异常提示"关联的钢卷不存在"
- 修复 WmsMaterialCoilServiceImpl 中的合卷操作逻辑
- 修改条件判断避免整数缓存导致的比较错误
- 合卷操作已在 mergeCoils 方法中单独处理,此处跳过重复操作
2026-06-15 11:48:12 +08:00
91ddc8602a fix(wms): 优化钢卷锁定状态提示信息
- 添加getLockStatusDesc方法用于获取详细的锁定状态描述
- 实现针对不同锁定状态的状态码映射和中文描述
- 更新异常消息显示具体的锁定操作类型而非笼统提示
- 提升用户对钢卷当前操作状态的认知准确性
2026-06-15 11:35:24 +08:00
22fd3c4a58 refactor(WmsMaterialCoilService): 移除钢卷操作权限验证检查
- 注释掉单个更新方法中的独占状态验证逻辑
- 移除批量更新方法中的权限验证检查代码
- 保留原有的注释文档结构
- 简化方法实现逻辑,跳过操作前的状态验证步骤
2026-06-15 11:26:42 +08:00
ceab5d4be3 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-15 11:09:59 +08:00
bf8b69d193 feat(wms): 添加钢卷锁定机制并优化操作流程
- 在WmsCoilPendingActionBo中新增lockValue字段用于钢卷锁值控制
- 为insertByBo方法添加事务注解确保数据一致性
- 实现钢卷领料时的锁状态校验和上锁逻辑
- 添加unlockCoil方法在操作完成后自动解锁关联钢卷
- 在deleteBatch、completeAction和cancelAction方法中集成自动解锁功能
- 新增getLockStatusDesc方法提供详细的锁状态描述信息
- 优化合卷操作流程,使用completeAction替代手动更新状态
- 在MaterialCoilService中增强独占状态检查,支持多种锁定类型识别
2026-06-15 11:09:45 +08:00
7feaf8021b feat: 新增规格校验功能并优化钢卷号输入处理
1. 新增validSpecification规格校验函数,校验格式为数字.两位小数*数字的钢卷规格
2. 为多个页面的钢卷号输入框添加trim修饰符自动去除首尾空格
3. 在API层统一对钢卷号字段做trim预处理
4. 为原料和产品表单添加规格必填校验和格式校验
5. 新增钢卷信息修正页面,添加生产耗时自动计算功能
6. 优化部分页面的UI和代码冗余
2026-06-15 10:56:28 +08:00
6328b4ac7a Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-15 10:04:37 +08:00
183e6d08d8 feat(wms,cost): 新增多项功能并修复部分问题
1. 退火计划页面新增exclusiveStatus状态字段
2. 钢卷分步加工新增预览标签功能
3. 修复实际库位空值判断问题
4. 成本综合页面新增价格管理功能,支持配置指标单价
2026-06-15 10:04:35 +08:00
a037c56122 feat(wms): 完善退火计划钢卷绑定和解绑逻辑
- 添加钢卷映射缓存以提高查询效率
- 增加钢卷排他状态检查防止并发操作冲突
- 实现绑定计划时自动释放实际库区锁定功能
- 优化解绑操作增加数据验证和异常处理
- 修复解绑后钢卷状态更新确保一致性
- 移除冗余的批量释放库区操作提升性能
2026-06-14 12:19:48 +08:00
857daa24af feat(wms): 添加钢卷数据校验逻辑
- 实现钢卷存在性校验,确保钢卷未被删除
- 添加钢卷类型校验,只允许现存钢卷(dataType=1)参与加工
- 阻止历史钢卷被用于退火操作
- 提供详细的错误提示信息
2026-06-14 11:31:10 +08:00
0968dcaded Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-13 16:16:38 +08:00
cced2ff4aa feat(cost): 添加单价字段和使用单价标识功能
- 在CostProdMetric实体类中添加usePrice字段,用于标识是否使用单价
- 更新CostProdMetricBo、CostProdMetricVo数据传输对象,增加单价相关属性
- 修改CostProdMetricMapper.xml映射文件,添加usePrice字段映射配置
- 扩展CostProdMetricServiceImpl查询逻辑,支持按是否使用单价进行筛选
- 更新前端metric.vue页面,添加单价输入框和是否使用单价下拉选择组件
- 实现表格中单价列的显示和编辑功能,并增加条件查询支持
2026-06-13 16:16:30 +08:00
f197462b11 refactor(mes/qc): 重构质检模块接口与页面,迁移is模块业务到qc模块
1.  新增qc模块下检验主、检验明细、拉伸试验相关接口文件
2.  删除原is模块下的检验任务、样品库存、检验委托单接口与页面文件
3.  调整待办页面的检验任务标签页引用路径
4.  优化质检模板页面的检查项相关交互逻辑
2026-06-13 15:51:15 +08:00
9559e5810e refactor(domain): 重构拉伸检验细节实体的弯曲试验
- 将 bendTest90 字段重命名为 bendTest,统一弯曲试验结果字段
- 将 bendTest180 字段重命名为 bendTestReverse,明确表示反向弯曲试验
- 更新数据库映射文件中的字段映射关系
- 修改服务层查询条件中对应的字段引用
- 更新 Excel 导出注解中的字段描述和值映射
2026-06-13 14:34:24 +08:00
92ad229104 Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-13 13:30:56 +08:00
ee1cb31321 feat(mes/eqp): 新增设备监控模拟页面
该页面实现了设备状态统计看板、多条件筛选搜索、自动刷新、设备卡片展示、详情弹窗查看功能,使用mock数据模拟真实设备运行状态和参数变化
2026-06-13 13:30:52 +08:00
f0de25a3a2 feat(inspection): 添加检验模块日期范围筛选功能
- 在WmsInspectionMainBo中增加inspectionDateStart和inspectionDateEnd字段用于日期范围筛选
- 在WmsInspectionMainServiceImpl中实现日期范围查询逻辑
- 在WmsInspectionTensileDetailBo中增加productionDateStart、productionDateEnd、testDateStart和testDateEnd字段
- 在WmsInspectionTensileDetailServiceImpl中实现生产日期和试验日期范围查询逻辑
- 添加DateTimeFormat注解支持日期格式化处理
2026-06-13 13:08:11 +08:00
0d40774194 feat(wms): 添加检验管理模块功能
- 新增检验项目明细相关实体类、业务对象、视图对象及服务接口
- 实现检验项目明细的增删改查、分页查询及数据校验功能
- 新增检验主记录相关实体类、业务对象、视图对象及服务接口
- 实现检验主记录的增删改查、分页查询及数据校验功能
- 新增金属材料室温拉伸试验相关实体类、业务对象、视图对象及服务接口
- 实现拉伸试验记录的增删改查、分页查询及数据校验功能
- 配置MyBatis映射文件及Excel导出功能
- 添加相应的控制器及参数验证规则
2026-06-13 13:02:43 +08:00
948e62daae fix(wms/report/comparison): 修复库存对比报表的查询参数错误
将原有的actionId、actionIds查询参数修正为coilId、coilIds,匹配接口实际需要的入参字段
2026-06-13 11:23:36 +08:00
48d12fe056 Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-13 11:15:42 +08:00
6edc6e1100 feat(wms-report): 新增对比报表页面和尺寸异常统计功能
1. 新增comparison.vue对比报表页面,支持基期/当期数据对比、快速环比查询、明细表格查看和列配置
2. 在action.vue报表中添加尺寸异常统计模块,统计长度和厚度异常的卷数、总重及占比
3. 新增告警阈值配置获取逻辑,从系统配置中读取长度和厚度异常阈值
2026-06-13 11:15:38 +08:00
12ea9b0b83 refactor(wms/coil/label): 为热卷号添加动态字体大小适配
移除了硬编码的字体样式,根据热卷号长度动态调整字号,避免长文本溢出标签
2026-06-13 11:14:25 +08:00
c149216ebd refactor: 多页面UI优化、接口清理与文案调整
1. 移除质检模板页面未使用的getCheckItem接口导入
2. 给成本综合页面表格添加固定高度适配布局
3. 更新物料告警页面的表格列文案:理论值→推论值、实测值→实际值、实际偏差值→实际偏差
4. 重构重定向菜单页面的样式,优化布局与视觉效果
2026-06-13 11:14:14 +08:00
325a93fd84 refactor: 将“理论长度/厚度”统一改为“推论长度/厚度”
修改了CoilSelector组件、CoilInfo组件和报表列设置中的相关文案,将统一术语表述为“推论”,替代原有的“理论”表述。
2026-06-13 11:13:49 +08:00
f0656b57d4 fix(wms): 解决材料厚度预警中的精度比较问题
- 统一将理论厚度和规格厚度四舍五入到3位小数后再进行比较
- 避免因高精度尾数导致的比较结果与存储值不一致问题
- 对阈值也进行相同的精度处理确保比较逻辑正确
- 修复偏差值计算中重复精度转换的问题
- 优化偏差率计算中的除法精度控制
2026-06-13 10:22:22 +08:00
9c7d2dca65 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-12 16:00:45 +08:00
36b1e3da82 fix(warning): 解决退火工序告警处理问题
- 退火工序没有actionId时不创建代操作记录,直接设置actionType=600
- 当actionId为空时使用bo中的actionType作为兜底方案
- 确保退火工序的告警能够正确关联到对应的操作类型
2026-06-12 16:00:34 +08:00
c83eb79d25 fix(wms/coil/label): 修正标签页生产日期字段的时间来源
将多个标签渲染组件中的生产日期从updateTime改为createTime,统一展示正确的创建时间
2026-06-12 15:30:27 +08:00
e0cf4b46b6 feat(mes/qc): 增加物理性质和化学成分同时导入
新增了通用的综合导入组件,支持同时导入化学成分和物理性能数据,并在理化证书页面添加了对应的综合导入按钮和逻辑,实现一站式批量导入两种类型的质检数据。
2026-06-12 13:43:17 +08:00
00972112d2 feat: 多模块新增功能与优化体验
1. 隐藏客户录入页的客户编码字段
2. 为WmsMaterialWarningBo添加日期格式化注解
3. 合同产品选择时自动匹配默认材质
4. 物料告警页新增今日筛选、行样式区分与偏差率展示优化
5. 合同页新增快速新增客户功能
2026-06-12 13:31:58 +08:00
2559dc27cb feat(crm): 添加客户编码自动生成功能
- 新增 selectMaxCustomerCode 方法查询最大客户编码
- 实现客户编码自动生成逻辑,支持纯数字和带前缀格式
- 添加正则表达式解析编码规则并递增末尾数字
- 集成编码生成功能到客户插入业务流程中
2026-06-12 13:17:33 +08:00
7a0d7e1b12 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-12 13:03:34 +08:00
1cd2cf2b9a feat(wms): 添加物料预警创建时间范围查询功能
- 在WmsMaterialWarningBo中新增createStartTime和createEndTime字段
- 为新增字段添加JSON格式化注解和文档注释
- 在WmsMaterialWarningServiceImpl中实现时间范围查询逻辑
- 使用ge和le条件进行创建时间范围过滤
- 保持按创建时间倒序排列的排序规则
2026-06-12 13:03:25 +08:00
98116fa042 refactor: 多页面UI优化与功能完善
1. 优化合同页面默认备注内容
2. 修复分卷编辑接口参数缺失问题
3. 新增分卷、合卷、加工菜单路由
4. 重构导航栏默认显示逻辑
5. 升级重定向菜单页面样式与布局
6. 优化告警页面查询与展示字段
7. 重构全局搜索组件为弹窗模式
8. 优化报表页面代码格式与接口参数
2026-06-12 11:25:15 +08:00
d3c6790603 refactor(WmsMaterialWarningVo): 继承BaseEntity并移除钢卷信息的JSON忽略注解
- 继承com.klp.common.core.domain.BaseEntity类
- 移除coilVo字段的@JsonIgnore注解
- 更新类结构以支持基础实体功能
2026-06-11 17:23:48 +08:00
c1e3fa5141 fix(wms): 修复钢卷警告检查逻辑
- 注释掉新增钢卷时的长度/厚度偏差检查
- 添加actionId为空判断条件避免警告插入异常
- 优化更新钢卷时的警告检查逻辑
2026-06-11 16:49:15 +08:00
f319308196 refactor(domain): 移除WmsCoilAbnormalExportVo中的废弃字段
- 注释掉parentAbnormalId字段以优化数据结构
- 移除sourceSystem字段减少不必要的数据传输
- 删除processSource字段简化对象属性
- 保留plateSurface字段用于表列宽度设置
- 为后续代码清理和重构做准备
2026-06-11 16:25:06 +08:00
185745b7da Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-06-11 15:31:26 +08:00
7440706e2e style(sidebar): 优化侧边菜单样式与标识逻辑
1.  移除原有二级菜单叶子节点的小圆点样式
2.  新增子菜单标识图标组件,为有子级的菜单添加折叠箭头标识
3.  调整菜单标题渲染逻辑,统一标题样式处理
4.  修复菜单容器的定位样式问题
2026-06-11 15:31:23 +08:00
0adb29139e 修复厚度偏差曲线 2026-06-11 15:24:46 +08:00
2148a068f8 修复厚度偏差曲线 2026-06-11 15:10:56 +08:00
e1bb9e5431 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2026-06-11 15:02:08 +08:00
8b2039f06a 修复厚度偏差曲线 2026-06-11 14:59:31 +08:00
287 changed files with 23408 additions and 3114 deletions

View File

@@ -129,6 +129,10 @@
<artifactId>klp-cost</artifactId>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-flow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

View File

@@ -0,0 +1,109 @@
package com.klp.cost.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.cost.domain.vo.CostProdMetricResultVo;
import com.klp.cost.domain.bo.CostProdMetricResultBo;
import com.klp.cost.service.ICostProdMetricResultService;
import com.klp.common.core.page.TableDataInfo;
/**
* 生产指标计算结果
*
* @author klp
* @date 2026-06-17
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cost/prodMetricResult")
public class CostProdMetricResultController extends BaseController {
private final ICostProdMetricResultService iCostProdMetricResultService;
/**
* 查询生产指标计算结果列表
*/
@GetMapping("/list")
public TableDataInfo<CostProdMetricResultVo> list(CostProdMetricResultBo bo, PageQuery pageQuery) {
return iCostProdMetricResultService.queryPageList(bo, pageQuery);
}
/**
* 导出生产指标计算结果列表
*/
@Log(title = "生产指标计算结果", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CostProdMetricResultBo bo, HttpServletResponse response) {
List<CostProdMetricResultVo> list = iCostProdMetricResultService.queryList(bo);
ExcelUtil.exportExcel(list, "生产指标计算结果", CostProdMetricResultVo.class, response);
}
/**
* 获取生产指标计算结果详细信息
*
* @param resultId 主键
*/
@GetMapping("/{resultId}")
public R<CostProdMetricResultVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long resultId) {
return R.ok(iCostProdMetricResultService.queryById(resultId));
}
/**
* 新增生产指标计算结果
*/
@Log(title = "生产指标计算结果", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CostProdMetricResultBo bo) {
return toAjax(iCostProdMetricResultService.insertByBo(bo));
}
/**
* 批量保存生产指标计算结果(先删除再插入)
*/
@Log(title = "生产指标计算结果", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/batch")
public R<Void> batchSave(@RequestBody CostProdMetricResultBo bo) {
return toAjax(iCostProdMetricResultService.batchSaveWithDelete(bo));
}
/**
* 修改生产指标计算结果
*/
@Log(title = "生产指标计算结果", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CostProdMetricResultBo bo) {
return toAjax(iCostProdMetricResultService.updateByBo(bo));
}
/**
* 删除生产指标计算结果
*
* @param resultIds 主键串
*/
@Log(title = "生产指标计算结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{resultIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] resultIds) {
return toAjax(iCostProdMetricResultService.deleteWithValidByIds(Arrays.asList(resultIds), true));
}
}

View File

@@ -42,13 +42,21 @@ public class CostProdMetric extends BaseEntity {
*/
private String metricFormula;
/**
* 指标计算结果值
* 单价
*/
private BigDecimal metricValue;
/**
* 是否使用单价 0=否 1=是
*/
private Integer usePrice;
/**
* 备注
*/
private String remark;
/**
* 标签
*/
private String tags;
/**
* 删除标识 0=正常 2=删除
*/

View File

@@ -0,0 +1,60 @@
package com.klp.cost.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;
/**
* 生产指标计算结果对象 cost_prod_metric_result
*
* @author klp
* @date 2026-06-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cost_prod_metric_result")
public class CostProdMetricResult extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "result_id")
private Long resultId;
/**
* 报表ID关联生产日报
*/
private Long reportId;
/**
* 指标ID关联cost_prod_metric
*/
private Long metricId;
/**
* 计算日期
*/
private Date metricDate;
/**
* 班组
*/
private String teamGroup;
/**
* 计算值
*/
private BigDecimal calcValue;
/**
* 标签
*/
private String tags;
/**
* 删除标识 0=正常 2=删除
*/
@TableLogic
private Long delFlag;
}

View File

@@ -44,14 +44,23 @@ public class CostProdMetricBo extends BaseEntity {
private String metricFormula;
/**
* 指标计算结果值
* 单价
*/
private BigDecimal metricValue;
/**
* 是否使用单价 0=否 1=是
*/
private Integer usePrice;
/**
* 备注
*/
private String remark;
/**
* 标签
*/
private String tags;
}

View File

@@ -0,0 +1,72 @@
package com.klp.cost.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 java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 生产指标计算结果业务对象 cost_prod_metric_result
*
* @author klp
* @date 2026-06-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CostProdMetricResultBo extends BaseEntity {
/**
* 主键ID
*/
private Long resultId;
/**
* 报表ID关联生产日报
*/
private Long reportId;
/**
* 指标ID关联cost_prod_metric
*/
private Long metricId;
/**
* 计算日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date metricDate;
/**
* 班组
*/
private String teamGroup;
/**
* 计算值
*/
private BigDecimal calcValue;
/**
* 标签
*/
private String tags;
/**
* 要删除的主键ID集合
*/
private List<Long> resultIds;
/**
* 要批量插入的数据集合
*/
private List<CostProdMetricResultBo> prodMetricResultList;
}

View File

@@ -0,0 +1,70 @@
package com.klp.cost.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;
/**
* 生产指标计算结果视图对象 cost_prod_metric_result
*
* @author klp
* @date 2026-06-17
*/
@Data
@ExcelIgnoreUnannotated
public class CostProdMetricResultVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long resultId;
/**
* 报表ID关联生产日报
*/
@ExcelProperty(value = "报表ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联生产日报")
private Long reportId;
/**
* 指标ID关联cost_prod_metric
*/
@ExcelProperty(value = "指标ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联cost_prod_metric")
private Long metricId;
/**
* 计算日期
*/
@ExcelProperty(value = "计算日期")
private Date metricDate;
/**
* 班组
*/
@ExcelProperty(value = "班组")
private String teamGroup;
/**
* 计算值
*/
@ExcelProperty(value = "计算值")
private BigDecimal calcValue;
/**
* 标签
*/
@ExcelProperty(value = "标签")
private String tags;
}

View File

@@ -52,16 +52,27 @@ public class CostProdMetricVo {
private String metricFormula;
/**
* 指标计算结果值
* 单价
*/
@ExcelProperty(value = "指标计算结果值")
@ExcelProperty(value = "单价")
private BigDecimal metricValue;
/**
* 是否使用单价 0=否 1=是
*/
@ExcelProperty(value = "是否使用单价")
private Integer usePrice;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 标签
*/
@ExcelProperty(value = "标签")
private String tags;
}

View File

@@ -0,0 +1,15 @@
package com.klp.cost.mapper;
import com.klp.cost.domain.CostProdMetricResult;
import com.klp.cost.domain.vo.CostProdMetricResultVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 生产指标计算结果Mapper接口
*
* @author klp
* @date 2026-06-17
*/
public interface CostProdMetricResultMapper extends BaseMapperPlus<CostProdMetricResultMapper, CostProdMetricResult, CostProdMetricResultVo> {
}

View File

@@ -0,0 +1,54 @@
package com.klp.cost.service;
import com.klp.cost.domain.CostProdMetricResult;
import com.klp.cost.domain.vo.CostProdMetricResultVo;
import com.klp.cost.domain.bo.CostProdMetricResultBo;
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-06-17
*/
public interface ICostProdMetricResultService {
/**
* 查询生产指标计算结果
*/
CostProdMetricResultVo queryById(Long resultId);
/**
* 查询生产指标计算结果列表
*/
TableDataInfo<CostProdMetricResultVo> queryPageList(CostProdMetricResultBo bo, PageQuery pageQuery);
/**
* 查询生产指标计算结果列表
*/
List<CostProdMetricResultVo> queryList(CostProdMetricResultBo bo);
/**
* 新增生产指标计算结果
*/
Boolean insertByBo(CostProdMetricResultBo bo);
/**
* 修改生产指标计算结果
*/
Boolean updateByBo(CostProdMetricResultBo bo);
/**
* 校验并批量删除生产指标计算结果信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 批量保存生产指标计算结果(先删除再插入)
*/
Boolean batchSaveWithDelete(CostProdMetricResultBo bo);
}

View File

@@ -0,0 +1,135 @@
package com.klp.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
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 org.springframework.transaction.annotation.Transactional;
import com.klp.cost.domain.bo.CostProdMetricResultBo;
import com.klp.cost.domain.vo.CostProdMetricResultVo;
import com.klp.cost.domain.CostProdMetricResult;
import com.klp.cost.mapper.CostProdMetricResultMapper;
import com.klp.cost.service.ICostProdMetricResultService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* 生产指标计算结果Service业务层处理
*
* @author klp
* @date 2026-06-17
*/
@RequiredArgsConstructor
@Service
public class CostProdMetricResultServiceImpl implements ICostProdMetricResultService {
private final CostProdMetricResultMapper baseMapper;
/**
* 查询生产指标计算结果
*/
@Override
public CostProdMetricResultVo queryById(Long resultId){
return baseMapper.selectVoById(resultId);
}
/**
* 查询生产指标计算结果列表
*/
@Override
public TableDataInfo<CostProdMetricResultVo> queryPageList(CostProdMetricResultBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CostProdMetricResult> lqw = buildQueryWrapper(bo);
Page<CostProdMetricResultVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询生产指标计算结果列表
*/
@Override
public List<CostProdMetricResultVo> queryList(CostProdMetricResultBo bo) {
LambdaQueryWrapper<CostProdMetricResult> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CostProdMetricResult> buildQueryWrapper(CostProdMetricResultBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostProdMetricResult> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getReportId() != null, CostProdMetricResult::getReportId, bo.getReportId());
lqw.eq(bo.getMetricId() != null, CostProdMetricResult::getMetricId, bo.getMetricId());
lqw.eq(bo.getMetricDate() != null, CostProdMetricResult::getMetricDate, bo.getMetricDate());
lqw.eq(StringUtils.isNotBlank(bo.getTeamGroup()), CostProdMetricResult::getTeamGroup, bo.getTeamGroup());
lqw.eq(bo.getCalcValue() != null, CostProdMetricResult::getCalcValue, bo.getCalcValue());
lqw.eq(StringUtils.isNotBlank(bo.getTags()), CostProdMetricResult::getTags, bo.getTags());
return lqw;
}
/**
* 新增生产指标计算结果
*/
@Override
public Boolean insertByBo(CostProdMetricResultBo bo) {
CostProdMetricResult add = BeanUtil.toBean(bo, CostProdMetricResult.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setResultId(add.getResultId());
}
return flag;
}
/**
* 修改生产指标计算结果
*/
@Override
public Boolean updateByBo(CostProdMetricResultBo bo) {
CostProdMetricResult update = BeanUtil.toBean(bo, CostProdMetricResult.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CostProdMetricResult entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除生产指标计算结果
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 批量保存(先删除再插入)
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean batchSaveWithDelete(CostProdMetricResultBo bo) {
if (CollUtil.isNotEmpty(bo.getProdMetricResultList())) {
if (CollUtil.isNotEmpty(bo.getResultIds())) {
baseMapper.deleteBatchIds(bo.getResultIds());
}
List<CostProdMetricResult> list = bo.getProdMetricResultList().stream()
.map(item -> BeanUtil.toBean(item, CostProdMetricResult.class))
.collect(Collectors.toList());
return baseMapper.insertBatch(list);
}
return false;
}
}

View File

@@ -66,6 +66,8 @@ public class CostProdMetricServiceImpl implements ICostProdMetricService {
lqw.like(StringUtils.isNotBlank(bo.getMetricName()), CostProdMetric::getMetricName, bo.getMetricName());
lqw.eq(StringUtils.isNotBlank(bo.getMetricFormula()), CostProdMetric::getMetricFormula, bo.getMetricFormula());
lqw.eq(bo.getMetricValue() != null, CostProdMetric::getMetricValue, bo.getMetricValue());
lqw.eq(bo.getUsePrice() != null, CostProdMetric::getUsePrice, bo.getUsePrice());
lqw.like(StringUtils.isNotBlank(bo.getTags()), CostProdMetric::getTags, bo.getTags());
return lqw;
}

View File

@@ -71,7 +71,10 @@ public class CostProdReportServiceImpl implements ICostProdReportService {
lqw.eq(StringUtils.isNotBlank(bo.getLineType()), CostProdReport::getLineType, bo.getLineType());
lqw.eq(bo.getInputWeight() != null, CostProdReport::getInputWeight, bo.getInputWeight());
lqw.eq(bo.getOutputWeight() != null, CostProdReport::getOutputWeight, bo.getOutputWeight());
lqw.apply(bo.getReportDate() != null, "DATE_FORMAT(report_date, '%Y-%m') = {0}", bo.getReportDate());
if (bo.getReportDate() != null) {
String monthStr = new java.text.SimpleDateFormat("yyyy-MM").format(bo.getReportDate());
lqw.apply("DATE_FORMAT(report_date, '%Y-%m') = {0}", monthStr);
}
return lqw;
}

View File

@@ -11,7 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="metricName" column="metric_name"/>
<result property="metricFormula" column="metric_formula"/>
<result property="metricValue" column="metric_value"/>
<result property="usePrice" column="use_price"/>
<result property="remark" column="remark"/>
<result property="tags" column="tags"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostProdMetricResultMapper">
<resultMap type="com.klp.cost.domain.CostProdMetricResult" id="CostProdMetricResultResult">
<result property="resultId" column="result_id"/>
<result property="reportId" column="report_id"/>
<result property="metricId" column="metric_id"/>
<result property="metricDate" column="metric_date"/>
<result property="teamGroup" column="team_group"/>
<result property="calcValue" column="calc_value"/>
<result property="tags" column="tags"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>

View File

@@ -12,4 +12,9 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface CrmCustomerMapper extends BaseMapperPlus<CrmCustomerMapper, CrmCustomer, CrmCustomerVo> {
/**
* 查询当前最大的customer_code用于自动生成新编码
*/
String selectMaxCustomerCode();
}

View File

@@ -91,6 +91,25 @@ public class CrmCustomerServiceImpl implements ICrmCustomerService {
@Override
public Boolean insertByBo(CrmCustomerBo bo) {
CrmCustomer add = BeanUtil.toBean(bo, CrmCustomer.class);
// 自动生成customer_code查询最大编码并加1
if (StringUtils.isBlank(add.getCustomerCode())) {
String maxCode = baseMapper.selectMaxCustomerCode();
if (StringUtils.isBlank(maxCode)) {
add.setCustomerCode("00001");
} else {
// 提取末尾数字后缀并递增,支持纯数字("00001")和带前缀("KH00001")两种格式
java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("^(.*?)(\\d+)$");
java.util.regex.Matcher matcher = pattern.matcher(maxCode);
if (matcher.matches()) {
String prefix = matcher.group(1);
String numStr = matcher.group(2);
long num = Long.parseLong(numStr) + 1;
add.setCustomerCode(prefix + String.format("%0" + numStr.length() + "d", num));
} else {
add.setCustomerCode(maxCode + "1");
}
}
}
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

View File

@@ -285,9 +285,37 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
*/
@Override
public Boolean updateByBo(CrmOrderBo bo) {
// 查询旧订单获取原销售员和原合同编号,用于判断是否需要同步钢卷
CrmOrder oldOrder = null;
String oldSalesman = null;
String oldContractCode = null;
if (bo.getOrderId() != null) {
oldOrder = baseMapper.selectById(bo.getOrderId());
if (oldOrder != null) {
oldSalesman = oldOrder.getSalesman();
oldContractCode = oldOrder.getContractCode();
}
}
CrmOrder update = BeanUtil.toBean(bo, CrmOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
boolean result = baseMapper.updateById(update) > 0;
// 如果销售员或合同编号变更,同步更新所有关联钢卷
if (result && oldOrder != null) {
String newSalesman = update.getSalesman();
String newContractCode = update.getContractCode();
boolean salesmanChanged = !Objects.equals(oldSalesman, newSalesman);
boolean contractCodeChanged = !Objects.equals(oldContractCode, newContractCode);
if (salesmanChanged || contractCodeChanged) {
coilContractRelMapper.updateCoilSaleNameByOrderId(
bo.getOrderId(),
StringUtils.isNotBlank(newSalesman) ? newSalesman : oldSalesman,
StringUtils.isNotBlank(newContractCode) ? newContractCode : oldContractCode);
}
}
return result;
}
/**

View File

@@ -23,5 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag"/>
</resultMap>
<select id="selectMaxCustomerCode" resultType="String">
SELECT customer_code FROM crm_customer WHERE del_flag = 0 ORDER BY LENGTH(customer_code) DESC, customer_code DESC LIMIT 1
</select>
</mapper>

23
klp-flow/pom.xml Normal file
View File

@@ -0,0 +1,23 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.klp</groupId>
<artifactId>klp-oa</artifactId>
<version>0.8.3</version>
</parent>
<artifactId>klp-flow</artifactId>
<name>klp-flow</name>
<description>流程管理模块</description>
<dependencies>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-common</artifactId>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-wms</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.InvCountDiscrepancyVo;
import com.klp.flow.domain.bo.InvCountDiscrepancyBo;
import com.klp.flow.service.IInvCountDiscrepancyService;
import com.klp.common.core.page.TableDataInfo;
/**
* 盘库差异记录
*
* @author klp
* @date 2026-06-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/countDiscrepancy")
public class InvCountDiscrepancyController extends BaseController {
private final IInvCountDiscrepancyService iInvCountDiscrepancyService;
/**
* 查询盘库差异记录列表
*/
@GetMapping("/list")
public TableDataInfo<InvCountDiscrepancyVo> list(InvCountDiscrepancyBo bo, PageQuery pageQuery) {
return iInvCountDiscrepancyService.queryPageList(bo, pageQuery);
}
/**
* 导出盘库差异记录列表
*/
@Log(title = "盘库差异记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(InvCountDiscrepancyBo bo, HttpServletResponse response) {
List<InvCountDiscrepancyVo> list = iInvCountDiscrepancyService.queryList(bo);
ExcelUtil.exportExcel(list, "盘库差异记录", InvCountDiscrepancyVo.class, response);
}
/**
* 获取盘库差异记录详细信息
*
* @param discrepancyId 主键
*/
@GetMapping("/{discrepancyId}")
public R<InvCountDiscrepancyVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long discrepancyId) {
return R.ok(iInvCountDiscrepancyService.queryById(discrepancyId));
}
/**
* 新增盘库差异记录
*/
@Log(title = "盘库差异记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountDiscrepancyBo bo) {
return toAjax(iInvCountDiscrepancyService.insertByBo(bo));
}
/**
* 修改盘库差异记录
*/
@Log(title = "盘库差异记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountDiscrepancyBo bo) {
return toAjax(iInvCountDiscrepancyService.updateByBo(bo));
}
/**
* 删除盘库差异记录
*
* @param discrepancyIds 主键串
*/
@Log(title = "盘库差异记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{discrepancyIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] discrepancyIds) {
return toAjax(iInvCountDiscrepancyService.deleteWithValidByIds(Arrays.asList(discrepancyIds), true));
}
}

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.InvCountPlanVo;
import com.klp.flow.domain.bo.InvCountPlanBo;
import com.klp.flow.service.IInvCountPlanService;
import com.klp.common.core.page.TableDataInfo;
/**
* 盘库计划主
*
* @author klp
* @date 2026-06-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/countPlan")
public class InvCountPlanController extends BaseController {
private final IInvCountPlanService iInvCountPlanService;
/**
* 查询盘库计划主列表
*/
@GetMapping("/list")
public TableDataInfo<InvCountPlanVo> list(InvCountPlanBo bo, PageQuery pageQuery) {
return iInvCountPlanService.queryPageList(bo, pageQuery);
}
/**
* 导出盘库计划主列表
*/
@Log(title = "盘库计划主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(InvCountPlanBo bo, HttpServletResponse response) {
List<InvCountPlanVo> list = iInvCountPlanService.queryList(bo);
ExcelUtil.exportExcel(list, "盘库计划主", InvCountPlanVo.class, response);
}
/**
* 获取盘库计划主详细信息
*
* @param planId 主键
*/
@GetMapping("/{planId}")
public R<InvCountPlanVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long planId) {
return R.ok(iInvCountPlanService.queryById(planId));
}
/**
* 新增盘库计划主
*/
@Log(title = "盘库计划主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountPlanBo bo) {
return toAjax(iInvCountPlanService.insertByBo(bo));
}
/**
* 修改盘库计划主
*/
@Log(title = "盘库计划主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountPlanBo bo) {
return toAjax(iInvCountPlanService.updateByBo(bo));
}
/**
* 删除盘库计划主
*
* @param planIds 主键串
*/
@Log(title = "盘库计划主", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] planIds) {
return toAjax(iInvCountPlanService.deleteWithValidByIds(Arrays.asList(planIds), true));
}
}

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.InvCountPlanWarehouseVo;
import com.klp.flow.domain.bo.InvCountPlanWarehouseBo;
import com.klp.flow.service.IInvCountPlanWarehouseService;
import com.klp.common.core.page.TableDataInfo;
/**
* 盘库计划-库区关联
*
* @author klp
* @date 2026-06-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/countPlanWarehouse")
public class InvCountPlanWarehouseController extends BaseController {
private final IInvCountPlanWarehouseService iInvCountPlanWarehouseService;
/**
* 查询盘库计划-库区关联列表
*/
@GetMapping("/list")
public TableDataInfo<InvCountPlanWarehouseVo> list(InvCountPlanWarehouseBo bo, PageQuery pageQuery) {
return iInvCountPlanWarehouseService.queryPageList(bo, pageQuery);
}
/**
* 导出盘库计划-库区关联列表
*/
@Log(title = "盘库计划-库区关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(InvCountPlanWarehouseBo bo, HttpServletResponse response) {
List<InvCountPlanWarehouseVo> list = iInvCountPlanWarehouseService.queryList(bo);
ExcelUtil.exportExcel(list, "盘库计划-库区关联", InvCountPlanWarehouseVo.class, response);
}
/**
* 获取盘库计划-库区关联详细信息
*
* @param relId 主键
*/
@GetMapping("/{relId}")
public R<InvCountPlanWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long relId) {
return R.ok(iInvCountPlanWarehouseService.queryById(relId));
}
/**
* 新增盘库计划-库区关联
*/
@Log(title = "盘库计划-库区关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountPlanWarehouseBo bo) {
return toAjax(iInvCountPlanWarehouseService.insertByBo(bo));
}
/**
* 修改盘库计划-库区关联
*/
@Log(title = "盘库计划-库区关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountPlanWarehouseBo bo) {
return toAjax(iInvCountPlanWarehouseService.updateByBo(bo));
}
/**
* 删除盘库计划-库区关联
*
* @param relIds 主键串
*/
@Log(title = "盘库计划-库区关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{relIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] relIds) {
return toAjax(iInvCountPlanWarehouseService.deleteWithValidByIds(Arrays.asList(relIds), true));
}
}

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.TsAcceptCoilRelVo;
import com.klp.flow.domain.bo.TsAcceptCoilRelBo;
import com.klp.flow.service.ITsAcceptCoilRelService;
import com.klp.common.core.page.TableDataInfo;
/**
* 受理单关联钢卷中间
*
* @author klp
* @date 2026-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/acceptCoilRel")
public class TsAcceptCoilRelController extends BaseController {
private final ITsAcceptCoilRelService iTsAcceptCoilRelService;
/**
* 查询受理单关联钢卷中间列表
*/
@GetMapping("/list")
public TableDataInfo<TsAcceptCoilRelVo> list(TsAcceptCoilRelBo bo, PageQuery pageQuery) {
return iTsAcceptCoilRelService.queryPageList(bo, pageQuery);
}
/**
* 导出受理单关联钢卷中间列表
*/
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TsAcceptCoilRelBo bo, HttpServletResponse response) {
List<TsAcceptCoilRelVo> list = iTsAcceptCoilRelService.queryList(bo);
ExcelUtil.exportExcel(list, "受理单关联钢卷中间", TsAcceptCoilRelVo.class, response);
}
/**
* 获取受理单关联钢卷中间详细信息
*
* @param relId 主键
*/
@GetMapping("/{relId}")
public R<TsAcceptCoilRelVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long relId) {
return R.ok(iTsAcceptCoilRelService.queryById(relId));
}
/**
* 新增受理单关联钢卷中间
*/
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsAcceptCoilRelBo bo) {
return toAjax(iTsAcceptCoilRelService.insertByBo(bo));
}
/**
* 修改受理单关联钢卷中间
*/
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsAcceptCoilRelBo bo) {
return toAjax(iTsAcceptCoilRelService.updateByBo(bo));
}
/**
* 删除受理单关联钢卷中间
*
* @param relIds 主键串
*/
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.DELETE)
@DeleteMapping("/{relIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] relIds) {
return toAjax(iTsAcceptCoilRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
}
}

View File

@@ -0,0 +1,125 @@
package com.klp.flow.controller;
import java.util.List;
import java.util.Arrays;
import java.util.stream.Collectors;
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.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.flow.domain.bo.TsComplaintAcceptBo;
import com.klp.flow.service.ITsComplaintAcceptService;
import com.klp.common.core.page.TableDataInfo;
/**
* 投诉受理单主
*
* @author klp
* @date 2026-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/complaintAccept")
public class TsComplaintAcceptController extends BaseController {
private final ITsComplaintAcceptService iTsComplaintAcceptService;
/**
* 查询投诉受理单主列表
*/
@GetMapping("/list")
public TableDataInfo<TsComplaintAcceptVo> list(TsComplaintAcceptBo bo, PageQuery pageQuery) {
return iTsComplaintAcceptService.queryPageList(bo, pageQuery);
}
/**
* 导出投诉受理单主列表
*/
@Log(title = "投诉受理单主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TsComplaintAcceptBo bo, HttpServletResponse response) {
List<TsComplaintAcceptVo> list = iTsComplaintAcceptService.queryList(bo);
ExcelUtil.exportExcel(list, "投诉受理单主", TsComplaintAcceptVo.class, response);
}
/**
* 获取投诉受理单主详细信息
*
* @param acceptId 主键
*/
@GetMapping("/{acceptId}")
public R<TsComplaintAcceptVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long acceptId) {
return R.ok(iTsComplaintAcceptService.queryById(acceptId));
}
/**
* 新增投诉受理单主
*/
@Log(title = "投诉受理单主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsComplaintAcceptBo bo) {
return toAjax(iTsComplaintAcceptService.insertByBo(bo));
}
/**
* 修改投诉受理单主
*/
@Log(title = "投诉受理单主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsComplaintAcceptBo bo) {
return toAjax(iTsComplaintAcceptService.updateByBo(bo));
}
/**
* 删除投诉受理单主
*
* @param acceptIds 主键串
*/
@Log(title = "投诉受理单主", businessType = BusinessType.DELETE)
@DeleteMapping("/{acceptIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] acceptIds) {
return toAjax(iTsComplaintAcceptService.deleteWithValidByIds(Arrays.asList(acceptIds), true));
}
/**
* 意见下发修改flow_status=2按字典部门创建代办任务
*
* @param acceptId 受理单ID
*/
@Log(title = "意见下发", businessType = BusinessType.UPDATE)
@PostMapping("/opinionDispatch/{acceptId}")
public R<Void> opinionDispatch(@NotNull(message = "主键不能为空")
@PathVariable Long acceptId) {
return toAjax(iTsComplaintAcceptService.opinionDispatch(acceptId));
}
/**
* 反馈下发修改flow_status=4按字典部门创建执行反馈记录
*
* @param acceptId 受理单ID
*/
@Log(title = "反馈下发", businessType = BusinessType.UPDATE)
@PostMapping("/feedbackDispatch")
public R<Void> feedbackDispatch(@RequestParam Long acceptId,
@RequestParam String deptIds) {
List<Long> deptIdList = Arrays.stream(deptIds.split(",")).map(Long::parseLong).collect(Collectors.toList());
return toAjax(iTsComplaintAcceptService.feedbackDispatch(acceptId, deptIdList));
}
}

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.TsComplaintTaskVo;
import com.klp.flow.domain.bo.TsComplaintTaskBo;
import com.klp.flow.service.ITsComplaintTaskService;
import com.klp.common.core.page.TableDataInfo;
/**
* 各部门投诉代办任务&意见
*
* @author klp
* @date 2026-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/complaintTask")
public class TsComplaintTaskController extends BaseController {
private final ITsComplaintTaskService iTsComplaintTaskService;
/**
* 查询各部门投诉代办任务&意见列表
*/
@GetMapping("/list")
public TableDataInfo<TsComplaintTaskVo> list(TsComplaintTaskBo bo, PageQuery pageQuery) {
return iTsComplaintTaskService.queryPageList(bo, pageQuery);
}
/**
* 导出各部门投诉代办任务&意见列表
*/
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TsComplaintTaskBo bo, HttpServletResponse response) {
List<TsComplaintTaskVo> list = iTsComplaintTaskService.queryList(bo);
ExcelUtil.exportExcel(list, "各部门投诉代办任务&意见", TsComplaintTaskVo.class, response);
}
/**
* 获取各部门投诉代办任务&意见详细信息
*
* @param taskId 主键
*/
@GetMapping("/{taskId}")
public R<TsComplaintTaskVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long taskId) {
return R.ok(iTsComplaintTaskService.queryById(taskId));
}
/**
* 新增各部门投诉代办任务&意见
*/
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsComplaintTaskBo bo) {
return toAjax(iTsComplaintTaskService.insertByBo(bo));
}
/**
* 修改各部门投诉代办任务&意见
*/
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsComplaintTaskBo bo) {
return toAjax(iTsComplaintTaskService.updateByBo(bo));
}
/**
* 删除各部门投诉代办任务&意见
*
* @param taskIds 主键串
*/
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] taskIds) {
return toAjax(iTsComplaintTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
}
}

View File

@@ -0,0 +1,99 @@
package com.klp.flow.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.flow.domain.vo.TsPlanExecuteRelVo;
import com.klp.flow.domain.bo.TsPlanExecuteRelBo;
import com.klp.flow.service.ITsPlanExecuteRelService;
import com.klp.common.core.page.TableDataInfo;
/**
* 最终方案下发部门及执行反馈
*
* @author klp
* @date 2026-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/planExecuteRel")
public class TsPlanExecuteRelController extends BaseController {
private final ITsPlanExecuteRelService iTsPlanExecuteRelService;
/**
* 查询最终方案下发部门及执行反馈列表
*/
@GetMapping("/list")
public TableDataInfo<TsPlanExecuteRelVo> list(TsPlanExecuteRelBo bo, PageQuery pageQuery) {
return iTsPlanExecuteRelService.queryPageList(bo, pageQuery);
}
/**
* 导出最终方案下发部门及执行反馈列表
*/
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TsPlanExecuteRelBo bo, HttpServletResponse response) {
List<TsPlanExecuteRelVo> list = iTsPlanExecuteRelService.queryList(bo);
ExcelUtil.exportExcel(list, "最终方案下发部门及执行反馈", TsPlanExecuteRelVo.class, response);
}
/**
* 获取最终方案下发部门及执行反馈详细信息
*
* @param relId 主键
*/
@GetMapping("/{relId}")
public R<TsPlanExecuteRelVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long relId) {
return R.ok(iTsPlanExecuteRelService.queryById(relId));
}
/**
* 新增最终方案下发部门及执行反馈
*/
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsPlanExecuteRelBo bo) {
return toAjax(iTsPlanExecuteRelService.insertByBo(bo));
}
/**
* 修改最终方案下发部门及执行反馈
*/
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsPlanExecuteRelBo bo) {
return toAjax(iTsPlanExecuteRelService.updateByBo(bo));
}
/**
* 删除最终方案下发部门及执行反馈
*
* @param relIds 主键串
*/
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.DELETE)
@DeleteMapping("/{relIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] relIds) {
return toAjax(iTsPlanExecuteRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
}
}

View File

@@ -0,0 +1,91 @@
package com.klp.flow.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;
/**
* 盘库差异记录对象 inv_count_discrepancy
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("inv_count_discrepancy")
public class InvCountDiscrepancy extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "discrepancy_id")
private Long discrepancyId;
/**
* 盘库计划明细ID
*/
private Long relId;
/**
* 差异类型1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
*/
private Integer discrepancyType;
/**
* 钢卷ID
*/
private Long coilId;
/**
* 钢卷号
*/
private String enterCoilNo;
/**
* 差异详情JSON含系统值、实盘值对比
*/
private String discrepancyDetail;
/**
* 原因分析
*/
private String reasonAnalysis;
/**
* 处理建议
*/
private String processSuggestion;
/**
* 处理结果
*/
private String processResult;
/**
* 处理状态0=待处理, 1=处理中, 2=已处理
*/
private Integer processStatus;
/**
* 处理人ID
*/
private Long processUserId;
/**
* 处理人姓名
*/
private String processUserName;
/**
* 处理时间
*/
private Date processTime;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
private String attachFile;
/**
* 删除标志0=正常1=已删除)
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,87 @@
package com.klp.flow.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;
/**
* 盘库计划主对象 inv_count_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("inv_count_plan")
public class InvCountPlan extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "plan_id")
private Long planId;
/**
* 盘库计划编号(如 PD-20260622-001
*/
private String planCode;
/**
* 盘库计划名称
*/
private String planName;
/**
* 盘库日期
*/
private Date countDate;
/**
* 截止时间
*/
private Date deadlineTime;
/**
* 盘点人ID
*/
private Long countUserId;
/**
* 盘点人姓名
*/
private String countUserName;
/**
* 负责人ID
*/
private Long principalUserId;
/**
* 负责人姓名
*/
private String principalUserName;
/**
* 参与人员ID列表逗号分隔
*/
private String participantIds;
/**
* 参与人员姓名列表(逗号分隔)
*/
private String participantNames;
/**
* 计划状态0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
*/
private Integer planStatus;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
private String attachFile;
/**
* 删除标志0=正常1=已删除)
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,104 @@
package com.klp.flow.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;
/**
* 盘库计划-库区关联对象 inv_count_plan_warehouse
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("inv_count_plan_warehouse")
public class InvCountPlanWarehouse extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "rel_id")
private Long relId;
/**
* 盘库计划ID
*/
private Long planId;
/**
* 逻辑库区ID
*/
private Long warehouseId;
/**
* 逻辑库区名称(冗余)
*/
private String warehouseName;
/**
* 实际库区ID
*/
private Long actualWarehouseId;
/**
* 实际库区名称(冗余)
*/
private String actualWarehouseName;
/**
* 系统钢卷数量
*/
private Long systemCoilCount;
/**
* 系统总重量(kg)
*/
private BigDecimal systemTotalWeight;
/**
* 实际盘点数量
*/
private Long actualCoilCount;
/**
* 实际盘点总重量(kg)
*/
private BigDecimal actualTotalWeight;
/**
* 是否账实一致0=不一致, 1=一致, NULL=未盘点)
*/
private Integer isConsistent;
/**
* 出入库记录查询起始时间
*/
private Date ioStartTime;
/**
* 出入库记录查询截止时间
*/
private Date ioEndTime;
/**
* 出入库记录快照JSON
*/
private String snapshotIoRecord;
/**
* 逻辑库区钢卷明细快照JSON
*/
private String snapshotCoilLogic;
/**
* 实际库区钢卷明细快照JSON
*/
private String snapshotCoilActual;
/**
* 钢卷数量统计快照JSON
*/
private String snapshotCoilStats;
/**
* 删除标志0=正常1=已删除)
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,45 @@
package com.klp.flow.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 受理单关联钢卷中间对象 ts_accept_coil_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ts_accept_coil_rel")
public class TsAcceptCoilRel extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "rel_id")
private Long relId;
/**
* 投诉受理单ID
*/
private Long acceptId;
/**
* 钢卷ID
*/
private Long coilId;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0=正常 2=删除
*/
@TableLogic
private Long delFlag;
}

View File

@@ -0,0 +1,88 @@
package com.klp.flow.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;
/**
* 投诉受理单主对象 ts_complaint_accept
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ts_complaint_accept")
public class TsComplaintAccept extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 受理单主键
*/
@TableId(value = "accept_id")
private Long acceptId;
/**
* 投诉编号 TS-2026-001
*/
private String complaintNo;
/**
* 投诉日期
*/
private Date complaintDate;
/**
* 投诉情况描述
*/
private String complaintContent;
/**
* 客户诉求
*/
private String customerDemand;
/**
* 客户照片凭证等
*/
private String file;
/**
* 审核状态 0待审核 1已通过 2未通过
*/
private Long auditStatus;
/**
* 审核意见
*/
private String auditOpinion;
/**
* 审核人ID
*/
private Long auditUserId;
/**
* 审核时间
*/
private Date auditTime;
/**
* 流程阶段:
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
*/
private Long flowStatus;
/**
* 总负责人ID
*/
private Long principalUserId;
/**
* 总负责人整合后的完整处理方案
*/
private String planContent;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0=正常 2=删除
*/
@TableLogic
private Long delFlag;
}

View File

@@ -0,0 +1,71 @@
package com.klp.flow.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;
/**
* 各部门投诉代办任务&意见对象 ts_complaint_task
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ts_complaint_task")
public class TsComplaintTask extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 代办任务ID
*/
@TableId(value = "task_id")
private Long taskId;
/**
* 关联投诉受理单ID
*/
private Long acceptId;
/**
* 负责部门ID销售/质量/生产)
*/
private Long deptId;
/**
* 任务状态 0待填写意见 1已完成填写
*/
private Long taskStatus;
/**
* 意见单号
*/
private String fillNo;
/**
* 部门处理意见
*/
private String deptOpinion;
/**
* 填写意见的部门员工ID
*/
private Long fillUserId;
/**
* 意见填写时间
*/
private Date fillTime;
/**
* 意见文件
*/
private String fillFile;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0=正常 2=删除
*/
@TableLogic
private Long delFlag;
}

View File

@@ -0,0 +1,71 @@
package com.klp.flow.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;
/**
* 最终方案下发部门及执行反馈对象 ts_plan_execute_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ts_plan_execute_rel")
public class TsPlanExecuteRel extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "rel_id")
private Long relId;
/**
* 关联最终方案ID
*/
private Long acceptId;
/**
* 被下发执行的部门ID
*/
private Long deptId;
/**
* 执行状态 0待执行反馈 1已反馈完成
*/
private Long executeStatus;
/**
* 部门执行结果反馈
*/
private String executeResult;
/**
* 反馈单号
*/
private String feedbackNo;
/**
* 反馈人
*/
private Long feedbackUserId;
/**
* 反馈时间
*/
private Date feedbackTime;
/**
* 反馈文件
*/
private String feedbackFile;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0=正常 2=删除
*/
@TableLogic
private Long delFlag;
}

View File

@@ -0,0 +1,98 @@
package com.klp.flow.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;
/**
* 盘库差异记录业务对象 inv_count_discrepancy
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class InvCountDiscrepancyBo extends BaseEntity {
/**
* 主键ID
*/
private Long discrepancyId;
/**
* 盘库计划明细ID
*/
private Long relId;
/**
* 差异类型1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
*/
private Integer discrepancyType;
/**
* 钢卷ID
*/
private Long coilId;
/**
* 钢卷号
*/
private String enterCoilNo;
/**
* 差异详情JSON含系统值、实盘值对比
*/
private String discrepancyDetail;
/**
* 原因分析
*/
private String reasonAnalysis;
/**
* 处理建议
*/
private String processSuggestion;
/**
* 处理结果
*/
private String processResult;
/**
* 处理状态0=待处理, 1=处理中, 2=已处理
*/
private Integer processStatus;
/**
* 处理人ID
*/
private Long processUserId;
/**
* 处理人姓名
*/
private String processUserName;
/**
* 处理时间
*/
private Date processTime;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
private String attachFile;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,93 @@
package com.klp.flow.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;
/**
* 盘库计划主业务对象 inv_count_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class InvCountPlanBo extends BaseEntity {
/**
* 主键ID
*/
private Long planId;
/**
* 盘库计划编号(如 PD-20260622-001
*/
private String planCode;
/**
* 盘库计划名称
*/
private String planName;
/**
* 盘库日期
*/
private Date countDate;
/**
* 截止时间
*/
private Date deadlineTime;
/**
* 盘点人ID
*/
private Long countUserId;
/**
* 盘点人姓名
*/
private String countUserName;
/**
* 负责人ID
*/
private Long principalUserId;
/**
* 负责人姓名
*/
private String principalUserName;
/**
* 参与人员ID列表逗号分隔
*/
private String participantIds;
/**
* 参与人员姓名列表(逗号分隔)
*/
private String participantNames;
/**
* 计划状态0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
*/
private Integer planStatus;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
private String attachFile;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,114 @@
package com.klp.flow.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;
/**
* 盘库计划-库区关联业务对象 inv_count_plan_warehouse
*
* @author klp
* @date 2026-06-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class InvCountPlanWarehouseBo extends BaseEntity {
/**
* 主键ID
*/
private Long relId;
/**
* 盘库计划ID
*/
private Long planId;
/**
* 逻辑库区ID
*/
private Long warehouseId;
/**
* 逻辑库区名称(冗余)
*/
private String warehouseName;
/**
* 实际库区ID
*/
private Long actualWarehouseId;
/**
* 实际库区名称(冗余)
*/
private String actualWarehouseName;
/**
* 系统钢卷数量
*/
private Long systemCoilCount;
/**
* 系统总重量(kg)
*/
private BigDecimal systemTotalWeight;
/**
* 实际盘点数量
*/
private Long actualCoilCount;
/**
* 实际盘点总重量(kg)
*/
private BigDecimal actualTotalWeight;
/**
* 是否账实一致0=不一致, 1=一致, NULL=未盘点)
*/
private Integer isConsistent;
/**
* 出入库记录查询起始时间
*/
private Date ioStartTime;
/**
* 出入库记录查询截止时间
*/
private Date ioEndTime;
/**
* 出入库记录快照JSON
*/
private String snapshotIoRecord;
/**
* 逻辑库区钢卷明细快照JSON
*/
private String snapshotCoilLogic;
/**
* 实际库区钢卷明细快照JSON
*/
private String snapshotCoilActual;
/**
* 钢卷数量统计快照JSON
*/
private String snapshotCoilStats;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,41 @@
package com.klp.flow.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 受理单关联钢卷中间业务对象 ts_accept_coil_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TsAcceptCoilRelBo extends BaseEntity {
/**
*
*/
private Long relId;
/**
* 投诉受理单ID
*/
private Long acceptId;
/**
* 钢卷ID
*/
private Long coilId;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,108 @@
package com.klp.flow.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 投诉受理单主业务对象 ts_complaint_accept
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TsComplaintAcceptBo extends BaseEntity {
/**
* 受理单主键
*/
private Long acceptId;
/**
* 投诉编号 TS-2026-001
*/
private String complaintNo;
/**
* 投诉日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date complaintDate;
/**
* 投诉情况描述
*/
private String complaintContent;
/**
* 客户诉求
*/
private String customerDemand;
/**
* 客户照片凭证等
*/
private String file;
/**
* 审核状态 0待审核 1已通过 2未通过
*/
private Long auditStatus;
/**
* 审核意见
*/
private String auditOpinion;
/**
* 审核人ID
*/
private Long auditUserId;
/**
* 审核时间
*/
private Date auditTime;
/**
* 流程阶段:
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
*/
private Long flowStatus;
/**
* 总负责人ID
*/
private Long principalUserId;
/**
* 总负责人整合后的完整处理方案
*/
private String planContent;
/**
* 备注
*/
private String remark;
/**
* 关联的钢卷ID列表新增受理单时一并插入到ts_accept_coil_rel
*/
private List<Long> coilIds;
/**
* 受理单ID列表批量查询用
*/
private List<Long> acceptIds;
}

View File

@@ -0,0 +1,73 @@
package com.klp.flow.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;
/**
* 各部门投诉代办任务&意见业务对象 ts_complaint_task
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TsComplaintTaskBo extends BaseEntity {
/**
* 代办任务ID
*/
private Long taskId;
/**
* 关联投诉受理单ID
*/
private Long acceptId;
/**
* 负责部门ID销售/质量/生产)
*/
private Long deptId;
/**
* 任务状态 0待填写意见 1已完成填写
*/
private Long taskStatus;
/**
* 意见单号
*/
private String fillNo;
/**
* 部门处理意见
*/
private String deptOpinion;
/**
* 填写意见的部门员工ID
*/
private Long fillUserId;
/**
* 意见填写时间
*/
private Date fillTime;
/**
* 意见文件
*/
private String fillFile;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,73 @@
package com.klp.flow.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;
/**
* 最终方案下发部门及执行反馈业务对象 ts_plan_execute_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TsPlanExecuteRelBo extends BaseEntity {
/**
*
*/
private Long relId;
/**
* 关联最终方案ID
*/
private Long acceptId;
/**
* 被下发执行的部门ID
*/
private Long deptId;
/**
* 执行状态 0待执行反馈 1已反馈完成
*/
private Long executeStatus;
/**
* 部门执行结果反馈
*/
private String executeResult;
/**
* 反馈单号
*/
private String feedbackNo;
/**
* 反馈人
*/
private Long feedbackUserId;
/**
* 反馈时间
*/
private Date feedbackTime;
/**
* 反馈文件
*/
private String feedbackFile;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,116 @@
package com.klp.flow.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;
/**
* 盘库差异记录视图对象 inv_count_discrepancy
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class InvCountDiscrepancyVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long discrepancyId;
/**
* 盘库计划明细ID
*/
@ExcelProperty(value = "盘库计划明细ID")
private Long relId;
/**
* 差异类型1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
*/
@ExcelProperty(value = "差异类型1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差")
private Integer discrepancyType;
/**
* 钢卷ID
*/
@ExcelProperty(value = "钢卷ID")
private Long coilId;
/**
* 钢卷号
*/
@ExcelProperty(value = "钢卷号")
private String enterCoilNo;
/**
* 差异详情JSON含系统值、实盘值对比
*/
@ExcelProperty(value = "差异详情", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON含系统值、实盘值对比")
private String discrepancyDetail;
/**
* 原因分析
*/
@ExcelProperty(value = "原因分析")
private String reasonAnalysis;
/**
* 处理建议
*/
@ExcelProperty(value = "处理建议")
private String processSuggestion;
/**
* 处理结果
*/
@ExcelProperty(value = "处理结果")
private String processResult;
/**
* 处理状态0=待处理, 1=处理中, 2=已处理
*/
@ExcelProperty(value = "处理状态0=待处理, 1=处理中, 2=已处理")
private Integer processStatus;
/**
* 处理人ID
*/
@ExcelProperty(value = "处理人ID")
private Long processUserId;
/**
* 处理人姓名
*/
@ExcelProperty(value = "处理人姓名")
private String processUserName;
/**
* 处理时间
*/
@ExcelProperty(value = "处理时间")
private Date processTime;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
@ExcelProperty(value = "附件文件名称集合,多文件逗号分隔,前端展示")
private String attachFile;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,112 @@
package com.klp.flow.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;
/**
* 盘库计划主视图对象 inv_count_plan
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class InvCountPlanVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long planId;
/**
* 盘库计划编号(如 PD-20260622-001
*/
@ExcelProperty(value = "盘库计划编号", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "如=,P=D-20260622-001")
private String planCode;
/**
* 盘库计划名称
*/
@ExcelProperty(value = "盘库计划名称")
private String planName;
/**
* 盘库日期
*/
@ExcelProperty(value = "盘库日期")
private Date countDate;
/**
* 截止时间
*/
@ExcelProperty(value = "截止时间")
private Date deadlineTime;
/**
* 盘点人ID
*/
@ExcelProperty(value = "盘点人ID")
private Long countUserId;
/**
* 盘点人姓名
*/
@ExcelProperty(value = "盘点人姓名")
private String countUserName;
/**
* 负责人ID
*/
@ExcelProperty(value = "负责人ID")
private Long principalUserId;
/**
* 负责人姓名
*/
@ExcelProperty(value = "负责人姓名")
private String principalUserName;
/**
* 参与人员ID列表逗号分隔
*/
@ExcelProperty(value = "参与人员ID列表", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "逗=号分隔")
private String participantIds;
/**
* 参与人员姓名列表(逗号分隔)
*/
@ExcelProperty(value = "参与人员姓名列表", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "逗=号分隔")
private String participantNames;
/**
* 计划状态0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
*/
@ExcelProperty(value = "计划状态0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档")
private Integer planStatus;
/**
* 附件文件名称集合,多文件逗号分隔,前端展示
*/
@ExcelProperty(value = "附件文件名称集合,多文件逗号分隔,前端展示")
private String attachFile;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,141 @@
package com.klp.flow.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;
/**
* 盘库计划-库区关联视图对象 inv_count_plan_warehouse
*
* @author klp
* @date 2026-06-22
*/
@Data
@ExcelIgnoreUnannotated
public class InvCountPlanWarehouseVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long relId;
/**
* 盘库计划ID
*/
@ExcelProperty(value = "盘库计划ID")
private Long planId;
/**
* 逻辑库区ID
*/
@ExcelProperty(value = "逻辑库区ID")
private Long warehouseId;
/**
* 逻辑库区名称(冗余)
*/
@ExcelProperty(value = "逻辑库区名称", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "冗=余")
private String warehouseName;
/**
* 实际库区ID
*/
@ExcelProperty(value = "实际库区ID")
private Long actualWarehouseId;
/**
* 实际库区名称(冗余)
*/
@ExcelProperty(value = "实际库区名称", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "冗=余")
private String actualWarehouseName;
/**
* 系统钢卷数量
*/
@ExcelProperty(value = "系统钢卷数量")
private Long systemCoilCount;
/**
* 系统总重量(kg)
*/
@ExcelProperty(value = "系统总重量(kg)")
private BigDecimal systemTotalWeight;
/**
* 实际盘点数量
*/
@ExcelProperty(value = "实际盘点数量")
private Long actualCoilCount;
/**
* 实际盘点总重量(kg)
*/
@ExcelProperty(value = "实际盘点总重量(kg)")
private BigDecimal actualTotalWeight;
/**
* 是否账实一致0=不一致, 1=一致, NULL=未盘点)
*/
@ExcelProperty(value = "是否账实一致", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0==不一致,,1==一致,,N=ULL=未盘点")
private Integer isConsistent;
/**
* 出入库记录查询起始时间
*/
@ExcelProperty(value = "出入库记录查询起始时间")
private Date ioStartTime;
/**
* 出入库记录查询截止时间
*/
@ExcelProperty(value = "出入库记录查询截止时间")
private Date ioEndTime;
/**
* 出入库记录快照JSON
*/
@ExcelProperty(value = "出入库记录快照", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON")
private String snapshotIoRecord;
/**
* 逻辑库区钢卷明细快照JSON
*/
@ExcelProperty(value = "逻辑库区钢卷明细快照", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON")
private String snapshotCoilLogic;
/**
* 实际库区钢卷明细快照JSON
*/
@ExcelProperty(value = "实际库区钢卷明细快照", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON")
private String snapshotCoilActual;
/**
* 钢卷数量统计快照JSON
*/
@ExcelProperty(value = "钢卷数量统计快照", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON")
private String snapshotCoilStats;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,53 @@
package com.klp.flow.domain.vo;
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.domain.vo.WmsMaterialCoilVo;
import lombok.Data;
/**
* 受理单关联钢卷中间视图对象 ts_accept_coil_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@ExcelIgnoreUnannotated
public class TsAcceptCoilRelVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long relId;
/**
* 投诉受理单ID
*/
@ExcelProperty(value = "投诉受理单ID")
private Long acceptId;
/**
* 钢卷ID
*/
@ExcelProperty(value = "钢卷ID")
private Long coilId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 关联的钢卷信息(丰富返回值)
*/
private WmsMaterialCoilVo coilInfo;
}

View File

@@ -0,0 +1,111 @@
package com.klp.flow.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 com.klp.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 投诉受理单主视图对象 ts_complaint_accept
*
* @author klp
* @date 2026-06-18
*/
@Data
@ExcelIgnoreUnannotated
public class TsComplaintAcceptVo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 受理单主键
*/
@ExcelProperty(value = "受理单主键")
private Long acceptId;
/**
* 投诉编号 TS-2026-001
*/
@ExcelProperty(value = "投诉编号 TS-2026-001")
private String complaintNo;
/**
* 投诉日期
*/
@ExcelProperty(value = "投诉日期")
private Date complaintDate;
/**
* 投诉情况描述
*/
@ExcelProperty(value = "投诉情况描述")
private String complaintContent;
/**
* 客户诉求
*/
@ExcelProperty(value = "客户诉求")
private String customerDemand;
/**
* 客户照片凭证等
*/
@ExcelProperty(value = "客户照片凭证等")
private String file;
/**
* 审核状态 0待审核 1已通过 2未通过
*/
@ExcelProperty(value = "审核状态 0待审核 1已通过 2未通过")
private Long auditStatus;
/**
* 审核意见
*/
@ExcelProperty(value = "审核意见")
private String auditOpinion;
/**
* 审核人ID
*/
@ExcelProperty(value = "审核人ID")
private Long auditUserId;
/**
* 审核时间
*/
@ExcelProperty(value = "审核时间")
private Date auditTime;
/**
* 流程阶段:
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
*/
@ExcelProperty(value = "流程阶段")
private Long flowStatus;
/**
* 总负责人ID
*/
@ExcelProperty(value = "总负责人ID")
private Long principalUserId;
/**
* 总负责人整合后的完整处理方案
*/
@ExcelProperty(value = "总负责人整合后的完整处理方案")
private String planContent;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,91 @@
package com.klp.flow.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;
/**
* 各部门投诉代办任务&意见视图对象 ts_complaint_task
*
* @author klp
* @date 2026-06-18
*/
@Data
@ExcelIgnoreUnannotated
public class TsComplaintTaskVo {
private static final long serialVersionUID = 1L;
/**
* 代办任务ID
*/
@ExcelProperty(value = "代办任务ID")
private Long taskId;
/**
* 关联投诉受理单ID
*/
@ExcelProperty(value = "关联投诉受理单ID")
private Long acceptId;
/**
* 负责部门ID销售/质量/生产)
*/
@ExcelProperty(value = "负责部门ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "销=售/质量/生产")
private Long deptId;
/**
* 任务状态 0待填写意见 1已完成填写
*/
@ExcelProperty(value = "任务状态 0待填写意见 1已完成填写")
private Long taskStatus;
/**
* 意见单号
*/
@ExcelProperty(value = "意见单号")
private String fillNo;
/**
* 部门处理意见
*/
@ExcelProperty(value = "部门处理意见")
private String deptOpinion;
/**
* 填写意见的部门员工ID
*/
@ExcelProperty(value = "填写意见的部门员工ID")
private Long fillUserId;
/**
* 意见填写时间
*/
@ExcelProperty(value = "意见填写时间")
private Date fillTime;
/**
* 意见文件
*/
@ExcelProperty(value = "意见文件")
private String fillFile;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 关联的受理单信息
*/
private TsComplaintAcceptVo acceptInfo;
}

View File

@@ -0,0 +1,87 @@
package com.klp.flow.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;
/**
* 最终方案下发部门及执行反馈视图对象 ts_plan_execute_rel
*
* @author klp
* @date 2026-06-18
*/
@Data
@ExcelIgnoreUnannotated
public class TsPlanExecuteRelVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long relId;
/**
* 关联最终方案ID
*/
@ExcelProperty(value = "关联最终方案ID")
private Long acceptId;
/**
* 被下发执行的部门ID
*/
@ExcelProperty(value = "被下发执行的部门ID")
private Long deptId;
/**
* 执行状态 0待执行反馈 1已反馈完成
*/
@ExcelProperty(value = "执行状态 0待执行反馈 1已反馈完成")
private Long executeStatus;
/**
* 部门执行结果反馈
*/
@ExcelProperty(value = "部门执行结果反馈")
private String executeResult;
/**
* 反馈单号
*/
@ExcelProperty(value = "反馈单号")
private String feedbackNo;
/**
* 反馈人
*/
@ExcelProperty(value = "反馈人")
private Long feedbackUserId;
/**
* 反馈时间
*/
@ExcelProperty(value = "反馈时间")
private Date feedbackTime;
/**
* 反馈文件
*/
@ExcelProperty(value = "反馈文件")
private String feedbackFile;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
// 受理单
private TsComplaintAcceptVo acceptInfo;
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.InvCountDiscrepancy;
import com.klp.flow.domain.vo.InvCountDiscrepancyVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 盘库差异记录Mapper接口
*
* @author klp
* @date 2026-06-22
*/
public interface InvCountDiscrepancyMapper extends BaseMapperPlus<InvCountDiscrepancyMapper, InvCountDiscrepancy, InvCountDiscrepancyVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.InvCountPlan;
import com.klp.flow.domain.vo.InvCountPlanVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 盘库计划主Mapper接口
*
* @author klp
* @date 2026-06-22
*/
public interface InvCountPlanMapper extends BaseMapperPlus<InvCountPlanMapper, InvCountPlan, InvCountPlanVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.InvCountPlanWarehouse;
import com.klp.flow.domain.vo.InvCountPlanWarehouseVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 盘库计划-库区关联Mapper接口
*
* @author klp
* @date 2026-06-22
*/
public interface InvCountPlanWarehouseMapper extends BaseMapperPlus<InvCountPlanWarehouseMapper, InvCountPlanWarehouse, InvCountPlanWarehouseVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.TsAcceptCoilRel;
import com.klp.flow.domain.vo.TsAcceptCoilRelVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 受理单关联钢卷中间Mapper接口
*
* @author klp
* @date 2026-06-18
*/
public interface TsAcceptCoilRelMapper extends BaseMapperPlus<TsAcceptCoilRelMapper, TsAcceptCoilRel, TsAcceptCoilRelVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.TsComplaintAccept;
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 投诉受理单主Mapper接口
*
* @author klp
* @date 2026-06-18
*/
public interface TsComplaintAcceptMapper extends BaseMapperPlus<TsComplaintAcceptMapper, TsComplaintAccept, TsComplaintAcceptVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.TsComplaintTask;
import com.klp.flow.domain.vo.TsComplaintTaskVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 各部门投诉代办任务&意见Mapper接口
*
* @author klp
* @date 2026-06-18
*/
public interface TsComplaintTaskMapper extends BaseMapperPlus<TsComplaintTaskMapper, TsComplaintTask, TsComplaintTaskVo> {
}

View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.TsPlanExecuteRel;
import com.klp.flow.domain.vo.TsPlanExecuteRelVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 最终方案下发部门及执行反馈Mapper接口
*
* @author klp
* @date 2026-06-18
*/
public interface TsPlanExecuteRelMapper extends BaseMapperPlus<TsPlanExecuteRelMapper, TsPlanExecuteRel, TsPlanExecuteRelVo> {
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.InvCountDiscrepancy;
import com.klp.flow.domain.vo.InvCountDiscrepancyVo;
import com.klp.flow.domain.bo.InvCountDiscrepancyBo;
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-06-22
*/
public interface IInvCountDiscrepancyService {
/**
* 查询盘库差异记录
*/
InvCountDiscrepancyVo queryById(Long discrepancyId);
/**
* 查询盘库差异记录列表
*/
TableDataInfo<InvCountDiscrepancyVo> queryPageList(InvCountDiscrepancyBo bo, PageQuery pageQuery);
/**
* 查询盘库差异记录列表
*/
List<InvCountDiscrepancyVo> queryList(InvCountDiscrepancyBo bo);
/**
* 新增盘库差异记录
*/
Boolean insertByBo(InvCountDiscrepancyBo bo);
/**
* 修改盘库差异记录
*/
Boolean updateByBo(InvCountDiscrepancyBo bo);
/**
* 校验并批量删除盘库差异记录信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.InvCountPlan;
import com.klp.flow.domain.vo.InvCountPlanVo;
import com.klp.flow.domain.bo.InvCountPlanBo;
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-06-22
*/
public interface IInvCountPlanService {
/**
* 查询盘库计划主
*/
InvCountPlanVo queryById(Long planId);
/**
* 查询盘库计划主列表
*/
TableDataInfo<InvCountPlanVo> queryPageList(InvCountPlanBo bo, PageQuery pageQuery);
/**
* 查询盘库计划主列表
*/
List<InvCountPlanVo> queryList(InvCountPlanBo bo);
/**
* 新增盘库计划主
*/
Boolean insertByBo(InvCountPlanBo bo);
/**
* 修改盘库计划主
*/
Boolean updateByBo(InvCountPlanBo bo);
/**
* 校验并批量删除盘库计划主信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.InvCountPlanWarehouse;
import com.klp.flow.domain.vo.InvCountPlanWarehouseVo;
import com.klp.flow.domain.bo.InvCountPlanWarehouseBo;
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-06-22
*/
public interface IInvCountPlanWarehouseService {
/**
* 查询盘库计划-库区关联
*/
InvCountPlanWarehouseVo queryById(Long relId);
/**
* 查询盘库计划-库区关联列表
*/
TableDataInfo<InvCountPlanWarehouseVo> queryPageList(InvCountPlanWarehouseBo bo, PageQuery pageQuery);
/**
* 查询盘库计划-库区关联列表
*/
List<InvCountPlanWarehouseVo> queryList(InvCountPlanWarehouseBo bo);
/**
* 新增盘库计划-库区关联
*/
Boolean insertByBo(InvCountPlanWarehouseBo bo);
/**
* 修改盘库计划-库区关联
*/
Boolean updateByBo(InvCountPlanWarehouseBo bo);
/**
* 校验并批量删除盘库计划-库区关联信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.TsAcceptCoilRel;
import com.klp.flow.domain.vo.TsAcceptCoilRelVo;
import com.klp.flow.domain.bo.TsAcceptCoilRelBo;
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-06-18
*/
public interface ITsAcceptCoilRelService {
/**
* 查询受理单关联钢卷中间
*/
TsAcceptCoilRelVo queryById(Long relId);
/**
* 查询受理单关联钢卷中间列表
*/
TableDataInfo<TsAcceptCoilRelVo> queryPageList(TsAcceptCoilRelBo bo, PageQuery pageQuery);
/**
* 查询受理单关联钢卷中间列表
*/
List<TsAcceptCoilRelVo> queryList(TsAcceptCoilRelBo bo);
/**
* 新增受理单关联钢卷中间
*/
Boolean insertByBo(TsAcceptCoilRelBo bo);
/**
* 修改受理单关联钢卷中间
*/
Boolean updateByBo(TsAcceptCoilRelBo bo);
/**
* 校验并批量删除受理单关联钢卷中间信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,59 @@
package com.klp.flow.service;
import com.klp.flow.domain.TsComplaintAccept;
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.flow.domain.bo.TsComplaintAcceptBo;
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-06-18
*/
public interface ITsComplaintAcceptService {
/**
* 查询投诉受理单主
*/
TsComplaintAcceptVo queryById(Long acceptId);
/**
* 查询投诉受理单主列表
*/
TableDataInfo<TsComplaintAcceptVo> queryPageList(TsComplaintAcceptBo bo, PageQuery pageQuery);
/**
* 查询投诉受理单主列表
*/
List<TsComplaintAcceptVo> queryList(TsComplaintAcceptBo bo);
/**
* 新增投诉受理单主
*/
Boolean insertByBo(TsComplaintAcceptBo bo);
/**
* 修改投诉受理单主
*/
Boolean updateByBo(TsComplaintAcceptBo bo);
/**
* 校验并批量删除投诉受理单主信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 意见下发修改flow_status=2按字典flow_coil_objection部门创建代办任务
*/
Boolean opinionDispatch(Long acceptId);
/**
* 反馈下发修改flow_status=4按传入部门创建执行反馈记录
*/
Boolean feedbackDispatch(Long acceptId, List<Long> deptIds);
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.TsComplaintTask;
import com.klp.flow.domain.vo.TsComplaintTaskVo;
import com.klp.flow.domain.bo.TsComplaintTaskBo;
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-06-18
*/
public interface ITsComplaintTaskService {
/**
* 查询各部门投诉代办任务&意见
*/
TsComplaintTaskVo queryById(Long taskId);
/**
* 查询各部门投诉代办任务&意见列表
*/
TableDataInfo<TsComplaintTaskVo> queryPageList(TsComplaintTaskBo bo, PageQuery pageQuery);
/**
* 查询各部门投诉代办任务&意见列表
*/
List<TsComplaintTaskVo> queryList(TsComplaintTaskBo bo);
/**
* 新增各部门投诉代办任务&意见
*/
Boolean insertByBo(TsComplaintTaskBo bo);
/**
* 修改各部门投诉代办任务&意见
*/
Boolean updateByBo(TsComplaintTaskBo bo);
/**
* 校验并批量删除各部门投诉代办任务&意见信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.TsPlanExecuteRel;
import com.klp.flow.domain.vo.TsPlanExecuteRelVo;
import com.klp.flow.domain.bo.TsPlanExecuteRelBo;
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-06-18
*/
public interface ITsPlanExecuteRelService {
/**
* 查询最终方案下发部门及执行反馈
*/
TsPlanExecuteRelVo queryById(Long relId);
/**
* 查询最终方案下发部门及执行反馈列表
*/
TableDataInfo<TsPlanExecuteRelVo> queryPageList(TsPlanExecuteRelBo bo, PageQuery pageQuery);
/**
* 查询最终方案下发部门及执行反馈列表
*/
List<TsPlanExecuteRelVo> queryList(TsPlanExecuteRelBo bo);
/**
* 新增最终方案下发部门及执行反馈
*/
Boolean insertByBo(TsPlanExecuteRelBo bo);
/**
* 修改最终方案下发部门及执行反馈
*/
Boolean updateByBo(TsPlanExecuteRelBo bo);
/**
* 校验并批量删除最终方案下发部门及执行反馈信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,121 @@
package com.klp.flow.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.flow.domain.bo.InvCountDiscrepancyBo;
import com.klp.flow.domain.vo.InvCountDiscrepancyVo;
import com.klp.flow.domain.InvCountDiscrepancy;
import com.klp.flow.mapper.InvCountDiscrepancyMapper;
import com.klp.flow.service.IInvCountDiscrepancyService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 盘库差异记录Service业务层处理
*
* @author klp
* @date 2026-06-22
*/
@RequiredArgsConstructor
@Service
public class InvCountDiscrepancyServiceImpl implements IInvCountDiscrepancyService {
private final InvCountDiscrepancyMapper baseMapper;
/**
* 查询盘库差异记录
*/
@Override
public InvCountDiscrepancyVo queryById(Long discrepancyId){
return baseMapper.selectVoById(discrepancyId);
}
/**
* 查询盘库差异记录列表
*/
@Override
public TableDataInfo<InvCountDiscrepancyVo> queryPageList(InvCountDiscrepancyBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<InvCountDiscrepancy> lqw = buildQueryWrapper(bo);
Page<InvCountDiscrepancyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询盘库差异记录列表
*/
@Override
public List<InvCountDiscrepancyVo> queryList(InvCountDiscrepancyBo bo) {
LambdaQueryWrapper<InvCountDiscrepancy> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<InvCountDiscrepancy> buildQueryWrapper(InvCountDiscrepancyBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InvCountDiscrepancy> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getRelId() != null, InvCountDiscrepancy::getRelId, bo.getRelId());
lqw.eq(bo.getDiscrepancyType() != null, InvCountDiscrepancy::getDiscrepancyType, bo.getDiscrepancyType());
lqw.eq(bo.getCoilId() != null, InvCountDiscrepancy::getCoilId, bo.getCoilId());
lqw.eq(StringUtils.isNotBlank(bo.getEnterCoilNo()), InvCountDiscrepancy::getEnterCoilNo, bo.getEnterCoilNo());
lqw.eq(StringUtils.isNotBlank(bo.getDiscrepancyDetail()), InvCountDiscrepancy::getDiscrepancyDetail, bo.getDiscrepancyDetail());
lqw.eq(StringUtils.isNotBlank(bo.getReasonAnalysis()), InvCountDiscrepancy::getReasonAnalysis, bo.getReasonAnalysis());
lqw.eq(StringUtils.isNotBlank(bo.getProcessSuggestion()), InvCountDiscrepancy::getProcessSuggestion, bo.getProcessSuggestion());
lqw.eq(StringUtils.isNotBlank(bo.getProcessResult()), InvCountDiscrepancy::getProcessResult, bo.getProcessResult());
lqw.eq(bo.getProcessStatus() != null, InvCountDiscrepancy::getProcessStatus, bo.getProcessStatus());
lqw.eq(bo.getProcessUserId() != null, InvCountDiscrepancy::getProcessUserId, bo.getProcessUserId());
lqw.like(StringUtils.isNotBlank(bo.getProcessUserName()), InvCountDiscrepancy::getProcessUserName, bo.getProcessUserName());
lqw.eq(bo.getProcessTime() != null, InvCountDiscrepancy::getProcessTime, bo.getProcessTime());
lqw.eq(StringUtils.isNotBlank(bo.getAttachFile()), InvCountDiscrepancy::getAttachFile, bo.getAttachFile());
return lqw;
}
/**
* 新增盘库差异记录
*/
@Override
public Boolean insertByBo(InvCountDiscrepancyBo bo) {
InvCountDiscrepancy add = BeanUtil.toBean(bo, InvCountDiscrepancy.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setDiscrepancyId(add.getDiscrepancyId());
}
return flag;
}
/**
* 修改盘库差异记录
*/
@Override
public Boolean updateByBo(InvCountDiscrepancyBo bo) {
InvCountDiscrepancy update = BeanUtil.toBean(bo, InvCountDiscrepancy.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(InvCountDiscrepancy entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除盘库差异记录
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,120 @@
package com.klp.flow.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.flow.domain.bo.InvCountPlanBo;
import com.klp.flow.domain.vo.InvCountPlanVo;
import com.klp.flow.domain.InvCountPlan;
import com.klp.flow.mapper.InvCountPlanMapper;
import com.klp.flow.service.IInvCountPlanService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 盘库计划主Service业务层处理
*
* @author klp
* @date 2026-06-22
*/
@RequiredArgsConstructor
@Service
public class InvCountPlanServiceImpl implements IInvCountPlanService {
private final InvCountPlanMapper baseMapper;
/**
* 查询盘库计划主
*/
@Override
public InvCountPlanVo queryById(Long planId){
return baseMapper.selectVoById(planId);
}
/**
* 查询盘库计划主列表
*/
@Override
public TableDataInfo<InvCountPlanVo> queryPageList(InvCountPlanBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<InvCountPlan> lqw = buildQueryWrapper(bo);
Page<InvCountPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询盘库计划主列表
*/
@Override
public List<InvCountPlanVo> queryList(InvCountPlanBo bo) {
LambdaQueryWrapper<InvCountPlan> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<InvCountPlan> buildQueryWrapper(InvCountPlanBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InvCountPlan> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getPlanCode()), InvCountPlan::getPlanCode, bo.getPlanCode());
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), InvCountPlan::getPlanName, bo.getPlanName());
lqw.eq(bo.getCountDate() != null, InvCountPlan::getCountDate, bo.getCountDate());
lqw.eq(bo.getDeadlineTime() != null, InvCountPlan::getDeadlineTime, bo.getDeadlineTime());
lqw.eq(bo.getCountUserId() != null, InvCountPlan::getCountUserId, bo.getCountUserId());
lqw.like(StringUtils.isNotBlank(bo.getCountUserName()), InvCountPlan::getCountUserName, bo.getCountUserName());
lqw.eq(bo.getPrincipalUserId() != null, InvCountPlan::getPrincipalUserId, bo.getPrincipalUserId());
lqw.like(StringUtils.isNotBlank(bo.getPrincipalUserName()), InvCountPlan::getPrincipalUserName, bo.getPrincipalUserName());
lqw.eq(StringUtils.isNotBlank(bo.getParticipantIds()), InvCountPlan::getParticipantIds, bo.getParticipantIds());
lqw.eq(StringUtils.isNotBlank(bo.getParticipantNames()), InvCountPlan::getParticipantNames, bo.getParticipantNames());
lqw.eq(bo.getPlanStatus() != null, InvCountPlan::getPlanStatus, bo.getPlanStatus());
lqw.eq(StringUtils.isNotBlank(bo.getAttachFile()), InvCountPlan::getAttachFile, bo.getAttachFile());
return lqw;
}
/**
* 新增盘库计划主
*/
@Override
public Boolean insertByBo(InvCountPlanBo bo) {
InvCountPlan add = BeanUtil.toBean(bo, InvCountPlan.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setPlanId(add.getPlanId());
}
return flag;
}
/**
* 修改盘库计划主
*/
@Override
public Boolean updateByBo(InvCountPlanBo bo) {
InvCountPlan update = BeanUtil.toBean(bo, InvCountPlan.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(InvCountPlan entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除盘库计划主
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,124 @@
package com.klp.flow.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.flow.domain.bo.InvCountPlanWarehouseBo;
import com.klp.flow.domain.vo.InvCountPlanWarehouseVo;
import com.klp.flow.domain.InvCountPlanWarehouse;
import com.klp.flow.mapper.InvCountPlanWarehouseMapper;
import com.klp.flow.service.IInvCountPlanWarehouseService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 盘库计划-库区关联Service业务层处理
*
* @author klp
* @date 2026-06-22
*/
@RequiredArgsConstructor
@Service
public class InvCountPlanWarehouseServiceImpl implements IInvCountPlanWarehouseService {
private final InvCountPlanWarehouseMapper baseMapper;
/**
* 查询盘库计划-库区关联
*/
@Override
public InvCountPlanWarehouseVo queryById(Long relId){
return baseMapper.selectVoById(relId);
}
/**
* 查询盘库计划-库区关联列表
*/
@Override
public TableDataInfo<InvCountPlanWarehouseVo> queryPageList(InvCountPlanWarehouseBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<InvCountPlanWarehouse> lqw = buildQueryWrapper(bo);
Page<InvCountPlanWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询盘库计划-库区关联列表
*/
@Override
public List<InvCountPlanWarehouseVo> queryList(InvCountPlanWarehouseBo bo) {
LambdaQueryWrapper<InvCountPlanWarehouse> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<InvCountPlanWarehouse> buildQueryWrapper(InvCountPlanWarehouseBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InvCountPlanWarehouse> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getPlanId() != null, InvCountPlanWarehouse::getPlanId, bo.getPlanId());
lqw.eq(bo.getWarehouseId() != null, InvCountPlanWarehouse::getWarehouseId, bo.getWarehouseId());
lqw.like(StringUtils.isNotBlank(bo.getWarehouseName()), InvCountPlanWarehouse::getWarehouseName, bo.getWarehouseName());
lqw.eq(bo.getActualWarehouseId() != null, InvCountPlanWarehouse::getActualWarehouseId, bo.getActualWarehouseId());
lqw.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), InvCountPlanWarehouse::getActualWarehouseName, bo.getActualWarehouseName());
lqw.eq(bo.getSystemCoilCount() != null, InvCountPlanWarehouse::getSystemCoilCount, bo.getSystemCoilCount());
lqw.eq(bo.getSystemTotalWeight() != null, InvCountPlanWarehouse::getSystemTotalWeight, bo.getSystemTotalWeight());
lqw.eq(bo.getActualCoilCount() != null, InvCountPlanWarehouse::getActualCoilCount, bo.getActualCoilCount());
lqw.eq(bo.getActualTotalWeight() != null, InvCountPlanWarehouse::getActualTotalWeight, bo.getActualTotalWeight());
lqw.eq(bo.getIsConsistent() != null, InvCountPlanWarehouse::getIsConsistent, bo.getIsConsistent());
lqw.eq(bo.getIoStartTime() != null, InvCountPlanWarehouse::getIoStartTime, bo.getIoStartTime());
lqw.eq(bo.getIoEndTime() != null, InvCountPlanWarehouse::getIoEndTime, bo.getIoEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getSnapshotIoRecord()), InvCountPlanWarehouse::getSnapshotIoRecord, bo.getSnapshotIoRecord());
lqw.eq(StringUtils.isNotBlank(bo.getSnapshotCoilLogic()), InvCountPlanWarehouse::getSnapshotCoilLogic, bo.getSnapshotCoilLogic());
lqw.eq(StringUtils.isNotBlank(bo.getSnapshotCoilActual()), InvCountPlanWarehouse::getSnapshotCoilActual, bo.getSnapshotCoilActual());
lqw.eq(StringUtils.isNotBlank(bo.getSnapshotCoilStats()), InvCountPlanWarehouse::getSnapshotCoilStats, bo.getSnapshotCoilStats());
return lqw;
}
/**
* 新增盘库计划-库区关联
*/
@Override
public Boolean insertByBo(InvCountPlanWarehouseBo bo) {
InvCountPlanWarehouse add = BeanUtil.toBean(bo, InvCountPlanWarehouse.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setRelId(add.getRelId());
}
return flag;
}
/**
* 修改盘库计划-库区关联
*/
@Override
public Boolean updateByBo(InvCountPlanWarehouseBo bo) {
InvCountPlanWarehouse update = BeanUtil.toBean(bo, InvCountPlanWarehouse.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(InvCountPlanWarehouse entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除盘库计划-库区关联
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,170 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.WmsCoilContractRelVo;
import com.klp.flow.domain.bo.TsAcceptCoilRelBo;
import com.klp.flow.domain.vo.TsAcceptCoilRelVo;
import com.klp.flow.domain.TsAcceptCoilRel;
import com.klp.flow.mapper.TsAcceptCoilRelMapper;
import com.klp.flow.service.ITsAcceptCoilRelService;
import com.klp.mapper.WmsMaterialCoilMapper;
import com.klp.mapper.WmsCoilContractRelMapper;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Collections;
import java.util.stream.Collectors;
/**
* 受理单关联钢卷中间Service业务层处理
*
* @author klp
* @date 2026-06-18
*/
@RequiredArgsConstructor
@Service
public class TsAcceptCoilRelServiceImpl implements ITsAcceptCoilRelService {
private final TsAcceptCoilRelMapper baseMapper;
private final WmsMaterialCoilMapper wmsMaterialCoilMapper;
private final WmsCoilContractRelMapper wmsCoilContractRelMapper;
/**
* 查询受理单关联钢卷中间
*/
@Override
public TsAcceptCoilRelVo queryById(Long relId){
TsAcceptCoilRelVo vo = baseMapper.selectVoById(relId);
if (vo != null) {
enrichWithCoilInfo(Collections.singletonList(vo));
}
return vo;
}
/**
* 查询受理单关联钢卷中间列表
*/
@Override
public TableDataInfo<TsAcceptCoilRelVo> queryPageList(TsAcceptCoilRelBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TsAcceptCoilRel> lqw = buildQueryWrapper(bo);
Page<TsAcceptCoilRelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
enrichWithCoilInfo(result.getRecords());
return TableDataInfo.build(result);
}
/**
* 查询受理单关联钢卷中间列表
*/
@Override
public List<TsAcceptCoilRelVo> queryList(TsAcceptCoilRelBo bo) {
LambdaQueryWrapper<TsAcceptCoilRel> lqw = buildQueryWrapper(bo);
List<TsAcceptCoilRelVo> list = baseMapper.selectVoList(lqw);
enrichWithCoilInfo(list);
return list;
}
/**
* 根据关联表中的coilId批量查询钢卷信息并填充到VO中
* 同时批量查询钢卷关联的合同/订单信息
*/
private void enrichWithCoilInfo(List<TsAcceptCoilRelVo> voList) {
if (voList == null || voList.isEmpty()) {
return;
}
// 收集所有coilId去重
List<Long> coilIds = voList.stream()
.map(TsAcceptCoilRelVo::getCoilId)
.filter(id -> id != null)
.distinct()
.collect(Collectors.toList());
if (coilIds.isEmpty()) {
return;
}
// 批量查询钢卷信息
QueryWrapper<WmsMaterialCoil> qw = new QueryWrapper<>();
qw.in("mc.coil_id", coilIds);
qw.eq("mc.del_flag", 0);
qw.orderByDesc("mc.create_time");
List<WmsMaterialCoilVo> coilList = wmsMaterialCoilMapper.selectVoListWithDynamicJoin(qw);
// 按coilId建立索引
Map<Long, WmsMaterialCoilVo> coilMap = coilList.stream()
.collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, c -> c, (a, b) -> a));
// 批量查询钢卷关联的合同/订单信息一次SQLJOIN crm_order
List<WmsCoilContractRelVo> allOrderList = wmsCoilContractRelMapper.selectOrdersByCoilIds(coilIds);
// 按coilId分组
Map<Long, List<WmsCoilContractRelVo>> orderMap = allOrderList.stream()
.collect(Collectors.groupingBy(WmsCoilContractRelVo::getCoilId));
// 填充到VO中
for (TsAcceptCoilRelVo vo : voList) {
if (vo.getCoilId() != null) {
WmsMaterialCoilVo coilInfo = coilMap.get(vo.getCoilId());
if (coilInfo != null) {
// 填充合同/订单列表
coilInfo.setOrderList(orderMap.get(vo.getCoilId()));
}
vo.setCoilInfo(coilInfo);
}
}
}
private LambdaQueryWrapper<TsAcceptCoilRel> buildQueryWrapper(TsAcceptCoilRelBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsAcceptCoilRel> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAcceptId() != null, TsAcceptCoilRel::getAcceptId, bo.getAcceptId());
lqw.eq(bo.getCoilId() != null, TsAcceptCoilRel::getCoilId, bo.getCoilId());
return lqw;
}
/**
* 新增受理单关联钢卷中间
*/
@Override
public Boolean insertByBo(TsAcceptCoilRelBo bo) {
TsAcceptCoilRel add = BeanUtil.toBean(bo, TsAcceptCoilRel.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setRelId(add.getRelId());
}
return flag;
}
/**
* 修改受理单关联钢卷中间
*/
@Override
public Boolean updateByBo(TsAcceptCoilRelBo bo) {
TsAcceptCoilRel update = BeanUtil.toBean(bo, TsAcceptCoilRel.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TsAcceptCoilRel entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除受理单关联钢卷中间
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,204 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.domain.entity.SysDictData;
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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.core.domain.entity.SysDictData;
import com.klp.common.utils.StringUtils;
import com.klp.system.service.ISysDictDataService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.flow.domain.bo.TsComplaintAcceptBo;
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.flow.domain.TsComplaintAccept;
import com.klp.flow.domain.TsComplaintTask;
import com.klp.flow.domain.TsPlanExecuteRel;
import com.klp.flow.domain.TsAcceptCoilRel;
import com.klp.flow.mapper.TsComplaintAcceptMapper;
import com.klp.flow.mapper.TsComplaintTaskMapper;
import com.klp.flow.mapper.TsPlanExecuteRelMapper;
import com.klp.flow.mapper.TsAcceptCoilRelMapper;
import com.klp.flow.service.ITsComplaintAcceptService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 投诉受理单主Service业务层处理
*
* @author klp
* @date 2026-06-18
*/
@RequiredArgsConstructor
@Service
public class TsComplaintAcceptServiceImpl implements ITsComplaintAcceptService {
private final TsComplaintAcceptMapper baseMapper;
private final TsComplaintTaskMapper tsComplaintTaskMapper;
private final TsPlanExecuteRelMapper tsPlanExecuteRelMapper;
private final TsAcceptCoilRelMapper tsAcceptCoilRelMapper;
private final ISysDictDataService sysDictDataService;
/**
* 查询投诉受理单主
*/
@Override
public TsComplaintAcceptVo queryById(Long acceptId){
return baseMapper.selectVoById(acceptId);
}
/**
* 查询投诉受理单主列表
*/
@Override
public TableDataInfo<TsComplaintAcceptVo> queryPageList(TsComplaintAcceptBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TsComplaintAccept> lqw = buildQueryWrapper(bo);
Page<TsComplaintAcceptVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询投诉受理单主列表
*/
@Override
public List<TsComplaintAcceptVo> queryList(TsComplaintAcceptBo bo) {
LambdaQueryWrapper<TsComplaintAccept> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TsComplaintAccept> buildQueryWrapper(TsComplaintAcceptBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsComplaintAccept> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getComplaintNo()), TsComplaintAccept::getComplaintNo, bo.getComplaintNo());
lqw.eq(bo.getComplaintDate() != null, TsComplaintAccept::getComplaintDate, bo.getComplaintDate());
lqw.eq(StringUtils.isNotBlank(bo.getComplaintContent()), TsComplaintAccept::getComplaintContent, bo.getComplaintContent());
lqw.eq(StringUtils.isNotBlank(bo.getCustomerDemand()), TsComplaintAccept::getCustomerDemand, bo.getCustomerDemand());
lqw.eq(StringUtils.isNotBlank(bo.getFile()), TsComplaintAccept::getFile, bo.getFile());
lqw.eq(bo.getAuditStatus() != null, TsComplaintAccept::getAuditStatus, bo.getAuditStatus());
lqw.eq(StringUtils.isNotBlank(bo.getAuditOpinion()), TsComplaintAccept::getAuditOpinion, bo.getAuditOpinion());
lqw.eq(bo.getAuditUserId() != null, TsComplaintAccept::getAuditUserId, bo.getAuditUserId());
lqw.eq(bo.getAuditTime() != null, TsComplaintAccept::getAuditTime, bo.getAuditTime());
lqw.eq(bo.getFlowStatus() != null, TsComplaintAccept::getFlowStatus, bo.getFlowStatus());
lqw.eq(bo.getPrincipalUserId() != null, TsComplaintAccept::getPrincipalUserId, bo.getPrincipalUserId());
lqw.eq(StringUtils.isNotBlank(bo.getPlanContent()), TsComplaintAccept::getPlanContent, bo.getPlanContent());
lqw.in(bo.getAcceptIds() != null && !bo.getAcceptIds().isEmpty(), TsComplaintAccept::getAcceptId, bo.getAcceptIds());
return lqw;
}
/**
* 新增投诉受理单主
*/
@Override
public Boolean insertByBo(TsComplaintAcceptBo bo) {
TsComplaintAccept add = BeanUtil.toBean(bo, TsComplaintAccept.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setAcceptId(add.getAcceptId());
// 批量插入关联钢卷
if (bo.getCoilIds() != null && !bo.getCoilIds().isEmpty()) {
List<TsAcceptCoilRel> relList = bo.getCoilIds().stream().map(coilId -> {
TsAcceptCoilRel rel = new TsAcceptCoilRel();
rel.setAcceptId(add.getAcceptId());
rel.setCoilId(coilId);
return rel;
}).collect(java.util.stream.Collectors.toList());
tsAcceptCoilRelMapper.insertBatch(relList);
}
}
return flag;
}
/**
* 修改投诉受理单主
*/
@Override
public Boolean updateByBo(TsComplaintAcceptBo bo) {
TsComplaintAccept update = BeanUtil.toBean(bo, TsComplaintAccept.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 意见下发
* 修改受理单flow_status=2按字典flow_coil_objection的部门创建代办任务
*/
@Override
public Boolean opinionDispatch(Long acceptId) {
if (acceptId == null) {
return false;
}
// 从sys_dict_data直查根据dict_type=flow_coil_objection获取部门ID列表
List<SysDictData> dictList = sysDictDataService.selectDictDataByTypeRealtime("flow_coil_objection");
if (dictList == null || dictList.isEmpty()) {
return false;
}
// 更新受理单流程状态为2部门意见填写中
LambdaUpdateWrapper<TsComplaintAccept> uw = Wrappers.lambdaUpdate();
uw.eq(TsComplaintAccept::getAcceptId, acceptId)
.set(TsComplaintAccept::getFlowStatus, 2L);
baseMapper.update(null, uw);
// 按部门创建代办任务
for (SysDictData dict : dictList) {
TsComplaintTask task = new TsComplaintTask();
task.setAcceptId(acceptId);
task.setDeptId(Long.valueOf(dict.getDictValue()));
task.setTaskStatus(0L);
tsComplaintTaskMapper.insert(task);
}
return true;
}
/**
* 反馈下发
* 修改受理单flow_status=4按传入部门创建执行反馈记录
*/
@Override
public Boolean feedbackDispatch(Long acceptId, List<Long> deptIds) {
if (acceptId == null || deptIds == null || deptIds.isEmpty()) {
return false;
}
// 更新受理单流程状态为4方案下发执行反馈中
LambdaUpdateWrapper<TsComplaintAccept> uw = Wrappers.lambdaUpdate();
uw.eq(TsComplaintAccept::getAcceptId, acceptId)
.set(TsComplaintAccept::getFlowStatus, 4L);
baseMapper.update(null, uw);
// 按部门创建执行反馈记录
for (Long deptId : deptIds) {
TsPlanExecuteRel rel = new TsPlanExecuteRel();
rel.setAcceptId(acceptId);
rel.setDeptId(deptId);
rel.setExecuteStatus(0L);
tsPlanExecuteRelMapper.insert(rel);
}
return true;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TsComplaintAccept entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除投诉受理单主
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,194 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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 com.klp.flow.domain.TsComplaintAccept;
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.flow.mapper.TsComplaintAcceptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.flow.domain.bo.TsComplaintTaskBo;
import com.klp.flow.domain.vo.TsComplaintTaskVo;
import com.klp.flow.domain.TsComplaintTask;
import com.klp.flow.mapper.TsComplaintTaskMapper;
import com.klp.flow.service.ITsComplaintTaskService;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* 各部门投诉代办任务&意见Service业务层处理
*
* @author klp
* @date 2026-06-18
*/
@RequiredArgsConstructor
@Service
public class TsComplaintTaskServiceImpl implements ITsComplaintTaskService {
private final TsComplaintTaskMapper baseMapper;
private final TsComplaintAcceptMapper tsComplaintAcceptMapper;
/**
* 查询各部门投诉代办任务&意见
*/
@Override
public TsComplaintTaskVo queryById(Long taskId){
TsComplaintTaskVo vo = baseMapper.selectVoById(taskId);
if (vo != null) {
enrichWithAcceptInfo(Collections.singletonList(vo));
}
return vo;
}
/**
* 查询各部门投诉代办任务&意见列表
*/
@Override
public TableDataInfo<TsComplaintTaskVo> queryPageList(TsComplaintTaskBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TsComplaintTask> lqw = buildQueryWrapper(bo);
Page<TsComplaintTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
enrichWithAcceptInfo(result.getRecords());
return TableDataInfo.build(result);
}
/**
* 查询各部门投诉代办任务&意见列表
*/
@Override
public List<TsComplaintTaskVo> queryList(TsComplaintTaskBo bo) {
LambdaQueryWrapper<TsComplaintTask> lqw = buildQueryWrapper(bo);
List<TsComplaintTaskVo> list = baseMapper.selectVoList(lqw);
enrichWithAcceptInfo(list);
return list;
}
/**
* 批量查询受理单信息并填充到VO中
*/
private void enrichWithAcceptInfo(List<TsComplaintTaskVo> voList) {
if (CollUtil.isEmpty(voList)) {
return;
}
// 收集所有acceptId去重
List<Long> acceptIds = voList.stream()
.map(TsComplaintTaskVo::getAcceptId)
.filter(id -> id != null)
.distinct()
.collect(Collectors.toList());
if (acceptIds.isEmpty()) {
return;
}
// 批量查询受理单信息
List<TsComplaintAcceptVo> acceptList = tsComplaintAcceptMapper.selectVoBatchIds(acceptIds);
// 按acceptId建立索引
Map<Long, TsComplaintAcceptVo> acceptMap = acceptList.stream()
.collect(Collectors.toMap(TsComplaintAcceptVo::getAcceptId, a -> a, (a, b) -> a));
// 填充到VO中
for (TsComplaintTaskVo vo : voList) {
if (vo.getAcceptId() != null) {
vo.setAcceptInfo(acceptMap.get(vo.getAcceptId()));
}
}
}
private LambdaQueryWrapper<TsComplaintTask> buildQueryWrapper(TsComplaintTaskBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsComplaintTask> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAcceptId() != null, TsComplaintTask::getAcceptId, bo.getAcceptId());
lqw.eq(bo.getDeptId() != null, TsComplaintTask::getDeptId, bo.getDeptId());
lqw.eq(bo.getTaskStatus() != null, TsComplaintTask::getTaskStatus, bo.getTaskStatus());
lqw.eq(StringUtils.isNotBlank(bo.getFillNo()), TsComplaintTask::getFillNo, bo.getFillNo());
lqw.eq(StringUtils.isNotBlank(bo.getDeptOpinion()), TsComplaintTask::getDeptOpinion, bo.getDeptOpinion());
lqw.eq(bo.getFillUserId() != null, TsComplaintTask::getFillUserId, bo.getFillUserId());
lqw.eq(bo.getFillTime() != null, TsComplaintTask::getFillTime, bo.getFillTime());
lqw.eq(StringUtils.isNotBlank(bo.getFillFile()), TsComplaintTask::getFillFile, bo.getFillFile());
return lqw;
}
/**
* 新增各部门投诉代办任务&意见
*/
@Override
public Boolean insertByBo(TsComplaintTaskBo bo) {
TsComplaintTask add = BeanUtil.toBean(bo, TsComplaintTask.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTaskId(add.getTaskId());
// 同步受理单流程状态
syncAcceptFlowStatus(add.getAcceptId());
}
return flag;
}
/**
* 修改各部门投诉代办任务&意见
*/
@Override
public Boolean updateByBo(TsComplaintTaskBo bo) {
TsComplaintTask update = BeanUtil.toBean(bo, TsComplaintTask.class);
validEntityBeforeSave(update);
boolean flag = baseMapper.updateById(update) > 0;
if (flag){
syncAcceptFlowStatus(update.getAcceptId());
}
return flag;
}
/**
* 同步受理单流程状态
* 查看当前受理单下所有代办任务:
* - 所有task_status都为1 → flow_status = 3待总负责人汇总方案
* flow_status=2由意见下发接口设置此处不再处理
*/
private void syncAcceptFlowStatus(Long acceptId) {
if (acceptId == null) {
return;
}
// 查询该受理单下所有未删除的代办任务
List<TsComplaintTask> taskList = baseMapper.selectList(
Wrappers.<TsComplaintTask>lambdaQuery()
.eq(TsComplaintTask::getAcceptId, acceptId)
);
// 判断所有任务是否都已完成taskStatus = 1
boolean allCompleted = !taskList.isEmpty() && taskList.stream()
.allMatch(task -> task.getTaskStatus() != null && task.getTaskStatus() == 1L);
if (allCompleted) {
// 更新受理单流程状态为3待总负责人汇总方案
LambdaUpdateWrapper<TsComplaintAccept> uw = Wrappers.lambdaUpdate();
uw.eq(TsComplaintAccept::getAcceptId, acceptId)
.set(TsComplaintAccept::getFlowStatus, 3L);
tsComplaintAcceptMapper.update(null, uw);
}
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TsComplaintTask entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除各部门投诉代办任务&意见
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,191 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.flow.domain.TsComplaintAccept;
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
import com.klp.flow.domain.vo.TsComplaintTaskVo;
import com.klp.flow.mapper.TsComplaintAcceptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.flow.domain.bo.TsPlanExecuteRelBo;
import com.klp.flow.domain.vo.TsPlanExecuteRelVo;
import com.klp.flow.domain.TsPlanExecuteRel;
import com.klp.flow.mapper.TsPlanExecuteRelMapper;
import com.klp.flow.service.ITsPlanExecuteRelService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 最终方案下发部门及执行反馈Service业务层处理
*
* @author klp
* @date 2026-06-18
*/
@RequiredArgsConstructor
@Service
public class TsPlanExecuteRelServiceImpl implements ITsPlanExecuteRelService {
private final TsPlanExecuteRelMapper baseMapper;
private final TsComplaintAcceptMapper tsComplaintAcceptMapper;
/**
* 查询最终方案下发部门及执行反馈
*/
@Override
public TsPlanExecuteRelVo queryById(Long relId){
return baseMapper.selectVoById(relId);
}
/**
* 查询最终方案下发部门及执行反馈列表
*/
@Override
public TableDataInfo<TsPlanExecuteRelVo> queryPageList(TsPlanExecuteRelBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TsPlanExecuteRel> lqw = buildQueryWrapper(bo);
Page<TsPlanExecuteRelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
enrichWithAcceptInfo(result.getRecords());
return TableDataInfo.build(result);
}
/**
* 批量查询受理单信息并填充到VO中
*/
private void enrichWithAcceptInfo(List<TsPlanExecuteRelVo> voList) {
if (CollUtil.isEmpty(voList)) {
return;
}
// 收集所有acceptId去重
List<Long> acceptIds = voList.stream()
.map(TsPlanExecuteRelVo::getAcceptId)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
if (acceptIds.isEmpty()) {
return;
}
// 批量查询受理单信息
List<TsComplaintAcceptVo> acceptList = tsComplaintAcceptMapper.selectVoBatchIds(acceptIds);
// 按acceptId建立索引
Map<Long, TsComplaintAcceptVo> acceptMap = acceptList.stream()
.collect(Collectors.toMap(TsComplaintAcceptVo::getAcceptId, a -> a, (a, b) -> a));
// 填充到VO中
for (TsPlanExecuteRelVo vo : voList) {
if (vo.getAcceptId() != null) {
vo.setAcceptInfo(acceptMap.get(vo.getAcceptId()));
}
}
}
/**
* 查询最终方案下发部门及执行反馈列表
*/
@Override
public List<TsPlanExecuteRelVo> queryList(TsPlanExecuteRelBo bo) {
LambdaQueryWrapper<TsPlanExecuteRel> lqw = buildQueryWrapper(bo);
List<TsPlanExecuteRelVo> tsPlanExecuteRelVos = baseMapper.selectVoList(lqw);
enrichWithAcceptInfo(tsPlanExecuteRelVos);
return tsPlanExecuteRelVos;
}
private LambdaQueryWrapper<TsPlanExecuteRel> buildQueryWrapper(TsPlanExecuteRelBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsPlanExecuteRel> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAcceptId() != null, TsPlanExecuteRel::getAcceptId, bo.getAcceptId());
lqw.eq(bo.getDeptId() != null, TsPlanExecuteRel::getDeptId, bo.getDeptId());
lqw.eq(bo.getExecuteStatus() != null, TsPlanExecuteRel::getExecuteStatus, bo.getExecuteStatus());
lqw.eq(StringUtils.isNotBlank(bo.getExecuteResult()), TsPlanExecuteRel::getExecuteResult, bo.getExecuteResult());
lqw.eq(StringUtils.isNotBlank(bo.getFeedbackNo()), TsPlanExecuteRel::getFeedbackNo, bo.getFeedbackNo());
lqw.eq(bo.getFeedbackUserId() != null, TsPlanExecuteRel::getFeedbackUserId, bo.getFeedbackUserId());
lqw.eq(bo.getFeedbackTime() != null, TsPlanExecuteRel::getFeedbackTime, bo.getFeedbackTime());
lqw.eq(StringUtils.isNotBlank(bo.getFeedbackFile()), TsPlanExecuteRel::getFeedbackFile, bo.getFeedbackFile());
return lqw;
}
/**
* 新增最终方案下发部门及执行反馈
*/
@Override
public Boolean insertByBo(TsPlanExecuteRelBo bo) {
TsPlanExecuteRel add = BeanUtil.toBean(bo, TsPlanExecuteRel.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setRelId(add.getRelId());
// 同步受理单流程状态
syncAcceptFlowStatus(add.getAcceptId());
}
return flag;
}
/**
* 修改最终方案下发部门及执行反馈
*/
@Override
public Boolean updateByBo(TsPlanExecuteRelBo bo) {
TsPlanExecuteRel update = BeanUtil.toBean(bo, TsPlanExecuteRel.class);
validEntityBeforeSave(update);
boolean flag = baseMapper.updateById(update) > 0;
if (flag) {
syncAcceptFlowStatus(update.getAcceptId());
}
return flag;
}
/**
* 同步受理单流程状态
* 查看当前受理单下所有执行反馈:
* - 所有execute_status都为1 → flow_status = 5全部办结
* flow_status=4由反馈下发接口设置此处不再处理
*/
private void syncAcceptFlowStatus(Long acceptId) {
if (acceptId == null) {
return;
}
// 查询该受理单下所有执行反馈记录
List<TsPlanExecuteRel> relList = baseMapper.selectList(
Wrappers.<TsPlanExecuteRel>lambdaQuery()
.eq(TsPlanExecuteRel::getAcceptId, acceptId)
);
// 判断所有执行反馈是否都已完成executeStatus = 1
boolean allCompleted = !relList.isEmpty() && relList.stream()
.allMatch(rel -> rel.getExecuteStatus() != null && rel.getExecuteStatus() == 1L);
if (allCompleted) {
// 更新受理单流程状态为5全部办结
LambdaUpdateWrapper<TsComplaintAccept> uw = Wrappers.lambdaUpdate();
uw.eq(TsComplaintAccept::getAcceptId, acceptId)
.set(TsComplaintAccept::getFlowStatus, 5L);
tsComplaintAcceptMapper.update(null, uw);
}
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TsPlanExecuteRel entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除最终方案下发部门及执行反馈
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.InvCountDiscrepancyMapper">
<resultMap type="com.klp.flow.domain.InvCountDiscrepancy" id="InvCountDiscrepancyResult">
<result property="discrepancyId" column="discrepancy_id"/>
<result property="relId" column="rel_id"/>
<result property="discrepancyType" column="discrepancy_type"/>
<result property="coilId" column="coil_id"/>
<result property="enterCoilNo" column="enter_coil_no"/>
<result property="discrepancyDetail" column="discrepancy_detail"/>
<result property="reasonAnalysis" column="reason_analysis"/>
<result property="processSuggestion" column="process_suggestion"/>
<result property="processResult" column="process_result"/>
<result property="processStatus" column="process_status"/>
<result property="processUserId" column="process_user_id"/>
<result property="processUserName" column="process_user_name"/>
<result property="processTime" column="process_time"/>
<result property="attachFile" column="attach_file"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.InvCountPlanMapper">
<resultMap type="com.klp.flow.domain.InvCountPlan" id="InvCountPlanResult">
<result property="planId" column="plan_id"/>
<result property="planCode" column="plan_code"/>
<result property="planName" column="plan_name"/>
<result property="countDate" column="count_date"/>
<result property="deadlineTime" column="deadline_time"/>
<result property="countUserId" column="count_user_id"/>
<result property="countUserName" column="count_user_name"/>
<result property="principalUserId" column="principal_user_id"/>
<result property="principalUserName" column="principal_user_name"/>
<result property="participantIds" column="participant_ids"/>
<result property="participantNames" column="participant_names"/>
<result property="planStatus" column="plan_status"/>
<result property="attachFile" column="attach_file"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.InvCountPlanWarehouseMapper">
<resultMap type="com.klp.flow.domain.InvCountPlanWarehouse" id="InvCountPlanWarehouseResult">
<result property="relId" column="rel_id"/>
<result property="planId" column="plan_id"/>
<result property="warehouseId" column="warehouse_id"/>
<result property="warehouseName" column="warehouse_name"/>
<result property="actualWarehouseId" column="actual_warehouse_id"/>
<result property="actualWarehouseName" column="actual_warehouse_name"/>
<result property="systemCoilCount" column="system_coil_count"/>
<result property="systemTotalWeight" column="system_total_weight"/>
<result property="actualCoilCount" column="actual_coil_count"/>
<result property="actualTotalWeight" column="actual_total_weight"/>
<result property="isConsistent" column="is_consistent"/>
<result property="ioStartTime" column="io_start_time"/>
<result property="ioEndTime" column="io_end_time"/>
<result property="snapshotIoRecord" column="snapshot_io_record"/>
<result property="snapshotCoilLogic" column="snapshot_coil_logic"/>
<result property="snapshotCoilActual" column="snapshot_coil_actual"/>
<result property="snapshotCoilStats" column="snapshot_coil_stats"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.TsAcceptCoilRelMapper">
<resultMap type="com.klp.flow.domain.TsAcceptCoilRel" id="TsAcceptCoilRelResult">
<result property="relId" column="rel_id"/>
<result property="acceptId" column="accept_id"/>
<result property="coilId" column="coil_id"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.TsComplaintAcceptMapper">
<resultMap type="com.klp.flow.domain.TsComplaintAccept" id="TsComplaintAcceptResult">
<result property="acceptId" column="accept_id"/>
<result property="complaintNo" column="complaint_no"/>
<result property="complaintDate" column="complaint_date"/>
<result property="complaintContent" column="complaint_content"/>
<result property="customerDemand" column="customer_demand"/>
<result property="file" column="file"/>
<result property="auditStatus" column="audit_status"/>
<result property="auditOpinion" column="audit_opinion"/>
<result property="auditUserId" column="audit_user_id"/>
<result property="auditTime" column="audit_time"/>
<result property="flowStatus" column="flow_status"/>
<result property="principalUserId" column="principal_user_id"/>
<result property="planContent" column="plan_content"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.TsComplaintTaskMapper">
<resultMap type="com.klp.flow.domain.TsComplaintTask" id="TsComplaintTaskResult">
<result property="taskId" column="task_id"/>
<result property="acceptId" column="accept_id"/>
<result property="deptId" column="dept_id"/>
<result property="taskStatus" column="task_status"/>
<result property="fillNo" column="fill_no"/>
<result property="deptOpinion" column="dept_opinion"/>
<result property="fillUserId" column="fill_user_id"/>
<result property="fillTime" column="fill_time"/>
<result property="fillFile" column="fill_file"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.flow.mapper.TsPlanExecuteRelMapper">
<resultMap type="com.klp.flow.domain.TsPlanExecuteRel" id="TsPlanExecuteRelResult">
<result property="relId" column="rel_id"/>
<result property="acceptId" column="accept_id"/>
<result property="deptId" column="dept_id"/>
<result property="executeStatus" column="execute_status"/>
<result property="executeResult" column="execute_result"/>
<result property="feedbackNo" column="feedback_no"/>
<result property="feedbackUserId" column="feedback_user_id"/>
<result property="feedbackTime" column="feedback_time"/>
<result property="feedbackFile" column="feedback_file"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

View File

@@ -82,6 +82,9 @@ public class MesRollGrind extends BaseEntity {
/** 操作者 */
private String operator;
/** 复核人 */
private String reviewer;
/** 备注 */
private String remark;

View File

@@ -37,5 +37,6 @@ public class MesRollGrindBo extends BaseEntity {
private String flawResult;
private BigDecimal hardness;
private String operator;
private String reviewer;
private String remark;
}

View File

@@ -28,6 +28,7 @@ public class MesRollGrindVo {
private String flawResult;
private BigDecimal hardness;
private String operator;
private String reviewer;
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

View File

@@ -7,7 +7,7 @@
dia_before, dia_after, grind_amount, roll_shape,
flaw_result,
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
operator, remark, create_time
operator, reviewer, remark, create_time
FROM mes_roll_grind
WHERE del_flag = 0 AND roll_id = #{rollId}
ORDER BY grind_time Desc
@@ -18,7 +18,7 @@
g.dia_before, g.dia_after, g.grind_amount, g.roll_shape,
g.flaw_result,
CASE WHEN g.hardness = '未倒角' THEN 0 ELSE CAST(g.hardness AS DECIMAL(10,1)) END AS hardness,
g.operator, g.remark, g.create_time,
g.operator, g.reviewer, g.remark, g.create_time,
ri.roll_type
FROM mes_roll_grind g
LEFT JOIN mes_roll_info ri ON g.roll_id = ri.roll_id

View File

@@ -44,6 +44,7 @@
"@vue-office/excel": "^1.7.14",
"@vue/composition-api": "^1.7.2",
"axios": "0.24.0",
"beautiful-mermaid": "^1.1.3",
"bpmn-js-token-simulation": "0.10.0",
"clipboard": "2.0.8",
"core-js": "3.25.3",

View File

@@ -0,0 +1,430 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>冷轧厂业务流程泳道图</title>
<style>
*{margin:0;padding:0;box-sizing:border-box}
body{font-family:"Microsoft YaHei","SimHei",sans-serif;background:#f0f4f8;color:#1e293b;overflow-x:hidden}
.header{background:linear-gradient(135deg,#0f2b47 0%,#1a4a7a 50%,#2c6fad 100%);color:#fff;padding:14px 28px;display:flex;align-items:center;gap:16px;box-shadow:0 3px 16px rgba(0,0,0,.2)}
.header h1{font-size:20px;letter-spacing:2px;font-weight:700}
.header .tag{background:rgba(255,255,255,.1);border:1px solid rgba(255,255,255,.2);border-radius:12px;padding:3px 14px;font-size:11.5px}
.tabs-wrap{background:#dde3ec;padding:8px 16px 0;position:sticky;top:0;z-index:200;box-shadow:0 2px 6px rgba(0,0,0,.05)}
.tabs{display:flex;gap:3px;overflow-x:auto;padding-bottom:0}
.tabs::-webkit-scrollbar{height:0}
.tab{flex-shrink:0;padding:9px 16px;font-size:12px;border:none;background:transparent;cursor:pointer;border-radius:7px 7px 0 0;color:#5a6a7a;font-weight:500;transition:all .2s;white-space:nowrap}
.tab:hover{background:rgba(255,255,255,.5)}
.tab.on{background:#fff;color:#0f2b47;font-weight:700;box-shadow:0 -1px 4px rgba(0,0,0,.05)}
.tab .tn{display:inline-block;background:#3b6ea5;color:#fff;border-radius:50%;width:17px;height:17px;line-height:17px;font-size:9.5px;text-align:center;margin-right:4px}
.tab.on .tn{background:#1a4a7a}
.panel{display:none;padding:18px 20px 36px}
.panel.on{display:block}
/* ========== 公司架构图 ========== */
.org-outer{background:#fff;border-radius:10px;box-shadow:0 3px 16px rgba(0,0,0,.06);overflow-x:auto;padding:24px 16px 32px;position:relative}
.org-row{display:flex;justify-content:center;gap:10px;flex-wrap:wrap;position:relative;margin-bottom:2px}
.org-node{text-align:center;padding:8px 16px;border-radius:9px;font-weight:700;cursor:pointer;transition:all .2s;position:relative;z-index:2;white-space:nowrap}
.org-node:hover{transform:translateY(-2px);box-shadow:0 6px 20px rgba(0,0,0,.15)}
.org-node.lv0{background:linear-gradient(135deg,#0f2b47,#1a4a7a);color:#fff;font-size:15px;padding:13px 28px;min-width:220px}
.org-node.lv1{background:linear-gradient(135deg,#1e3a5f,#2563eb);color:#fff;font-size:13px;padding:9px 20px;min-width:160px}
.org-node.lv2{background:linear-gradient(135deg,#1d4ed8,#3b82f6);color:#fff;font-size:12px;padding:8px 14px;min-width:155px}
.org-node.lv3{background:#dbeafe;border:1.5px solid #60a5fa;color:#1e40af;font-size:11.5px;padding:6px 11px;min-width:120px;font-weight:600}
.org-node .nd-sub{font-size:9.5px;font-weight:400;opacity:.7;display:block;margin-top:2px}
.org-vline{width:2px;height:16px;background:#93c5fd;margin:0 auto}
.org-tip{text-align:center;font-size:11px;color:#94a3b8;margin-top:10px}
/* ========== 岗位职责 ========== */
.resp-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(370px,1fr));gap:16px}
.resp-card{background:#fff;border-radius:10px;box-shadow:0 2px 12px rgba(0,0,0,.05);overflow:hidden;transition:all .2s}
.resp-card:hover{box-shadow:0 4px 20px rgba(0,0,0,.1)}
.resp-hd{padding:14px 18px;cursor:pointer;display:flex;align-items:center;gap:12px;user-select:none;transition:background .2s}
.resp-hd:hover{background:#f0f5ff}
.resp-icon{width:42px;height:42px;border-radius:10px;display:flex;align-items:center;justify-content:center;font-size:18px;flex-shrink:0}
.resp-title{font-size:14px;font-weight:700;color:#1e293b}
.resp-sub{font-size:11px;color:#64748b;margin-top:2px}
.resp-arrow{margin-left:auto;font-size:12px;color:#94a3b8;transition:transform .3s}
.resp-card.open .resp-arrow{transform:rotate(90deg)}
.resp-bd{display:none;padding:0 18px 16px;border-top:1px solid #f1f5f9}
.resp-card.open .resp-bd{display:block}
.resp-item{padding:8px 0;border-bottom:1px solid #f8fafc;display:flex;gap:8px;font-size:12.5px;line-height:1.6}
.resp-item:last-child{border-bottom:none}
.resp-bullet{color:#3b82f6;font-weight:700;flex-shrink:0;margin-top:1px}
.resp-tag{display:inline-block;font-size:10px;padding:2px 8px;border-radius:4px;margin-left:8px;font-weight:500}
.resp-tag.core{background:#dbeafe;color:#1e40af}
.resp-tag.support{background:#dcfce7;color:#166534}
.resp-tag.check{background:#fef3c7;color:#92400e}
/* SVG连线动画 */
.sw-svg path{transition:opacity .3s}
.sw-svg path.line-walk{opacity:.85!important;stroke-width:2.8!important}
.sw-svg path.line-walk-done{opacity:.5!important}
.sw-svg path.line-dimmed{opacity:.08!important}
.footer{text-align:center;padding:18px;color:#94a3b8;font-size:10.5px}
</style>
</head>
<body>
<!-- <div class="header">
<h1>⚙️ 冷轧厂业务流程泳道图</h1>
<span class="tag">架构 · 岗位 · 10 条流程 · 步进回放</span>
</div> -->
<div class="tabs-wrap"><div class="tabs" id="tabs"></div></div>
<div id="panels"></div>
<!-- <div class="footer">冷轧厂业务流程泳道图 · 冶金自动化工程</div> -->
<script>
// ═══════════════════════════════════
// 数据定义
// ═══════════════════════════════════
const ORG_TREE = {
name:"股东大会 / 董事会", lv:0, sub:"最高决策层",
children:[
{name:"监事会", lv:1, sub:"监督审计", children:[]},
{name:"总经理", lv:1, sub:"全面经营管理", children:[
{name:"副总经理(生产/设备)", lv:2, sub:"生产运营+设备保障", children:[
{name:"生产部", lv:3, sub:"计划·调度·酸轧·连退·精整"},
{name:"设备部", lv:3, sub:"机械·电气·液压·点检"},
{name:"安全环保部", lv:3, sub:"安监·环保·培训"},
{name:"工厂/分厂厂长", lv:3, sub:"酸轧·连退·镀锌等车间"}
]},
{name:"副总经理(技术/质量)", lv:2, sub:"技术+质量管控", children:[
{name:"技术中心/研发部", lv:3, sub:"工艺标准·新产品开发"},
{name:"质量检验部", lv:3, sub:"来料检·过程检·成品检·实验室"},
{name:"理化检测中心", lv:3, sub:"力学·化学·金相分析"}
]},
{name:"副总经理(营销/供应链)", lv:2, sub:"销售+采购+物流", children:[
{name:"销售部", lv:3, sub:"国内·海外·大客户"},
{name:"采购部", lv:3, sub:"热轧卷·辅料·备件"},
{name:"物流仓储部", lv:3, sub:"原料库·成品库·运输调度"},
{name:"市场部", lv:3, sub:"市场分析·行业研究"}
]},
{name:"总工程师", lv:2, sub:"技术总负责", children:[
{name:"工艺技术科", lv:3, sub:"工艺规程·技术攻关"},
{name:"自动化信息科", lv:3, sub:"L2/MES·信息化"}
]},
{name:"财务总监", lv:2, sub:"资金+成本管控", children:[
{name:"财务部", lv:3, sub:"成本·预算·资金·税务"}
]},
{name:"职能支撑部门", lv:2, sub:"行政+IT+管理", children:[
{name:"综合管理部/办公室", lv:3, sub:"行政·人资·法务"},
{name:"企管部/运营改善部", lv:3, sub:"KPI·流程优化"},
{name:"IT信息化部", lv:3, sub:"ERP·网络·信息安全"}
]}
]}
]
};
const JOBS = [
{name:"生产部",icon:"🏭",color:"#3b82f6",bg:"#dbeafe",lead:"副总经理(生产/设备)",
duties:[
{t:"主生产计划编制与下达",d:"根据销售订单、产能、原料到货编制月/周主生产计划,分解至各产线",tag:"core"},
{t:"车间日/班次排产",d:"编制各车间日计划、班次排产表,协调产线切换与规格衔接",tag:"core"},
{t:"生产调度与异常协调",d:"实时监控产线运行状态,处理停机、改规、换辊等生产异常",tag:"core"},
{t:"订单进度跟踪与反馈",d:"跟踪订单从排产到完工全流程,向销售部反馈进度",tag:"core"},
{t:"产能平衡与瓶颈分析",d:"分析各产线产能利用率,识别瓶颈并提出改善建议",tag:"support"},
{t:"原料需求提报",d:"根据排产计划向采购部提报原料需求计划",tag:"support"}
]},
{name:"设备部",icon:"🔧",color:"#059669",bg:"#d1fae5",lead:"副总经理(生产/设备)",
duties:[
{t:"设备日常/专业点检",d:"执行日常点检、专业点检,记录设备状态数据",tag:"core"},
{t:"维修计划编制与实施",d:"编制定修/年修计划,组织实施维修作业",tag:"core"},
{t:"故障应急响应",d:"处理突发设备故障,组织抢修恢复生产",tag:"core"},
{t:"备件需求提报与管理",d:"提报备件采购需求,管理备件库存与台账",tag:"support"},
{t:"设备技术改造方案",d:"提出设备技改需求,配合总工程师评审方案",tag:"support"},
{t:"维修后验收与归档",d:"组织维修后设备验收,更新设备档案",tag:"check"}
]},
{name:"技术中心/研发部",icon:"🔬",color:"#7c3aed",bg:"#ede9fe",lead:"副总经理(技术/质量)",
duties:[
{t:"工艺标准/工艺卡制定",d:"制定各钢种、各产线工艺标准,编制工艺卡",tag:"core"},
{t:"新产品/新工艺开发",d:"研发新产品、新工艺路线,组织试制与验证",tag:"core"},
{t:"工艺参数下发与交底",d:"向车间下发工艺参数MES/纸质),组织新工艺交底",tag:"core"},
{t:"工艺异常分析与处置",d:"分析工艺异常原因,制定处置方案",tag:"core"},
{t:"工艺变更管理",d:"评审并管理工艺变更,确保变更受控可追溯",tag:"check"},
{t:"封锁品评审",d:"参与封锁品/待判品技术评审,给出处置建议",tag:"check"}
]},
{name:"质量检验部",icon:"✅",color:"#dc2626",bg:"#fee2e2",lead:"副总经理(技术/质量)",
duties:[
{t:"来料取样与检测",d:"对进厂原料/辅料取样检验,出具检验报告",tag:"core"},
{t:"来料合格/不合格判定",d:"依据标准判定来料是否合格,通知采购和仓储",tag:"core"},
{t:"过程检验",d:"按产线执行过程检验(酸洗、轧制、退火、镀锌等)",tag:"core"},
{t:"成品检验与判定",d:"对成品进行力学/表面/尺寸检验,做出合格/不合格判定",tag:"core"},
{t:"合格品放行",d:"确认成品检验合格后签发放行单,通知仓储发货",tag:"core"},
{t:"封锁品/待判品管理",d:"管理封锁品标识与隔离,组织技术中心评审",tag:"check"},
{t:"质量异议现场确认",d:"参与客户质量异议的实物确认与复检",tag:"check"}
]},
{name:"理化检测中心",icon:"🧪",color:"#b45309",bg:"#fef3c7",lead:"副总经理(技术/质量)",
duties:[
{t:"力学性能检测",d:"拉伸、硬度、冲击等力学性能测试",tag:"core"},
{t:"化学成分分析",d:"直读光谱、碳硫分析、化学成分测定",tag:"core"},
{t:"金相组织检验",d:"金相制样、显微组织观察与评级",tag:"core"},
{t:"镀层/涂层检测",d:"镀锌量、涂层厚度、附着力检测",tag:"core"},
{t:"检测报告出具",d:"出具标准检测报告,支持质量判定",tag:"support"}
]},
{name:"销售部",icon:"📊",color:"#2563eb",bg:"#dbeafe",lead:"副总经理(营销/供应链)",
duties:[
{t:"合同评审与签订",d:"组织合同交期/技术/产能评审,签订销售合同",tag:"core"},
{t:"下达销售订单",d:"先交技术中心确认工艺可行性,再下达生产部排产",tag:"core"},
{t:"发货计划编制与跟踪",d:"编制发货计划,跟踪发货确认与签收",tag:"core"},
{t:"质量异议接收与处理",d:"接收客户质量异议,协调技术/质检处理",tag:"core"},
{t:"客户关系维护与回访",d:"维护大客户关系,异议关闭后组织回访",tag:"support"},
{t:"市场信息反馈",d:"收集市场需求、价格走势信息,反馈至生产/技术",tag:"support"}
]},
{name:"采购部",icon:"📦",color:"#ca8a04",bg:"#fef9c3",lead:"副总经理(营销/供应链)",
duties:[
{t:"采购计划编制",d:"根据生产部/设备部需求编制原料/辅料/备件采购计划",tag:"core"},
{t:"采购订单下达与跟踪",d:"下达采购订单,跟踪交期与物流",tag:"core"},
{t:"到货通知与协调",d:"到货前通知物流仓储部准备接收",tag:"core"},
{t:"不合格品退货处理",d:"质量检验部判定不合格后协调退货",tag:"check"},
{t:"质量索赔",d:"对不合格来料向供应商发起质量索赔",tag:"check"},
{t:"供应商管理",d:"供应商资质评审、绩效评价、目录维护",tag:"support"}
]},
{name:"物流仓储部",icon:"🚛",color:"#0d9488",bg:"#ccfbf1",lead:"副总经理(营销/供应链)",
duties:[
{t:"原料入库与投料管理",d:"原料验收入库,按生产计划投料至各车间",tag:"core"},
{t:"成品入库与出库",d:"成品验收入库,按发货计划备货出库",tag:"core"},
{t:"到货接收与暂存",d:"到货暂存待检区,通知质检检验",tag:"core"},
{t:"发货/运输调度",d:"组织发货装车,调度运输",tag:"core"},
{t:"日常出入库记录",d:"记录每日出入库明细,维护库存台账",tag:"support"},
{t:"库存盘点与差异处理",d:"配合财务部进行定期盘点,处理账实差异",tag:"check"},
{t:"呆滞/封锁品报告",d:"定期报告呆滞品与封锁品,通知质检/财务",tag:"check"}
]},
{name:"安全环保部",icon:"🛡️",color:"#dc2626",bg:"#fee2e2",lead:"副总经理(生产/设备)",
duties:[
{t:"安全/环保培训",d:"组织全员安全培训、特种作业培训、环保培训",tag:"core"},
{t:"日常安全检查",d:"执行日常安全巡查,发现隐患并督促整改",tag:"core"},
{t:"环保监测",d:"监测废水、废气排放,确保达标",tag:"core"},
{t:"事故报告与调查",d:"安全事故报告、调查与处理",tag:"core"},
{t:"隐患整改跟踪",d:"跟踪车间隐患整改进度,闭环管理",tag:"check"},
{t:"外部检查对接",d:"对接政府安监/环保检查",tag:"support"}
]},
{name:"总工程师",icon:"🏗️",color:"#7c3aed",bg:"#ede9fe",lead:"总经理",
duties:[
{t:"技改方案评审",d:"评审技术改造方案的技术可行性",tag:"core"},
{t:"定修/年修计划审批",d:"审批定修/年修计划的技术方案",tag:"core"},
{t:"重大工艺变更审批",d:"审批重大工艺变更方案",tag:"core"},
{t:"项目实施协调",d:"协调技改项目实施中的停机窗口",tag:"core"},
{t:"验收与移交",d:"组织技改项目验收与设备移交",tag:"check"},
{t:"资料归档管理",d:"督促技改资料归档至综合管理部",tag:"support"}
]},
{name:"财务部",icon:"💰",color:"#059669",bg:"#d1fae5",lead:"财务总监",
duties:[
{t:"成本核算与分析",d:"各产线/产品成本核算,差异分析",tag:"core"},
{t:"预算编制与管控",d:"年度/月度预算编制,预算执行监控",tag:"core"},
{t:"开票与结算",d:"销售开票、采购付款结算",tag:"core"},
{t:"应收账款跟踪",d:"跟踪应收账款回收,预警逾期",tag:"core"},
{t:"定期盘点组织",d:"组织月/季/年度库存盘点",tag:"check"},
{t:"盘点差异处理",d:"盘点差异审核与账务调整",tag:"check"}
]},
{name:"综合管理部/办公室",icon:"📋",color:"#64748b",bg:"#f1f5f9",lead:"总经理",
duties:[
{t:"行政管理",d:"公司行政事务、会议组织、文件管理",tag:"core"},
{t:"人力资源管理",d:"招聘、培训、薪酬、绩效考核",tag:"core"},
{t:"法务管理",d:"合同审查、法律风险防控",tag:"core"},
{t:"事故调查配合",d:"配合安全环保部事故调查的行政工作",tag:"support"},
{t:"资料归档接收",d:"接收技改/项目归档资料",tag:"support"}
]},
{name:"IT信息化部",icon:"💻",color:"#2563eb",bg:"#dbeafe",lead:"总经理",
duties:[
{t:"MES/L2系统运维",d:"维护MES、L2系统稳定运行故障响应",tag:"core"},
{t:"ERP系统管理",d:"ERP系统配置、数据维护、用户权限管理",tag:"core"},
{t:"网络与信息安全",d:"网络基础设施运维,信息安全防护",tag:"core"},
{t:"系统开发与集成",d:"新系统开发、系统集成、报表定制",tag:"support"},
{t:"数据备份与容灾",d:"数据库备份、容灾方案实施",tag:"support"}
]},
{name:"各车间",icon:"⚙️",color:"#475569",bg:"#f1f5f9",lead:"工厂/分厂厂长",
duties:[
{t:"产线生产执行",d:"按排产计划执行生产作业,确保产量/质量达标",tag:"core"},
{t:"工艺纪律执行",d:"严格执行工艺参数,接受技术中心抽查",tag:"core"},
{t:"设备日常点检",d:"执行设备日常点检,上报隐患与故障",tag:"core"},
{t:"过程质量自检",d:"执行生产过程自检,配合质量检验部过程检",tag:"check"},
{t:"完工入库操作",d:"成品完工后办理入库/转库手续",tag:"support"},
{t:"安全与5S管理",d:"执行安全操作规程保持5S现场",tag:"check"}
]}
];
// ═══════════════════════════════════
// Tab 0: 公司架构图
// ═══════════════════════════════════
(function(){
const tb = document.createElement('button');
tb.className = 'tab on';
tb.innerHTML = '<span class="tn">🏢</span>公司架构';
document.getElementById('tabs').appendChild(tb);
const pn = document.createElement('div');
pn.className = 'panel on';
pn.id = 'org';
let h = '<div class="org-outer" id="org-outer">';
h += '<div class="org-row" id="org-r0" style="margin-bottom:10px">';
h += '<div class="org-node lv0" data-name="股东大会/董事会">股东大会 / 董事会<span class="nd-sub">最高决策层</span></div>';
h += '</div>';
const gmNode = ORG_TREE.children[1];
h += '<div class="org-row" id="org-r1" style="gap:40px;margin-bottom:10px">';
h += '<div class="org-branch"><div class="org-node lv1" data-name="监事会">监事会<span class="nd-sub">监督审计</span></div></div>';
h += '<div class="org-branch"><div class="org-node lv1" id="org-gm" data-name="总经理">总经理<span class="nd-sub">全面经营管理</span></div></div>';
h += '</div>';
h += '<div class="org-row" id="org-r2" style="gap:12px 6px;margin-bottom:10px">';
gmNode.children.forEach((vp,vi) => {
h += '<div class="org-branch" id="org-vp-'+vi+'">';
h += '<div class="org-node lv2" data-name="'+vp.name+'">'+vp.name+'<span class="nd-sub">'+vp.sub+'</span></div>';
if(vp.children && vp.children.length){
h += '<div class="org-vline"></div>';
h += '<div style="display:flex;gap:5px;flex-wrap:wrap;justify-content:center">';
vp.children.forEach(dp => {
h += '<div class="org-node lv3" data-name="'+dp.name+'">'+dp.name+'<span class="nd-sub">'+dp.sub+'</span></div>';
});
h += '</div>';
}
h += '</div>';
});
h += '</div></div>';
h += '<p class="org-tip">💡 点击节点可跳转至岗位职责</p>';
pn.innerHTML = h;
pn.addEventListener('click', function(e){
const node = e.target.closest('.org-node');
if(node && node.dataset.name) jumpToJob(node.dataset.name);
});
document.getElementById('panels').appendChild(pn);
tb.onclick = () => {
document.querySelectorAll('.tab').forEach(x => x.classList.remove('on'));
document.querySelectorAll('.panel').forEach(x => x.classList.remove('on'));
tb.classList.add('on');
pn.classList.add('on');
setTimeout(drawOrgLines, 100);
};
})();
function jumpToJob(name){
const tabs = document.querySelectorAll('.tab');
if(tabs[1]) tabs[1].click();
setTimeout(() => {
const cards = document.querySelectorAll('.resp-card');
cards.forEach(c => {
if(c.dataset.name === name && !c.classList.contains('open')){
c.querySelector('.resp-hd').click();
}
});
const target = [...cards].find(c => c.dataset.name === name);
if(target) target.scrollIntoView({behavior:'smooth',block:'center'});
}, 280);
}
function drawOrgLines(){
const outer = document.getElementById('org-outer');
if(!outer) return;
let svg = document.getElementById('org-svg');
if(svg) svg.remove();
const w = outer.scrollWidth, h = outer.scrollHeight;
svg = document.createElementNS('http://www.w3.org/2000/svg','svg');
svg.id = 'org-svg';
svg.setAttribute('width', w);
svg.setAttribute('height', h);
svg.setAttribute('viewBox','0 0 '+w+' '+h);
svg.style.cssText = 'position:absolute;top:0;left:0;pointer-events:none;overflow:visible;z-index:1';
outer.appendChild(svg);
const or = outer.getBoundingClientRect();
function pos(el){
const r = el.getBoundingClientRect();
return {cx:r.left-or.left+r.width/2, cy:r.top-or.top+r.height/2, l:r.left-or.left, t:r.top-or.top, R:r.left-or.left+r.width, b:r.top-or.top+r.height};
}
function mkCurve(x1,y1,x2,y2,color){
const dy = Math.abs(y2-y1)*0.35;
const path = document.createElementNS('http://www.w3.org/2000/svg','path');
path.setAttribute('d','M'+x1+' '+y1+' C'+x1+' '+(y1<y2?y1+dy:y1-dy)+' '+x2+' '+(y2>dy?y2-dy:y2+dy)+' '+x2+' '+y2);
path.setAttribute('fill','none');
path.setAttribute('stroke',color||'#93c5fd');
path.setAttribute('stroke-width','2');
svg.appendChild(path);
}
const r0n = document.querySelector('#org-r0 .org-node');
const r1ns = document.querySelectorAll('#org-r1 .org-node');
if(r0n && r1ns.length>=2){
const p0 = pos(r0n);
r1ns.forEach(n => { const p1=pos(n); mkCurve(p0.cx,p0.b,p1.cx,p1.t,'#93c5fd'); });
}
const gm = document.getElementById('org-gm');
const vpBranches = document.querySelectorAll('#org-r2 > .org-branch');
if(gm && vpBranches.length){
const pGm = pos(gm);
vpBranches.forEach(br => {
const vpn = br.querySelector(':scope > .org-node');
if(!vpn) return;
const pVp = pos(vpn);
mkCurve(pGm.cx,pGm.b,pVp.cx,pVp.t,'#93c5fd');
});
}
vpBranches.forEach(br => {
const vpn = br.querySelector(':scope > .org-node');
if(!vpn) return;
const pVp = pos(vpn);
const depts = br.querySelectorAll(':scope > div:last-child .org-node');
depts.forEach(dn => { const pD=pos(dn); mkCurve(pVp.cx,pVp.b,pD.cx,pD.t,'#93c5fd'); });
});
}
// ═══════════════════════════════════
// Tab 1: 岗位职责
// ═══════════════════════════════════
(function(){
const tb = document.createElement('button');
tb.className = 'tab';
tb.innerHTML = '<span class="tn">👤</span>岗位职责';
document.getElementById('tabs').appendChild(tb);
const pn = document.createElement('div');
pn.className = 'panel';
pn.id = 'jobs';
let h = '<div class="resp-grid">';
JOBS.forEach(j => {
h += '<div class="resp-card" data-name="'+j.name+'">';
h += '<div class="resp-hd" onclick="this.parentElement.classList.toggle(\'open\')">';
h += '<div class="resp-icon" style="background:'+j.bg+';color:'+j.color+'">'+j.icon+'</div>';
h += '<div><div class="resp-title">'+j.name+'</div><div class="resp-sub">上级:'+j.lead+'</div></div>';
h += '<div class="resp-arrow">▶</div>';
h += '</div>';
h += '<div class="resp-bd">';
j.duties.forEach(d => {
const tc = d.tag==='core'?'core':(d.tag==='check'?'check':'support');
const tl = d.tag==='core'?'核心':(d.tag==='check'?'验收':'支撑');
h += '<div class="resp-item"><span class="resp-bullet">•</span><div><b>'+d.t+'</b><span class="resp-tag '+tc+'">'+tl+'</span><br><span style="color:#64748b;font-size:11.5px">'+d.d+'</span></div></div>';
});
h += '</div></div>';
});
h += '</div>';
pn.innerHTML = h;
document.getElementById('panels').appendChild(pn);
tb.onclick = () => {
document.querySelectorAll('.tab').forEach(x => x.classList.remove('on'));
document.querySelectorAll('.panel').forEach(x => x.classList.remove('on'));
tb.classList.add('on');
pn.classList.add('on');
};
})();
// ═══════════════════════════════════
// 初始化
// ═══════════════════════════════════
window.addEventListener('load', () => {
setTimeout(() => drawOrgLines(), 350);
});
window.addEventListener('resize', () => {
const ap = document.querySelector('.panel.on');
if(!ap) return;
if(ap.id === 'org') drawOrgLines();
else if(ap.id !== 'jobs') drawLines(ap.id);
});
</script>
</body>
</html>

View File

@@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询生产指标计算结果列表
export function listProdMetricResult(query) {
return request({
url: '/cost/prodMetricResult/list',
method: 'get',
params: query
})
}
// 查询生产指标计算结果详细
export function getProdMetricResult(resultId) {
return request({
url: '/cost/prodMetricResult/' + resultId,
method: 'get'
})
}
// 新增生产指标计算结果
export function addProdMetricResult(data) {
return request({
url: '/cost/prodMetricResult',
method: 'post',
data: data
})
}
// 修改生产指标计算结果
export function updateProdMetricResult(data) {
return request({
url: '/cost/prodMetricResult',
method: 'put',
data: data
})
}
// 删除生产指标计算结果
export function delProdMetricResult(resultId) {
return request({
url: '/cost/prodMetricResult/' + resultId,
method: 'delete'
})
}
// 批量保存计算结果(先删后插)
export function batchSaveProdMetricResult(data) {
return request({
url: '/cost/prodMetricResult/batch',
method: 'post',
data: data
})
}

View File

@@ -0,0 +1,39 @@
import request from '@/utils/request'
export function listAcceptCoilRel(query) {
return request({
url: '/flow/acceptCoilRel/list',
method: 'get',
params: query
})
}
export function getAcceptCoilRel(relId) {
return request({
url: '/flow/acceptCoilRel/' + relId,
method: 'get'
})
}
export function addAcceptCoilRel(data) {
return request({
url: '/flow/acceptCoilRel',
method: 'post',
data: data
})
}
export function updateAcceptCoilRel(data) {
return request({
url: '/flow/acceptCoilRel',
method: 'put',
data: data
})
}
export function delAcceptCoilRel(relIds) {
return request({
url: '/flow/acceptCoilRel/' + relIds,
method: 'delete'
})
}

View File

@@ -0,0 +1,54 @@
import request from '@/utils/request'
export function listComplaintAccept(query) {
return request({
url: '/flow/complaintAccept/list',
method: 'get',
params: query
})
}
export function getComplaintAccept(acceptId) {
return request({
url: '/flow/complaintAccept/' + acceptId,
method: 'get'
})
}
export function addComplaintAccept(data) {
return request({
url: '/flow/complaintAccept',
method: 'post',
data: data
})
}
export function updateComplaintAccept(data) {
return request({
url: '/flow/complaintAccept',
method: 'put',
data: data
})
}
export function delComplaintAccept(acceptIds) {
return request({
url: '/flow/complaintAccept/' + acceptIds,
method: 'delete'
})
}
export function opinionDispatch(acceptId) {
return request({
url: '/flow/complaintAccept/opinionDispatch/' + acceptId,
method: 'post'
})
}
export function feedbackDispatch(acceptId, deptIds) {
return request({
url: '/flow/complaintAccept/feedbackDispatch',
method: 'post',
params: { acceptId, deptIds }
})
}

View File

@@ -0,0 +1,39 @@
import request from '@/utils/request'
export function listComplaintTask(query) {
return request({
url: '/flow/complaintTask/list',
method: 'get',
params: query
})
}
export function getComplaintTask(taskId) {
return request({
url: '/flow/complaintTask/' + taskId,
method: 'get'
})
}
export function addComplaintTask(data) {
return request({
url: '/flow/complaintTask',
method: 'post',
data: data
})
}
export function updateComplaintTask(data) {
return request({
url: '/flow/complaintTask',
method: 'put',
data: data
})
}
export function delComplaintTask(taskIds) {
return request({
url: '/flow/complaintTask/' + taskIds,
method: 'delete'
})
}

View File

@@ -0,0 +1,39 @@
import request from '@/utils/request'
export function listPlanExecuteRel(query) {
return request({
url: '/flow/planExecuteRel/list',
method: 'get',
params: query
})
}
export function getPlanExecuteRel(relId) {
return request({
url: '/flow/planExecuteRel/' + relId,
method: 'get'
})
}
export function addPlanExecuteRel(data) {
return request({
url: '/flow/planExecuteRel',
method: 'post',
data: data
})
}
export function updatePlanExecuteRel(data) {
return request({
url: '/flow/planExecuteRel',
method: 'put',
data: data
})
}
export function delPlanExecuteRel(relIds) {
return request({
url: '/flow/planExecuteRel/' + relIds,
method: 'delete'
})
}

View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询检验委托单表列表
export function listInspectionCommission(query) {
return request({
url: '/is/inspectionCommission/list',
method: 'get',
params: query
})
}
// 查询检验委托单表详细
export function getInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'get'
})
}
// 新增检验委托单表
export function addInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'post',
data: data
})
}
// 修改检验委托单表
export function updateInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'put',
data: data
})
}
// 删除检验委托单表
export function delInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'delete'
})
}

View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询检验任务表列表
export function listInspectionTask(query) {
return request({
url: '/is/inspectionTask/list',
method: 'get',
params: query
})
}
// 查询检验任务表详细
export function getInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'get'
})
}
// 新增检验任务表
export function addInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'post',
data: data
})
}
// 修改检验任务表
export function updateInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'put',
data: data
})
}
// 删除检验任务表
export function delInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'delete'
})
}

View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询样品库存表列表
export function listSampleInventory(query) {
return request({
url: '/is/sampleInventory/list',
method: 'get',
params: query
})
}
// 查询样品库存表详细
export function getSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'get'
})
}
// 新增样品库存表
export function addSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'post',
data: data
})
}
// 修改样品库存表
export function updateSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'put',
data: data
})
}
// 删除样品库存表
export function delSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'delete'
})
}

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验项目明细列表
export function listInspectionDetail(query) {
return request({
url: '/wms/inspectionDetail/list',
method: 'get',
params: query
})
}
// 查询检验项目明细详细
export function getInspectionDetail(detailId) {
return request({
url: '/wms/inspectionDetail/' + detailId,
method: 'get'
})
}
// 新增检验项目明细
export function addInspectionDetail(data) {
return request({
url: '/wms/inspectionDetail',
method: 'post',
data: data
})
}
// 修改检验项目明细
export function updateInspectionDetail(data) {
return request({
url: '/wms/inspectionDetail',
method: 'put',
data: data
})
}
// 删除检验项目明细
export function delInspectionDetail(detailId) {
return request({
url: '/wms/inspectionDetail/' + detailId,
method: 'delete'
})
}

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验主列表
export function listInspectionMain(query) {
return request({
url: '/wms/inspectionMain/list',
method: 'get',
params: query
})
}
// 查询检验主详细
export function getInspectionMain(mainId) {
return request({
url: '/wms/inspectionMain/' + mainId,
method: 'get'
})
}
// 新增检验主
export function addInspectionMain(data) {
return request({
url: '/wms/inspectionMain',
method: 'post',
data: data
})
}
// 修改检验主
export function updateInspectionMain(data) {
return request({
url: '/wms/inspectionMain',
method: 'put',
data: data
})
}
// 删除检验主
export function delInspectionMain(mainId) {
return request({
url: '/wms/inspectionMain/' + mainId,
method: 'delete'
})
}

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询金属材料室温拉伸试验主记录列表
export function listInspectionTensile(query) {
return request({
url: '/wms/inspectionTensile/list',
method: 'get',
params: query
})
}
// 查询金属材料室温拉伸试验主记录详细
export function getInspectionTensile(testId) {
return request({
url: '/wms/inspectionTensile/' + testId,
method: 'get'
})
}
// 新增金属材料室温拉伸试验主记录
export function addInspectionTensile(data) {
return request({
url: '/wms/inspectionTensile',
method: 'post',
data: data
})
}
// 修改金属材料室温拉伸试验主记录
export function updateInspectionTensile(data) {
return request({
url: '/wms/inspectionTensile',
method: 'put',
data: data
})
}
// 删除金属材料室温拉伸试验主记录
export function delInspectionTensile(testId) {
return request({
url: '/wms/inspectionTensile/' + testId,
method: 'delete'
})
}

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询金属材料室温拉伸试验样品明细列表
export function listInspectionTensileDetail(query) {
return request({
url: '/wms/inspectionTensileDetail/list',
method: 'get',
params: query
})
}
// 查询金属材料室温拉伸试验样品明细详细
export function getInspectionTensileDetail(detailId) {
return request({
url: '/wms/inspectionTensileDetail/' + detailId,
method: 'get'
})
}
// 新增金属材料室温拉伸试验样品明细
export function addInspectionTensileDetail(data) {
return request({
url: '/wms/inspectionTensileDetail',
method: 'post',
data: data
})
}
// 修改金属材料室温拉伸试验样品明细
export function updateInspectionTensileDetail(data) {
return request({
url: '/wms/inspectionTensileDetail',
method: 'put',
data: data
})
}
// 删除金属材料室温拉伸试验样品明细
export function delInspectionTensileDetail(detailId) {
return request({
url: '/wms/inspectionTensileDetail/' + detailId,
method: 'delete'
})
}

View File

@@ -35,27 +35,44 @@ export function getMaterialCoil(CoilMaterialId) {
}
export function addMaterialCoil(data) {
// 对data进行预处理将currentCoilNo去除首位的空格
const payload = {
...data,
currentCoilNo: data.currentCoilNo.trim(),
}
return request({
url: '/wms/materialCoil',
method: 'post',
data: data
data: payload
})
}
export function updateMaterialCoil(data) {
// 对data进行预处理将currentCoilNo去除首位的空格
// 将saleName和contractNo剔除防止覆盖
const { saleName, contractNo, ...payload} = {
...data,
currentCoilNo: data.currentCoilNo.trim(),
}
return request({
url: '/wms/materialCoil',
method: 'put',
data: data
data: payload
})
}
// 简单更新钢卷物料表
export function updateMaterialCoilSimple(data) {
// 对data进行预处理将currentCoilNo去除首位的空格
// 将saleName和contractNo剔除防止覆盖
const { saleName, contractNo, ...payload} = {
...data,
currentCoilNo: data.currentCoilNo.trim(),
}
return request({
url: '/wms/materialCoil/update',
method: 'put',
data: data
data: payload
})
}
@@ -107,19 +124,32 @@ export function getMaterialCoilDistributionByActualWarehouse(query) {
// 钢卷分卷
export function splitMaterialCoil(data) {
const payload = {
...data,
// currentCoilNo: data.currentCoilNo.trim(),
newCoils: data.newCoils?.map(item => ({
...item,
currentCoilNo: item.currentCoilNo?.trim(),
})),
}
return request({
url: '/wms/materialCoil',
method: 'put',
data: data
data: payload
})
}
// 钢卷合卷
export function mergeMaterialCoil(data) {
// 对data进行预处理将currentCoilNo去除首位的空格
const payload = {
...data,
currentCoilNo: data.currentCoilNo.trim(),
}
return request({
url: '/wms/materialCoil/merge',
method: 'post',
data: data
data: payload
})
}
@@ -283,10 +313,15 @@ export function startSpecialSplit(coilId, actionType) {
* 创建一个分条
*/
export function createSpecialChild(parentCoilId, pendingActionId, data) {
// 对data进行预处理将currentCoilNo去除首位的空格
const payload = {
...data,
currentCoilNo: data.currentCoilNo.trim(),
}
return request({
url: '/wms/materialCoil/specialSplit/createChild',
method: 'post',
data: data,
data: payload,
params: {
parentCoilId,
pendingActionId
@@ -496,4 +531,21 @@ export function getExportColumns() {
url: '/wms/materialCoil/exportColumns',
method: 'get',
})
}
export function listForPeriodComparison(data) {
return request({
url: '/wms/materialCoil/listForPeriodComparison',
method: 'post',
timeout: 600000,
data: data
})
}
// 钢卷加工链追溯查询(双向:向上到根节点,向下到所有后代)
export function getCoilChain(coilId) {
return request({
url: '/wms/materialCoil/chain/all/' + coilId,
method: 'get'
})
}

View File

@@ -71,4 +71,13 @@ export function getCoilWarehouseOperationLogByCoilId(params) {
method: 'get',
params
})
}
// 吞吐报表统计(后端聚合图表数据)
export function getStatistics(params) {
return request({
url: '/wms/coilWarehouseOperationLog/statistics',
method: 'get',
params
})
}

View File

@@ -35,6 +35,24 @@ export function updateMaterialWarning(data) {
})
}
// 批量处理钢卷通用维度告警(长度/厚度/宽度)
export function batchHandleMaterial(data) {
return request({
url: '/wms/materialWarning/batchHandle',
method: 'put',
data: data
})
}
// 批量处理历史告警(标记今天以前的所有记录为指定状态)
export function batchHandleHistory(data) {
return request({
url: '/wms/materialWarning/batchHandleHistory',
method: 'put',
data: data
})
}
// 删除钢卷通用维度告警(长度/厚度/宽度)
export function delMaterialWarning(warningId) {
return request({

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询岗位列表
export function listPost(query) {
return request({
url: '/wms/post/list',
method: 'get',
params: query
})
}
// 查询岗位详细
export function getPost(postId) {
return request({
url: '/wms/post/' + postId,
method: 'get'
})
}
// 新增岗位
export function addPost(data) {
return request({
url: '/wms/post',
method: 'post',
data: data
})
}
// 修改岗位
export function updatePost(data) {
return request({
url: '/wms/post',
method: 'put',
data: data
})
}
// 删除岗位
export function delPost(postId) {
return request({
url: '/wms/post/' + postId,
method: 'delete'
})
}

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询岗位职责列表
export function listPostDuty(query) {
return request({
url: '/wms/postDuty/list',
method: 'get',
params: query
})
}
// 查询岗位职责详细
export function getPostDuty(dutyId) {
return request({
url: '/wms/postDuty/' + dutyId,
method: 'get'
})
}
// 新增岗位职责
export function addPostDuty(data) {
return request({
url: '/wms/postDuty',
method: 'post',
data: data
})
}
// 修改岗位职责
export function updatePostDuty(data) {
return request({
url: '/wms/postDuty',
method: 'put',
data: data
})
}
// 删除岗位职责
export function delPostDuty(dutyId) {
return request({
url: '/wms/postDuty/' + dutyId,
method: 'delete'
})
}

View File

@@ -93,6 +93,7 @@
// 明确默认状态样式(关键修复)
background: transparent !important;
box-shadow: none !important;
position: relative;
overflow: hidden !important;
text-overflow: ellipsis !important;
@@ -305,15 +306,16 @@
margin: 0 4px;
}
// 二级菜单叶子页面小圆点
.el-menu-item.is-page-item::before {
content: '';
display: inline-block;
width: 6px;
height: 6px;
border-radius: 50%;
background: var(--current-color, #409EFF);
margin-right: 8px;
flex-shrink: 0;
vertical-align: middle;
}
// 子菜单标识图标
.submenu-indicator {
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
display: inline-flex;
align-items: center;
opacity: 0.5;
font-size: 12px;
}
// 叶子页面无标识

Some files were not shown because too many files have changed in this diff Show More