Commit Graph

387 Commits

Author SHA1 Message Date
4272b495ed 修改TreeEntity符合mes-dv表里面的树形结构 2025-07-25 11:35:18 +08:00
8443f9d931 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-25 11:27:42 +08:00
4724f89820 增加新模块klp-mes制造执行下面的设备管理功能的后端实现 2025-07-25 11:27:22 +08:00
砂糖
9acd408a5b 矩形树图 2025-07-25 10:17:30 +08:00
砂糖
7c17e5d0c7 销售话术页面 2025-07-24 17:44:00 +08:00
6847c99995 话术联查产品拿名字 2025-07-24 17:30:53 +08:00
JR
d15db4f0dc feat: 产品销售话术表 2025-07-24 17:21:58 +08:00
砂糖
57ee51bf0b 打印预览 2025-07-24 10:49:23 +08:00
砂糖
1cd943473f 区分扫码枪和手动录入 2025-07-24 10:08:09 +08:00
砂糖
b73c4223c7 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-23 16:26:37 +08:00
砂糖
9ec1cc23d9 二维码生成 2025-07-23 16:26:33 +08:00
811490efa4 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-23 16:04:39 +08:00
7db38923c9 新增record_type字段区分扫码枪录入还是采购录入明细表,以及注释扫码枪代码,修改出入库移库逻辑 2025-07-23 16:04:23 +08:00
JR
c28fe1a741 fix: 智能采购联查详细信息 2025-07-22 17:14:04 +08:00
砂糖
e642dae36f 负责人改回输入框 2025-07-22 17:12:52 +08:00
砂糖
93d2618022 变更首页 2025-07-22 16:28:43 +08:00
4422ca9099 group by 根据product_name查 2025-07-22 15:37:22 +08:00
砂糖
63c8541bc5 测试 2025-07-22 15:30:55 +08:00
8c1e60f226 订单看板bug修改 2025-07-22 15:28:13 +08:00
d2183c2da5 订单看板 2025-07-22 15:02:01 +08:00
c4e0604e80 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-22 13:23:51 +08:00
c0b50bb896 整合demo逻辑 2025-07-22 13:23:35 +08:00
砂糖
1cd1b96db9 新增采购计划 2025-07-22 13:22:50 +08:00
砂糖
67dda73d12 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-22 11:49:52 +08:00
砂糖
633f81727d 自动填入单位 2025-07-22 11:49:48 +08:00
JR
e787c3ea16 feat: 扫码枪demo--2 2025-07-22 11:48:09 +08:00
JR
3b408fade9 feat: 扫码枪demo 2025-07-22 10:39:53 +08:00
砂糖
527b0f749a Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-21 18:02:30 +08:00
砂糖
dda806f6cd 增加单位 2025-07-21 18:02:26 +08:00
6744e5df8f 微改 2025-07-21 17:39:53 +08:00
4dc4365d5f Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-21 13:25:58 +08:00
803c497296 给产品表和原料表加入单位字段,变更对应实体类 bo vo和resultMap 2025-07-21 13:25:40 +08:00
砂糖
0232a34d23 支持原料选择远程搜索 2025-07-21 11:55:04 +08:00
0cc606108a 修改bug 2025-07-21 11:19:20 +08:00
砂糖
1a8866b491 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-21 10:56:54 +08:00
砂糖
442406d20f 文字修改 2025-07-21 10:56:50 +08:00
6b16b2a6da 修改wrapper 2025-07-21 10:54:44 +08:00
73ea2dd932 联查name和code 2025-07-21 10:50:12 +08:00
887e273528 联查name和code 2025-07-21 10:45:55 +08:00
b23808d23c Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-21 09:42:16 +08:00
f9804c27c3 使用querywapper代替lamdbaquerywapper解决联查问题 2025-07-21 09:41:58 +08:00
砂糖
45412f35a9 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-19 18:03:39 +08:00
砂糖
e44132c038 1 2025-07-19 18:03:35 +08:00
8c5c2774fc 不查询逻辑删除 2025-07-19 18:02:29 +08:00
07990b0ca2 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-19 17:53:45 +08:00
dca61b7ae1 查询逻辑 联查name和code 2025-07-19 17:53:28 +08:00
砂糖
1d814f988c 完善库存页面 2025-07-19 17:50:38 +08:00
砂糖
71a55115d8 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-19 17:29:18 +08:00
砂糖
5bd163d8cd 删除权限 2025-07-19 17:29:15 +08:00
e05a0476b2 修改BOM查询逻辑联查name和code 2025-07-19 17:21:33 +08:00