 caoqianming
|
a8ae8ee32a
|
feat: base dept filter支持parent isnull查询
|
2025-12-26 14:52:54 +08:00 |
|
caoqianming
|
09a7c64b3c
|
feat: mlogbw patch权限
|
2025-12-25 14:29:22 +08:00 |
|
caoqianming
|
aa07c041fb
|
feat: 固定资产入库流程apply
|
2025-12-25 14:27:28 +08:00 |
|
caoqianming
|
29f4edccb8
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-25 14:25:41 +08:00 |
|
caoqianming
|
ca67a1479f
|
feat: resignation ticket存入employee_name
|
2025-12-25 14:25:40 +08:00 |
 TianyangZhang
|
90cb2ed7f7
|
feat:新增人员交接单及其修改 人员交接时候反存校验
|
2025-12-25 09:43:58 +08:00 |
|
caoqianming
|
79e957bd83
|
feat: asm assetlogcreate
|
2025-12-24 16:30:36 +08:00 |
|
caoqianming
|
00f2918d17
|
feat: base 提交时可变动工单title
|
2025-12-24 15:42:46 +08:00 |
|
caoqianming
|
f84ceaa95e
|
feat: 车间库存支持传入count_all
|
2025-12-24 11:09:12 +08:00 |
|
caoqianming
|
da1f587036
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-23 10:25:19 +08:00 |
|
caoqianming
|
55c94a83ce
|
feat: wmaterial search时去除material__number
|
2025-12-23 10:25:18 +08:00 |
|
TianyangZhang
|
aad329061b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-22 14:27:58 +08:00 |
|
TianyangZhang
|
16a04b43f0
|
feat: base ticketmixin 修改 ”perform_update“ bug
|
2025-12-22 14:27:57 +08:00 |
|
caoqianming
|
4536c136bb
|
feat: wmaterial添加mlog_date_start筛选条件2
|
2025-12-22 14:26:05 +08:00 |
|
caoqianming
|
7400202209
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-22 14:22:02 +08:00 |
|
caoqianming
|
d7c3e92f9e
|
feat: wmaterial添加mlog_date_start筛选条件
|
2025-12-22 14:22:01 +08:00 |
|
TianyangZhang
|
a408b2db92
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-22 13:41:40 +08:00 |
|
TianyangZhang
|
b250b9b078
|
feat: 新增hrm --人员交接表
|
2025-12-22 13:41:38 +08:00 |
|
caoqianming
|
725f7d1764
|
fix: repair swaggger显示问题
|
2025-12-19 14:13:32 +08:00 |
|
caoqianming
|
75c7f26448
|
feat: base userfilter获取归属于该部门及以下部门的人2
|
2025-12-19 14:13:10 +08:00 |
|
caoqianming
|
dec8650af1
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-19 14:02:51 +08:00 |
|
caoqianming
|
a81e851588
|
feat: asm初步接口
|
2025-12-19 14:02:16 +08:00 |
|
caoqianming
|
4996b0e4a3
|
feat: base userfilter获取归属于该部门及以下部门的人
|
2025-12-19 13:59:39 +08:00 |
|
TianyangZhang
|
79c8115445
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-19 13:30:54 +08:00 |
|
TianyangZhang
|
21424a61bd
|
fix: 修改 ofm - vehicle 中的出发里程
|
2025-12-19 13:30:53 +08:00 |
|
caoqianming
|
ba521b1107
|
feat: 修改mioitemw test的导入逻辑
|
2025-12-19 08:53:33 +08:00 |
|
caoqianming
|
81d2cbce8c
|
feat: 光子六车间批次生产合格率修改2
|
2025-12-18 14:52:58 +08:00 |
|
caoqianming
|
45f9f27cbe
|
feat: 光子六车间批次生产合格率修改
|
2025-12-18 10:13:51 +08:00 |
|
caoqianming
|
c440707612
|
feat: 取消handover_submit无用校验
|
2025-12-17 16:06:10 +08:00 |
|
caoqianming
|
5dfb903c4a
|
fix: handoverserializer 关于new_wm的处理4
|
2025-12-17 15:59:14 +08:00 |
|
caoqianming
|
7fc995c7c9
|
fix: handoverserializer 关于new_wm的处理3
|
2025-12-17 15:47:25 +08:00 |
|
caoqianming
|
07134f32bb
|
fix: handoverserializer 关于new_wm的处理2
|
2025-12-17 15:34:08 +08:00 |
|
caoqianming
|
041474411e
|
fix: handoverserializer 关于new_wm的处理
|
2025-12-17 15:24:38 +08:00 |
|
caoqianming
|
07b2df1fd0
|
feat: 合批时校验批次是否已存在
|
2025-12-17 14:25:40 +08:00 |
|
caoqianming
|
57459cc7dc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-17 14:11:00 +08:00 |
|
caoqianming
|
ec7b0cd987
|
fix: handovermerge时new_state未定义
|
2025-12-17 14:10:59 +08:00 |
|
TianyangZhang
|
5711791a1f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-17 09:58:31 +08:00 |
|
TianyangZhang
|
4b7e648b13
|
fix: 修改印章申请binging_seal
|
2025-12-17 09:58:30 +08:00 |
|
caoqianming
|
0c5034683c
|
fix: update_mb_item时考虑检验的存在
|
2025-12-17 09:25:44 +08:00 |
|
caoqianming
|
c35041f72b
|
feat: routepack删除时做一下校验
|
2025-12-16 16:33:05 +08:00 |
|
caoqianming
|
71fe281a90
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-16 11:23:01 +08:00 |
|
caoqianming
|
54f4aed729
|
feat: 维修记录初步完成
|
2025-12-16 11:23:00 +08:00 |
|
TianyangZhang
|
d3c5358d2c
|
fix: hrm-用人需求修改标题模板
|
2025-12-16 10:35:13 +08:00 |
|
caoqianming
|
190f2f047d
|
feat: base ticketmixin传入other_data
|
2025-12-16 09:20:46 +08:00 |
|
caoqianming
|
3dcb26f14a
|
fix: 先调整asm以启动服务
|
2025-12-15 16:47:10 +08:00 |
|
caoqianming
|
01615b4b27
|
feat: base 模板字段改为textfield
|
2025-12-15 16:45:41 +08:00 |
|
caoqianming
|
be4dfe85ee
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-12-15 15:20:59 +08:00 |
|
caoqianming
|
a9aac76328
|
feat: 删除asm同步文件
|
2025-12-15 15:20:58 +08:00 |
|
TianyangZhang
|
16a513f331
|
feat:修改hrm/urls --EMPneed
|
2025-12-15 13:52:33 +08:00 |
|
TianyangZhang
|
de0149dce4
|
feat: 新增模块固定资产 asm
|
2025-12-15 11:18:55 +08:00 |
|
caoqianming
|
1af6555e26
|
feat: 添加员工需求表
|
2025-12-12 16:57:12 +08:00 |
|
caoqianming
|
320da10e61
|
feat: route接口增加按product获取总图
|
2025-12-12 11:00:05 +08:00 |
|
caoqianming
|
7f34d45160
|
feat: base wf增加ticket_count接口添加分类
|
2025-12-12 10:24:34 +08:00 |
|
caoqianming
|
8c18bbf6ae
|
feat: base wf增加ticket_count接口
|
2025-12-12 09:34:35 +08:00 |
|
caoqianming
|
636042e9c3
|
feat: validate_dag检查检查未到达的物料
|
2025-12-12 08:54:01 +08:00 |
|
caoqianming
|
e607dfd51b
|
feat: cal_x_task_count默认使用target_quantity2
|
2025-12-12 08:33:57 +08:00 |
|
caoqianming
|
ddd75d408a
|
feat: 自动生成物料的逻辑优化2
|
2025-12-11 17:03:35 +08:00 |
|
caoqianming
|
6584334d00
|
feat: 自动生成物料的逻辑优化
|
2025-12-11 16:56:11 +08:00 |
|
caoqianming
|
d36edaffe1
|
feat: cal_x_task_count默认使用target_quantity
|
2025-12-11 16:49:59 +08:00 |
|
caoqianming
|
33f6c3982d
|
feat: base wf 捕获expr is None的错误
|
2025-12-11 13:43:44 +08:00 |
|
caoqianming
|
984f875a6c
|
fix: do_in bug3
|
2025-12-11 10:41:53 +08:00 |
|
caoqianming
|
8ee48f77fc
|
fix: do_in bug
|
2025-12-11 08:40:48 +08:00 |
|
caoqianming
|
4bea3d973e
|
fix: do_in bug
|
2025-12-10 15:12:24 +08:00 |
|
caoqianming
|
18c66eee7a
|
feat: validate_dag增加传入参数2
|
2025-12-09 09:41:53 +08:00 |
|
caoqianming
|
77c7811476
|
feat: validate_dag增加传入参数
|
2025-12-09 08:26:44 +08:00 |
|
caoqianming
|
d104ee90a4
|
feat: 改版交接支持拆合批2
|
2025-12-08 15:26:39 +08:00 |
|
caoqianming
|
09c3bec66a
|
feat: 改版交接支持拆合批
|
2025-12-08 13:57:02 +08:00 |
|
caoqianming
|
75b2a420b7
|
feat: translate_eval_formula 打印报错信息
|
2025-12-03 16:16:58 +08:00 |
|
caoqianming
|
7e09b872cf
|
feat: base 优化safe_get_or_create2
|
2025-12-03 15:34:02 +08:00 |
|
caoqianming
|
53a56ace1f
|
feat: base 优化safe_get_or_create
|
2025-12-03 13:52:08 +08:00 |
|
caoqianming
|
9388eada7d
|
feat: base 增加statedetailserializer可返回节点操作人员
|
2025-12-03 11:11:30 +08:00 |
|
caoqianming
|
81aa49d339
|
feat: 获取batchlog dag数据支持临近节点返回
|
2025-12-02 09:56:25 +08:00 |
|
caoqianming
|
adee19eb5b
|
fix: base ticketmixin先创建再handle
|
2025-12-01 16:12:29 +08:00 |
|
caoqianming
|
fadf1e979d
|
feat: base ticket create支持transition非必传2
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
a78b3a98a0
|
feat: base ticket create支持transition非必传
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
45fc29e9fe
|
feat: base ticket create支持transition传空
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
cad2a7e50a
|
feat: 供应商审核通过后即可添加供应商
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
39066f2124
|
feat: 校验SupplierAudit供应商名称已存在
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
8211a33b58
|
feat: material list filter low_inm优化
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
a51494aea9
|
feat: material list 如需获取库存数据需指定传参
|
2025-12-01 15:03:49 +08:00 |
|
caoqianming
|
2fcfae518d
|
feat: 添加部分索引
|
2025-12-01 15:03:49 +08:00 |
|
TianyangZhang
|
5be3f6fbe5
|
fix ：修改提交审批报错 RelatedManager' object has no attribute 'belong_dept
|
2025-12-01 10:08:29 +08:00 |
|
TianyangZhang
|
e98027776c
|
feat: srm -model-Papersecret 增加 organization 申请部门字段
|
2025-11-25 16:38:26 +08:00 |
|
TianyangZhang
|
ff1e60fc77
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:27:28 +08:00 |
|
TianyangZhang
|
9ccfcbec03
|
fix : srm 修改 paperrecord 字段 cor_author 字段类型
|
2025-11-25 16:27:26 +08:00 |
|
TianyangZhang
|
f66e5bd9df
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:17:56 +08:00 |
|
TianyangZhang
|
004833292d
|
fix：srm 修改论文审批 反存 论文台账 主要修改model 字段类型
|
2025-11-25 16:17:54 +08:00 |
|
caoqianming
|
e07a1fdc4c
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 16:17:38 +08:00 |
|
caoqianming
|
8970d5b04e
|
feat: 优化mlogbw list接口速度2
|
2025-11-25 16:17:37 +08:00 |
|
caoqianming
|
57330e6ac6
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-25 15:57:24 +08:00 |
|
caoqianming
|
1074fd35bd
|
feat: 优化mlogbw list接口速度
|
2025-11-25 15:57:24 +08:00 |
|
TianyangZhang
|
d0493eb87b
|
feat: srm-patent修改字段类型
|
2025-11-25 15:56:21 +08:00 |
|
TianyangZhang
|
355be71775
|
fix: srm 修改专利台账
|
2025-11-25 14:56:05 +08:00 |
|
caoqianming
|
95604372a4
|
feat: resignation添加ticketrelate_name
|
2025-11-25 10:52:27 +08:00 |
|
caoqianming
|
ae7863871a
|
feat: base get_object加锁时注意is_deleted过滤采用base_manager
|
2025-11-25 10:46:44 +08:00 |
|
caoqianming
|
3f2db2a4af
|
feat: base wf 调用方法支持静态方法
|
2025-11-25 10:23:09 +08:00 |
|
caoqianming
|
5db4a99611
|
feat: mlogbw关于wpr的校验修改以支持手动新增
|
2025-11-25 10:20:11 +08:00 |
|
caoqianming
|
f70605129c
|
feat: resignatioin提交时调用的方法
|
2025-11-24 15:53:56 +08:00 |
|
caoqianming
|
873e4bd80e
|
feat: ResignationSerializer create bug2
|
2025-11-24 15:34:30 +08:00 |
|
caoqianming
|
2dbd7da2f8
|
feat: ResignationSerializer create bug
|
2025-11-24 15:33:57 +08:00 |