 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 |
|
caoqianming
|
e9d8402cda
|
feat: base ticketmixin添加ticket_auto_submit_on_create
|
2025-11-24 14:24:45 +08:00 |
|
caoqianming
|
0776ff0054
|
fix: base wfmixin gen_ticket_data保存t_id转为str
|
2025-11-24 13:49:22 +08:00 |
|
caoqianming
|
b939fcbef2
|
feat: resignation添加ticketMixin2
|
2025-11-24 13:35:32 +08:00 |
|
caoqianming
|
dc17c01aaf
|
feat: resignation添加ticketMixin
|
2025-11-24 13:22:57 +08:00 |
|
caoqianming
|
146756d1b8
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-24 13:21:51 +08:00 |
|
caoqianming
|
c6dc424b33
|
feat: base wfmixin 修改时校验
|
2025-11-24 13:21:50 +08:00 |
|
TianyangZhang
|
54196b2a64
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-24 09:18:34 +08:00 |
|
TianyangZhang
|
dcd41792fa
|
fix : 修改ofm -views -vehicle && services
|
2025-11-24 09:18:33 +08:00 |
|
caoqianming
|
a58d95843f
|
feat: base ticketDetail添加create_by_name
|
2025-11-21 16:24:08 +08:00 |
|
caoqianming
|
0817589758
|
feat: 短信发送功能未开启
|
2025-11-21 15:34:56 +08:00 |
|
caoqianming
|
99df0166f8
|
feat: 批次号格式错误的校验2
|
2025-11-21 11:08:02 +08:00 |
|
caoqianming
|
5fa4881614
|
feat: 批次号格式错误的校验
|
2025-11-21 11:01:59 +08:00 |
|
caoqianming
|
5d7c681983
|
feat: mioitemcreate时接收count_send
|
2025-11-21 10:53:36 +08:00 |
|
caoqianming
|
5ed3b7c483
|
feat: mioitemw增加筛选条件
|
2025-11-20 12:27:35 +08:00 |
|
caoqianming
|
706cfd502b
|
feat: wpr_bxerp优化mlogbw的获取
|
2025-11-20 12:00:44 +08:00 |
|
caoqianming
|
29f1a96c3b
|
fix: format_json_with_placeholders 处理decimal
|
2025-11-19 16:53:39 +08:00 |
|
caoqianming
|
cbd458a8a5
|
feat: do_out报错更明确2
|
2025-11-19 16:05:11 +08:00 |
|
caoqianming
|
caf1bba050
|
feat: do_out报错更明确
|
2025-11-19 15:53:38 +08:00 |
|
caoqianming
|
01d93d7814
|
feat: 优化ana batchwork
|
2025-11-19 13:51:32 +08:00 |
|
caoqianming
|
5e81a3d3dc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-19 10:54:43 +08:00 |
|
caoqianming
|
f8db7adab5
|
feat: 改版交接支持new_wm
|
2025-11-19 10:54:42 +08:00 |
|
TianyangZhang
|
a81d03e3ca
|
feat: ofm-models borrowRecord 增加借阅数量
|
2025-11-19 10:26:12 +08:00 |
|
TianyangZhang
|
3ff6072ae1
|
feat: ofm-models fix bug
|
2025-11-18 15:52:42 +08:00 |
|
TianyangZhang
|
ab7b08b6f2
|
feat : ofm -vehicle fix bug
|
2025-11-18 15:48:33 +08:00 |
|
TianyangZhang
|
f3daa9fe91
|
feat: ofm 修改车辆model 字段
|
2025-11-18 15:40:13 +08:00 |
|
TianyangZhang
|
362497af37
|
feat: ofm-service fix bug
|
2025-11-18 14:39:15 +08:00 |
|
TianyangZhang
|
f290138c40
|
feat：ofm-service 修改 bug
|
2025-11-18 14:32:35 +08:00 |
|
TianyangZhang
|
e2129cc799
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 14:14:32 +08:00 |
|
TianyangZhang
|
4157dd7aa6
|
feat: ofm -修改 view 字段
|
2025-11-18 14:14:31 +08:00 |
|
caoqianming
|
0b2b7f2fa2
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 11:25:28 +08:00 |
|
caoqianming
|
8267f8dda6
|
fix: base wf工作流分类接口detail错误
|
2025-11-18 11:25:27 +08:00 |
|
TianyangZhang
|
fb87fead4f
|
feat: ofm 修改 ofm 字段 并重新生成迁移文件
|
2025-11-18 11:19:22 +08:00 |
|
caoqianming
|
62d0ce87ea
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-18 09:46:26 +08:00 |
|
caoqianming
|
50c21292a9
|
feat: base workflow添加分类字段
|
2025-11-18 09:46:25 +08:00 |
|
TianyangZhang
|
4ba952d705
|
feat: ofm-views 修改 车辆字段
|
2025-11-17 16:43:02 +08:00 |
|
TianyangZhang
|
c6ec4f6c56
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
|
2025-11-17 16:29:26 +08:00 |
|
TianyangZhang
|
e093498d3c
|
feat: ofm-vehicle 修改车辆审批申请 改完按时间段进行选择
|
2025-11-17 16:29:04 +08:00 |
|
caoqianming
|
168d917232
|
feat: mioitem添加count_send字段
|
2025-11-17 14:34:13 +08:00 |
|
caoqianming
|
8b74d0b121
|
fix: do_in 可直接取用wm
|
2025-11-17 13:57:10 +08:00 |
|
caoqianming
|
e7ebdb0e8e
|
feat: 校验改版时选择的改版物料
|
2025-11-17 08:51:55 +08:00 |