 zty
|
1983f7b121
|
feat: 修改 ofm-moedels - pulicity字段为空值
|
2025-10-11 09:23:33 +08:00 |
|
zty
|
cec6837d00
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-10-10 16:32:21 +08:00 |
|
zty
|
e214c6115a
|
feat: ofm-models 增加字段
|
2025-10-10 16:32:20 +08:00 |
 caoqianming
|
727d190610
|
feat: Ptest val_xj可为空
|
2025-10-10 11:12:59 +08:00 |
|
caoqianming
|
a6e0fb4f0d
|
feat: quick调用serializer时传入request
|
2025-10-09 14:44:26 +08:00 |
|
caoqianming
|
9cf900d2ef
|
doc: 添加一些注释
|
2025-10-09 11:17:14 +08:00 |
|
caoqianming
|
69e8e7b025
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-30 11:05:25 +08:00 |
|
caoqianming
|
647603f986
|
fix: p_create_after 自动创建mlogbw时关于exclude语句导致的查询错误
|
2025-09-30 11:05:24 +08:00 |
|
zty
|
d21c1dc55d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-30 09:58:56 +08:00 |
|
zty
|
7f206bd0a7
|
feat: ofm-修改model
|
2025-09-30 09:58:53 +08:00 |
|
caoqianming
|
bd763be83a
|
feat: Mroombooking添加字段
|
2025-09-29 15:53:34 +08:00 |
|
caoqianming
|
fe499ffac5
|
feat: base add_info_for_item 可复用list逻辑
|
2025-09-29 15:52:54 +08:00 |
|
caoqianming
|
0c1e93bf0b
|
feat: 添加wpr查询参数
|
2025-09-29 14:50:02 +08:00 |
|
caoqianming
|
5d3c4137fe
|
feat: base cquery支持annotate
|
2025-09-29 14:44:08 +08:00 |
|
caoqianming
|
dbaf121685
|
feat: mroombooking 返回slots
|
2025-09-29 11:09:09 +08:00 |
|
caoqianming
|
bf8b886a2d
|
feat: handover revert撤回时做校验2
|
2025-09-28 16:34:30 +08:00 |
|
caoqianming
|
7b8ec7f9d6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-28 16:33:40 +08:00 |
|
caoqianming
|
7620122c2d
|
feat: handover revert撤回时做校验
|
2025-09-28 16:33:39 +08:00 |
|
zty
|
de99f85259
|
feat: ofm-models 修改车辆表的字段信息
|
2025-09-28 14:16:39 +08:00 |
|
zty
|
e7c121de15
|
feat:iofm-serializer 增加ticket_
|
2025-09-28 11:07:08 +08:00 |
|
caoqianming
|
bdd686f50b
|
feat: 会议室预定修改
|
2025-09-28 10:24:29 +08:00 |
|
caoqianming
|
54140ba742
|
fix: mroombooking 创建时未create_by
|
2025-09-26 16:26:04 +08:00 |
|
caoqianming
|
c186b7d296
|
feat: p_create_after 优化
|
2025-09-26 15:14:03 +08:00 |
|
caoqianming
|
3a03cd76ff
|
feat: p_create_after 优化
|
2025-09-26 14:58:03 +08:00 |
|
caoqianming
|
f9c9a592e3
|
fix: mlogbinserializer
|
2025-09-26 14:30:51 +08:00 |
|
caoqianming
|
419b52f9be
|
feat: p_create_after 可报当前产品都不可使用
|
2025-09-26 14:19:11 +08:00 |
|
caoqianming
|
fb71f0697a
|
feat: mlog quick增加wprs_in传参
|
2025-09-26 14:07:14 +08:00 |
|
caoqianming
|
34e217e468
|
feat: mlog quick跳过创建mlogbw2
|
2025-09-26 10:46:04 +08:00 |
|
caoqianming
|
f34356057d
|
feat: mlog quick跳过创建mlogbw
|
2025-09-26 10:33:25 +08:00 |
|
caoqianming
|
b35015b58d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-26 09:11:00 +08:00 |
|
caoqianming
|
c434c76605
|
feat: 车间领料时完善提示添加物料名
|
2025-09-26 09:10:59 +08:00 |
|
zty
|
9909596cdb
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-25 15:42:45 +08:00 |
|
zty
|
6f4a1c4c88
|
feat: ofm-修改会议室信息
|
2025-09-25 15:42:24 +08:00 |
|
caoqianming
|
2445ae53f1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-25 09:11:00 +08:00 |
|
caoqianming
|
0fc57a454f
|
feat: 改版需提供新批次号
|
2025-09-25 09:11:00 +08:00 |
|
zty
|
d26e066769
|
feat: ofm 修改publicity 的model
|
2025-09-24 14:08:51 +08:00 |
|
zty
|
f347fa0d23
|
feat: 修改ofm-services.py
|
2025-09-24 14:04:06 +08:00 |
|
zty
|
362a5ef725
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-24 13:59:57 +08:00 |
|
zty
|
ad98280458
|
add : ofm-新增宣传报道保密模块
|
2025-09-24 13:59:55 +08:00 |
|
caoqianming
|
3c0fa9f244
|
feat: base send_sms auto_log send_mail使用False
|
2025-09-23 16:26:07 +08:00 |
|
caoqianming
|
b520b69f95
|
feat: 优化bind_routepack
|
2025-09-23 15:08:22 +08:00 |
|
caoqianming
|
899a314f5d
|
feat: base 优化wf通知发送
|
2025-09-23 14:59:50 +08:00 |
|
caoqianming
|
dbb0d6ae75
|
feat: routepack_ticket_change 变为创建中状态
|
2025-09-23 13:34:34 +08:00 |
|
caoqianming
|
bc4953893b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-22 11:31:22 +08:00 |
|
caoqianming
|
a8722724e1
|
feat: route增加查询条件以支持获取后续工段的信息
|
2025-09-22 11:31:21 +08:00 |
|
caoqianming
|
1c447a86ef
|
feat: 导入物料优化一下
|
2025-09-20 14:14:26 +08:00 |
|
caoqianming
|
820f814766
|
feat: 优化的mplogxview
|
2025-09-19 13:02:31 +08:00 |
|
caoqianming
|
1689683aa3
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-19 10:52:23 +08:00 |
|
caoqianming
|
cdb201a0ce
|
feat: base sql querydict可传入是否格式化时间参数
|
2025-09-19 10:52:22 +08:00 |
|
zty
|
d8ad57fa7e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-19 09:22:49 +08:00 |
|
zty
|
e32d4b816b
|
add: ofm-增加宣传保密model
|
2025-09-19 09:22:47 +08:00 |
|
caoqianming
|
47ca272cee
|
feat: base workflow list 返回view_path
|
2025-09-19 09:20:02 +08:00 |
|
caoqianming
|
4390992a14
|
feat: base workflow添加view_path
|
2025-09-19 09:09:44 +08:00 |
|
caoqianming
|
085978a6c4
|
fix: 优化handover list接口
|
2025-09-18 15:06:45 +08:00 |
|
caoqianming
|
f6668b5d38
|
feat: 优化handover list接口
|
2025-09-18 14:48:28 +08:00 |
|
caoqianming
|
e5a9f77f3d
|
feat: ana_batch_thread 优化一下
|
2025-09-18 10:44:23 +08:00 |
|
caoqianming
|
c2deb0ee45
|
feat: base 优化system事务处理
|
2025-09-17 12:51:20 +08:00 |
|
caoqianming
|
94f87df707
|
feat: 多个app优化事务处理
|
2025-09-17 12:50:19 +08:00 |
|
caoqianming
|
694dca27cc
|
feat: base system和wf优化事务处理2
|
2025-09-17 12:23:08 +08:00 |
|
caoqianming
|
0284809933
|
feat: base system和wf优化事务处理
|
2025-09-17 12:15:26 +08:00 |
|
caoqianming
|
f7e27c290f
|
feat: wpr list 返回process_name
|
2025-09-17 11:14:49 +08:00 |
|
caoqianming
|
bac046530e
|
fix: wpm取消事务时出现的缩进bug
|
2025-09-16 15:27:25 +08:00 |
|
caoqianming
|
7a3988d6bd
|
feat: mioitem处理事务处理
|
2025-09-16 14:51:06 +08:00 |
|
caoqianming
|
f151f4f2ec
|
feat: base 移除基础model层事务
|
2025-09-16 10:33:44 +08:00 |
|
caoqianming
|
7a82844842
|
feat: inm和wpm关于事务处理的修改
|
2025-09-16 10:25:52 +08:00 |
|
caoqianming
|
9bf44c4211
|
fix: 次批作为输入不会影响输出批次号
|
2025-09-15 15:48:21 +08:00 |
|
caoqianming
|
ed2804c098
|
feat: 批次的DAG数据只获取直接的上下级
|
2025-09-15 10:26:36 +08:00 |
|
caoqianming
|
00d0b1ea00
|
feat: wpm优化事务和悲观锁
|
2025-09-15 09:41:20 +08:00 |
|
caoqianming
|
aa80c1b00a
|
feat: cdview优化校验
|
2025-09-15 09:40:39 +08:00 |
|
caoqianming
|
67b92f0dd4
|
feat: base 优化get_object
|
2025-09-15 09:40:12 +08:00 |
|
caoqianming
|
06e86330bd
|
fix: lock_and_check_can_update
|
2025-09-12 17:02:06 +08:00 |
|
caoqianming
|
34ca36aced
|
fix: lock_and_check_can_update
|
2025-09-12 17:00:10 +08:00 |
|
caoqianming
|
649022eb57
|
feat: mlogbout serializer update校验mlog
|
2025-09-12 16:52:53 +08:00 |
|
caoqianming
|
5709bc3a47
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-12 16:48:34 +08:00 |
|
caoqianming
|
cdcb02d4d5
|
feat: 生产日志子表全部加mlog锁
|
2025-09-12 16:48:33 +08:00 |
|
zty
|
e7ea16ece6
|
feat: ofm-serializer fix
|
2025-09-12 16:06:21 +08:00 |
|
zty
|
6b08200016
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-12 15:01:12 +08:00 |
|
zty
|
8ef9852e27
|
add: ofm-档案管理增加审批
|
2025-09-12 15:01:11 +08:00 |
|
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 |