 caoqianming
|
e9246cc47f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-12 14:47:50 +08:00 |
|
caoqianming
|
5ece330457
|
feat: base 优化get_object事务
|
2025-09-12 14:47:50 +08:00 |
 zty
|
643c45882f
|
feat: ofm-修改字段
|
2025-09-12 14:43:35 +08:00 |
|
zty
|
8bcd9b7d03
|
feat:ofm - 档案管理修改 serializer
|
2025-09-12 14:32:36 +08:00 |
|
zty
|
aff39f3e31
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-12 14:18:57 +08:00 |
|
zty
|
53117c838b
|
feat: ofm-档案管理-serializer 更新
|
2025-09-12 14:18:56 +08:00 |
|
caoqianming
|
57a61daa66
|
feat: wpm修改为自动事务
|
2025-09-12 13:48:34 +08:00 |
|
caoqianming
|
e5008c8412
|
fix: base 在create update destroy添加自动事务
|
2025-09-12 13:48:10 +08:00 |
|
caoqianming
|
5e8e72cee9
|
feat: 修改wpm事务
|
2025-09-12 12:41:00 +08:00 |
|
caoqianming
|
674f62a05a
|
fix: base 修改_should_use_transaction
|
2025-09-12 12:40:42 +08:00 |
|
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 |