Commit Graph

362 Commits

Author SHA1 Message Date
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
砂糖
245bc4973b Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-19 16:08:44 +08:00
砂糖
1f95ca098c 冲突标红 2025-07-19 16:08:40 +08:00
85c721d3af 新增接口同时插入主表和详情表数据 2025-07-19 15:35:31 +08:00
8b527ff02f Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-19 15:22:54 +08:00
4a9ed11f84 库存前端页面优化 2025-07-19 15:22:36 +08:00
砂糖
f80b0d55a4 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-19 15:19:05 +08:00
砂糖
3a0c9a7684 根据采购单生成入库单 2025-07-19 15:19:00 +08:00
4b41100938 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-19 14:35:07 +08:00
0018513683 完善库存管理,现在问题就是出入库移库以及撤回操作都是某个主表id带着的所有详情记录一并操作并不能单个修改,比如撤回某一条详情,如果想实现这一功能需要修改主表status字段和详情表添加status字段 2025-07-19 14:34:48 +08:00
JR
f4001e4bab 采购细节表新增状态字段 2025-07-19 14:07:58 +08:00
JR
487e78ff89 采购细节表新增状态字段 2025-07-19 14:06:32 +08:00
JR
1bfaca8b92 去掉采购非空校验 2025-07-19 13:35:08 +08:00
d28578d106 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-19 10:49:54 +08:00
0ad3f3f3c8 单独修改状态接口 2025-07-19 10:49:29 +08:00
砂糖
df2d9a3025 删除frappe-gantt 2025-07-19 10:26:00 +08:00
JR
69e1178fee 新增接口,插入采购计划(含明细) 2025-07-19 09:49:44 +08:00
b09733d575 缺少产线时间冲突爆红问题 2025-07-18 21:53:17 +08:00
c2b6e54a09 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-18 18:06:27 +08:00
249f99bef7 库存管理前端 2025-07-18 18:06:20 +08:00
JR
043b0e8b79 新增接口,根据订单推荐采购计划 2025-07-18 17:23:51 +08:00
砂糖
58bdd266dc 采购开始做 2025-07-18 17:22:56 +08:00
JR
ff8c174b8e 去掉原材料数据校验 2025-07-18 15:36:05 +08:00
砂糖
c2d4e09955 Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X 2025-07-18 15:25:16 +08:00
砂糖
a7502dd45a 做了几个组件 2025-07-18 15:25:07 +08:00
51ad700169 Merge remote-tracking branch 'origin/0.8.X' into 0.8.X 2025-07-18 13:59:53 +08:00