Commit Graph

3893 Commits

Author SHA1 Message Date
caoqianming 527e6c0fc2 feat: wpm 取消 transaction 2025-09-12 12:16:47 +08:00
caoqianming 90b7e2087b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-12 12:14:29 +08:00
caoqianming 412398d461 feat: base CustomGenericViewSet 添加自动事务 2025-09-12 12:14:29 +08:00
zty ebd125ca1d feat: ofm-修改 -档案借 filterset_class 2025-09-12 10:32:12 +08:00
zty 6d36f3fa7d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-12 10:19:50 +08:00
zty e8b914d556 feat: ofm 增加档案台账模糊查询 2025-09-12 10:19:49 +08:00
caoqianming c9a2daaa48 feat: 默认提交时间为结束时间 2025-09-12 10:11:25 +08:00
caoqianming c4c61ff737 fix: 产生编号时存在bug 2025-09-12 09:19:57 +08:00
caoqianming aa72b0780a feat: 快速报工的bug 2025-09-12 09:11:35 +08:00
caoqianming 9d692b4d5d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-11 15:53:36 +08:00
caoqianming 42a4332b87 feat: base 日志默认记录耗时大于2s的 2025-09-11 15:53:36 +08:00
zty 51fb42d597 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-11 14:43:04 +08:00
zty 19c7e7aad1 feat: ofm 增加档案台账 2025-09-11 14:43:04 +08:00
caoqianming b4cfdd693a fix: 交接记录已提交不可变动 2025-09-11 14:14:47 +08:00
caoqianming 448bdb9ee6 fix: mlog change 导致的bug问题 2025-09-11 14:09:27 +08:00
caoqianming 839fc2af82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-11 13:26:37 +08:00
caoqianming cecffbdb78 feat: mlog submit/revert 改用乐观锁 2025-09-11 13:26:37 +08:00
zty a0c3443d9e feat: ofm 修改车辆model 2025-09-11 09:53:35 +08:00
zty b380c3805b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-11 09:51:42 +08:00
zty 80fa245b58 feat: ofm 修改 车辆model 2025-09-11 09:51:41 +08:00
caoqianming d828bb76d5 feat: wpr list 返回wm_material_ofrom_name 2025-09-11 09:13:37 +08:00
caoqianming e4a2e7c4f5 feat: wpr list 返回wm_material_name 2025-09-11 09:08:48 +08:00
caoqianming 53858cac94 feat: wpr list 返回material_start_name 2025-09-10 17:01:53 +08:00
caoqianming a5f32dbeda Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 15:35:18 +08:00
caoqianming e491d7b4fe fix: wpr list filter bug 2025-09-10 15:35:17 +08:00
zty 1ea9ef48a6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 15:21:19 +08:00
zty 9db173cdb9 feat: vehicle 增加serializer 返回字段 2025-09-10 15:21:19 +08:00
caoqianming 2369c1469e feat: wpr list返回batch 2025-09-10 15:03:24 +08:00
caoqianming 27416dfeaa Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 14:49:35 +08:00
caoqianming ec8881fb02 feat: 增加wpr tag查询条件以支持todo等 2025-09-10 14:49:35 +08:00
zty f6f842c17f feat: 修改车辆的字段 2025-09-10 14:36:30 +08:00
zty 172e2397be feat: ofm 车辆管理迁移文件 2025-09-10 14:27:38 +08:00
zty 71bc4e76f0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-10 14:26:25 +08:00
zty ba8b258ee7 feat: ofm 车辆审批 2025-09-10 14:26:23 +08:00
caoqianming 8b7a87abb6 fix: 出入库记录和交接记录提交处理时都进行单个的强校验 2025-09-10 13:11:51 +08:00
caoqianming d42bc29d2c feat: 出入库记录和交接记录提交处理时都进行单个的强校验 2025-09-10 11:26:37 +08:00
caoqianming 6b423c80eb feat: 添加物料明细与批次不匹配的校验2 2025-09-09 16:49:51 +08:00
caoqianming df4b062209 feat: 添加物料明细与批次不匹配的校验 2025-09-09 16:38:58 +08:00
caoqianming d84b8e94fd feat: gen_number_with_rule 优化一下 2025-09-09 16:19:05 +08:00
caoqianming 6d09e5e4f3 feat: handover_submit增强校验 2025-09-09 15:39:13 +08:00
caoqianming bc555b7bea feat: mlog list 支持返回mlogbw number 2025-09-09 14:05:59 +08:00
caoqianming 3906b0f744 feat: gen_number_with_rule按生产日志中的工段过滤 2025-09-09 13:37:56 +08:00
caoqianming d19fee8e6f feat: gen_number_with_rule 完善 2025-09-09 11:28:04 +08:00
caoqianming 81a16fd37e feat: 工段未配置班次提醒 2025-09-09 11:23:09 +08:00
caoqianming ddb4a6930d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-09 10:37:56 +08:00
caoqianming cbc5d558d9 feat: 板段号生成逻辑修改 2025-09-09 10:37:56 +08:00
zty 0183234497 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2025-09-08 16:31:24 +08:00
zty 068e391845 feat: ofm-印章绑定审批修改 2025-09-08 16:31:20 +08:00
caoqianming 6b6c4b7e57 release: 2.8.2025090815 2025-09-08 16:23:34 +08:00
caoqianming 0a12927518 feat: batch bxerp含缺陷统计 2025-09-08 15:18:10 +08:00