 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 |
|
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
|
0a12927518
|
feat: batch bxerp含缺陷统计
|
2025-09-08 15:18:10 +08:00 |
|
caoqianming
|
3be13dd920
|
feat: mlog list 添加update_time
|
2025-09-08 14:51:11 +08:00 |
|
caoqianming
|
8cc9c46a95
|
feat: 工艺步骤中辅料使用的校验
|
2025-09-08 14:29:19 +08:00 |
|
caoqianming
|
2e2ac78bad
|
feat: mlogb添加parent isnull查询
|
2025-09-08 13:33:48 +08:00 |
|
caoqianming
|
0b1f71e652
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-08 11:18:10 +08:00 |
|
caoqianming
|
94a218c09a
|
feat: 次批触发输出产生
|
2025-09-08 11:18:09 +08:00 |
|
zty
|
de1e5b4d41
|
feat: 修改印章的model 和 serializer
|
2025-09-08 11:13:06 +08:00 |
|
zty
|
0e783a92e0
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-08 09:58:00 +08:00 |
|
zty
|
3e90dd6820
|
feat: 修改 ofm sevice 印章模块
|
2025-09-08 09:57:58 +08:00 |
|
caoqianming
|
10d4a64c3a
|
feat: base 优化safe_get_or_create
|
2025-09-08 09:28:04 +08:00 |
|
zty
|
f97f51e72c
|
feat: 修改ofm seal 过滤查询功能
|
2025-09-05 14:49:50 +08:00 |
|
caoqianming
|
6b246f147d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-05 14:32:43 +08:00 |
|
caoqianming
|
fdb49e1147
|
feat: mioitemcreate 批次号可不填
|
2025-09-05 14:32:42 +08:00 |
|
zty
|
ca18fece21
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-05 11:10:16 +08:00 |
|
zty
|
6a6d46583b
|
feat: 行政管理 -印章管理
|
2025-09-05 11:10:15 +08:00 |
|
caoqianming
|
41c1653d13
|
feat: ftest默认为合格
|
2025-09-05 09:47:20 +08:00 |
|
caoqianming
|
c20580e263
|
fix: mlogbwstarttest bug4
|
2025-09-04 17:23:00 +08:00 |
|
caoqianming
|
a6fcdab836
|
fix: mlogbwstarttest bug3
|
2025-09-04 17:20:31 +08:00 |
|
caoqianming
|
026ebccef5
|
fix: mlogbwstarttest bug2
|
2025-09-04 17:18:38 +08:00 |
|
caoqianming
|
f1aa922946
|
fix: mlogbwstarttest bug
|
2025-09-04 17:08:19 +08:00 |
|
caoqianming
|
a7fd4b9448
|
feat: MlogbDefect 添加count_has 的处理
|
2025-09-04 16:59:20 +08:00 |
|
caoqianming
|
65d47008a4
|
feat: mlogbdefect添加count_has 字段
|
2025-09-04 16:48:41 +08:00 |
|
caoqianming
|
65726e967f
|
feat: update_mb_item defect处理更严谨
|
2025-09-04 16:48:10 +08:00 |
|
caoqianming
|
2524feca72
|
feat: 取消最后一步产出与工艺包不一致 的校验
|
2025-09-04 15:07:07 +08:00 |
|
caoqianming
|
01b30e21d3
|
feat: 出入库记录添加乐观锁
|
2025-09-04 14:42:14 +08:00 |
|
caoqianming
|
4cffb8a563
|
feat: 出入库明细可默认批次为无
|
2025-09-04 10:55:56 +08:00 |
|
caoqianming
|
0c08543e9c
|
feat: 导入物料明细时可默认批次号为 无批次
|
2025-09-04 10:44:32 +08:00 |
|
caoqianming
|
e6a1363b43
|
feat: 导入物料明细时可默认批次号为 无批次
|
2025-09-04 10:40:52 +08:00 |
|
caoqianming
|
3d188a72f3
|
feat: 导入物料明细时可默认批次号3
|
2025-09-04 10:25:42 +08:00 |
|
caoqianming
|
6104a2e6be
|
feat: 导入物料明细时可默认批次号2
|
2025-09-04 10:08:44 +08:00 |
|
caoqianming
|
abd1ac9d56
|
feat: batch_bxerp考虑mlogbw_from
|
2025-09-04 08:54:21 +08:00 |
|
caoqianming
|
cc45163775
|
feat: mlog_submit mlogbdefect增加筛选条件
|
2025-09-04 08:53:37 +08:00 |
|
caoqianming
|
f82db7bb6f
|
feat: 导入物料明细时可默认批次号
|
2025-09-03 11:27:58 +08:00 |
|
caoqianming
|
c4539260a8
|
feat: 光芯批次统计增加班次返回
|
2025-09-02 16:45:40 +08:00 |
|
caoqianming
|
872e59ffe1
|
feat: route update 时from_route存在则不可修改关键信息3
|
2025-09-02 15:53:24 +08:00 |
|
caoqianming
|
7d2f11f194
|
feat: route update 时from_route存在则不可修改关键信息2
|
2025-09-02 15:22:29 +08:00 |
|
caoqianming
|
bf3803a0e8
|
feat: mlog_submit 进行操作时间校验
|
2025-09-02 15:17:59 +08:00 |
|
caoqianming
|
a6b320bad6
|
feat: route update 时from_route存在则不可修改关键信息
|
2025-09-02 15:16:55 +08:00 |
|
caoqianming
|
ba0e86d834
|
fix: ftestwork submit 校验wm和mb bug
|
2025-09-02 14:30:25 +08:00 |
|
caoqianming
|
28671451b0
|
feat: mlogchange支持work_start_time
|
2025-09-02 12:15:29 +08:00 |
|
caoqianming
|
45af751350
|
feat: MlogSerializer 处理 work_start_time 的 bug2
|
2025-09-02 11:32:05 +08:00 |
|
caoqianming
|
c997cba6a5
|
feat: route采用引用方式允许重复创建
|
2025-09-02 11:23:37 +08:00 |
|
caoqianming
|
9af23216b6
|
feat: MlogSerializer 处理 work_start_time 的 bug
|
2025-09-02 11:09:12 +08:00 |
|
caoqianming
|
81561b5238
|
fix: MlogbInUpdateSerializer 联动count_use 和 count_real
|
2025-09-02 09:10:52 +08:00 |
|
zty
|
f7cc3b438f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-02 08:48:03 +08:00 |
|
zty
|
5c163cdcbb
|
feat: 修改能管采集的点位
|
2025-09-02 08:48:01 +08:00 |
|
caoqianming
|
67f7afd3fc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-02 08:40:20 +08:00 |
|
caoqianming
|
1929fd30a6
|
feat: mlog work_start_time必填
|
2025-09-02 08:40:20 +08:00 |
|
zty
|
c38457e947
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-09-01 17:05:21 +08:00 |
|
zty
|
8f6e401fdd
|
feat: ftestwork submit支持mb
|
2025-09-01 17:05:20 +08:00 |
|
caoqianming
|
6582a4dae1
|
feat: toggle_state 使用 routepack.update权限
|
2025-09-01 16:06:00 +08:00 |
|
caoqianming
|
30f8d484d1
|
fix: batchlog batches_to 优化
|
2025-09-01 13:17:35 +08:00 |
|
caoqianming
|
31d0dc4829
|
feat: ftestwork支持对materialbatch检查
|
2025-08-29 13:11:58 +08:00 |
|
caoqianming
|
9d1c5415e1
|
feat: batchst返回material_start相关信息
|
2025-08-29 09:48:09 +08:00 |
|
caoqianming
|
a249258ba6
|
feat: 添加定时任务以标记mtask 状态2
|
2025-08-28 16:43:10 +08:00 |
|
caoqianming
|
4fa0b33254
|
feat: 添加定时任务以标记mtask 状态
|
2025-08-28 16:37:23 +08:00 |