factory

Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

adffac48ad fix: routeserializer优化routepack process校验 caoqianming 2024-08-02 09:13:00 +0800
aa42ba6e3f feat: submit时校验消耗和产出是否已经填写 caoqianming 2024-08-01 18:12:30 +0800
071558af8d feat: mlogbin 校验记录已存在 caoqianming 2024-08-01 17:32:48 +0800
cbedb81b0e fix: mlogbin 不合格物料校验去除 caoqianming 2024-08-01 16:54:09 +0800
c293dd068f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-01 15:55:22 +0800
261ed40d94 fix: fim.py cost_unit 字段 zty 2024-08-01 15:55:19 +0800
cbe516ccf5 fix: handover submit时更新bug caoqianming 2024-08-01 15:25:16 +0800
6efcf19716 fix: mlog_revert bug caoqianming 2024-08-01 15:15:00 +0800
f3f0ea132c fix: find_material_can_change 只可返工到半成品 caoqianming 2024-08-01 10:30:55 +0800
9ff4f21f9a fix: mlogbin create时生成编号变更3 caoqianming 2024-08-01 09:59:39 +0800
99ab4e1957 feat: mlogbin create时生成编号变更2 caoqianming 2024-08-01 09:20:15 +0800
3f62e8709f feat: 采购计划和订单增加单价和总价 caoqianming 2024-07-31 19:18:51 +0800
9e26f416a5 feat: 变更物料单价字段为小数 caoqianming 2024-07-31 19:18:24 +0800
a589fec67e feat: enstat2添加统计字段 caoqianming 2024-07-31 16:53:23 +0800
0813a3b568 feat: mlogbin create时生成编号变更 caoqianming 2024-07-31 16:33:32 +0800
9dcc4c0910 feat: 工序增加字段batch_append_equip caoqianming 2024-07-31 16:30:00 +0800
93b1a80cfb feat: 供应商增加字段number caoqianming 2024-07-31 16:29:11 +0800
821d7613d1 fix: get_sflog 增加 sflog创建范围 caoqianming 2024-07-31 15:55:34 +0800
19167887d5 fix: mgroup_run_change bug caoqianming 2024-07-31 15:34:50 +0800
bea83f93d5 fix: 批次号追加设备编号 caoqianming 2024-07-31 14:30:53 +0800
9ad0cf6498 feat: 批次号追加number caoqianming 2024-07-31 14:27:15 +0800
166ae8b12c feat: base user增加筛选条件 caoqianming 2024-07-31 13:43:32 +0800
321be50323 feat: MaterialBatchSerializer 改变material_name caoqianming 2024-07-30 17:05:55 +0800
e3a276c634 feat: MaterialBatchSerializer 改变material_name caoqianming 2024-07-30 17:05:55 +0800
181a4e3a5f fix: HandoverSerializer recive_mgroup 校验bug zty 2024-07-30 15:11:23 +0800
ebf6f739ca feat: 出入库添加工段逻辑 zty 2024-07-30 13:24:21 +0800
a587e570f0 feat: mio 添加 mgroup字段 zty 2024-07-30 11:40:18 +0800
893781ec7f feat: db_insert_mplogx不用thread caoqianming 2024-07-30 10:01:42 +0800
165052aa8b fix: base handle_parent 错误 caoqianming 2024-07-29 11:12:13 +0800
aa6d67d8a9 refactor: base 更新permission 描述 caoqianming 2024-07-29 10:31:46 +0800
f5c22d460b Merge branch 'erp1' caoqianming 2024-07-29 17:24:42 +0800
e853fe33b1 feat: gen_material_out 优化并变更物料信息 caoqianming 2024-07-29 17:24:25 +0800
93d26ec100 Merge branch 'erp1' caoqianming 2024-07-29 16:21:22 +0800
a4417e7a4f fix: gen_material_out bug caoqianming 2024-07-29 16:20:43 +0800
ebfb96b12e feat: material delete 时 update 子物料 caoqianming 2024-07-29 16:16:20 +0800
76c14460f5 fix: base handle_parent 错误 caoqianming 2024-07-29 11:12:13 +0800
effffe34bf fix: base handle_parent 错误 caoqianming 2024-07-29 11:12:13 +0800
92c6939a9c refactor: base 更新permission 描述 caoqianming 2024-07-29 10:31:46 +0800
38eaefe3bb refactor: base 更新permission 描述 caoqianming 2024-07-29 10:31:46 +0800
05b46b5351 fix: EnvData get_or_create 避免报错 caoqianming 2024-07-29 08:38:57 +0800
b428f36014 Merge branch 'erp1' caoqianming 2024-07-26 17:41:09 +0800
7f935dbf57 fix: datarecordviewset 继承错误 caoqianming 2024-07-26 17:40:54 +0800
e78cdca9ae Merge branch 'erp1' caoqianming 2024-07-26 17:33:26 +0800
02a9445596 feat: 添加dataset接口 caoqianming 2024-07-26 17:32:08 +0800
ae55a62ced Merge branch 'erp1' caoqianming 2024-07-26 17:19:00 +0800
2a225bdc86 feat: 添加定时执行bi的task和记录表 caoqianming 2024-07-26 17:18:42 +0800
e5cd203e04 Merge branch 'erp1' caoqianming 2024-07-26 16:57:04 +0800
9c27ffd7dd feat: testitem 增删改查 caoqianming 2024-07-26 16:56:29 +0800
03f8f196bc feat: base 处理父级引用parent_link bug caoqianming 2024-07-26 08:52:24 +0800
cfb09c04f4 fix: base handle_parent时要处理所有相关的父子关系 caoqianming 2024-07-25 18:40:55 +0800
c7c92fa1d2 fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2 caoqianming 2024-07-25 16:00:11 +0800
052b21b2f8 fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误 caoqianming 2024-07-25 15:38:25 +0800
51bb5b41fe feat: base permission增加搜索字段 caoqianming 2024-07-24 14:28:29 +0800
1bf498d15c fix: base thread添加日志 caoqianming 2024-07-05 10:46:33 +0800
6e39329cfa feat: base 增加自定义的thread以记录日志或发送邮件 caoqianming 2024-07-04 09:45:19 +0800
99f894e3a7 fix: myschedule 保存时的bug caoqianming 2024-06-11 11:28:58 +0800
a7100a6dd2 feat: base send_mail_task支持发送多人 zty 2024-06-07 17:08:50 +0800
597abae71f feat: base myschedule加入url caoqianming 2024-06-07 16:01:16 +0800
76cfcc2d0a fix: myscheduleserializer 返回字段bug caoqianming 2024-06-07 15:46:37 +0800
cece667c1d feat: base 去除MySchedule的权限控制 caoqianming 2024-06-07 13:41:35 +0800
6b181c8890 fix: base 对循环引用抛出异常 caoqianming 2024-06-07 09:49:17 +0800
7bbc9d7fb1 fix: base 调整handle_parent caoqianming 2024-06-06 14:50:43 +0800
23d452fe2c fix: mgroup_run_change 再从开到停时再查询一次last_stlog caoqianming 2024-07-26 10:06:31 +0800
b6d4b38103 fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2 caoqianming 2024-07-25 16:00:11 +0800
7df2cbba1e feat: base 处理父级引用parent_link bug caoqianming 2024-07-26 08:52:24 +0800
cab46ea229 fix: base handle_parent时要处理所有相关的父子关系 caoqianming 2024-07-25 18:40:55 +0800
eb81c2db2d fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误 caoqianming 2024-07-25 15:38:25 +0800
370cda6a41 feat: base permission增加搜索字段 caoqianming 2024-07-24 14:28:29 +0800
52ce49a9f3 feat: base 处理父级引用parent_link bug caoqianming 2024-07-26 08:52:24 +0800
f4c04cdf90 fix: base handle_parent时要处理所有相关的父子关系 caoqianming 2024-07-25 18:40:55 +0800
db95b27b5c fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2 caoqianming 2024-07-25 16:00:11 +0800
7fe59518c1 fix: routepack destory bug caoqianming 2024-07-25 15:40:19 +0800
6a43dcfd0d fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误 caoqianming 2024-07-25 15:38:25 +0800
51e6cc041e fix: bind_routepack bug caoqianming 2024-07-25 15:25:37 +0800
3a5d6cac55 feat: route update做限制 caoqianming 2024-07-25 13:34:09 +0800
6759ea76bf feat: material增加into_wm字段控制与车间库存交互 caoqianming 2024-07-25 13:27:44 +0800
c125652de4 feat: material添加单价字段 caoqianming 2024-07-25 13:11:01 +0800
c31bd32fb5 feat: bind_routepack 添加 t_create_by 字段 caoqianming 2024-07-25 13:06:57 +0800
71dbd6c572 feat: handover 添加返回信息 caoqianming 2024-07-25 11:31:39 +0800
b0004ba12e feat: mpointcache 存库时若测点不存在删除缓存 caoqianming 2024-07-25 10:51:54 +0800
391d9b137d feat: handover filter增加筛选条件 caoqianming 2024-07-25 08:34:50 +0800
47f4222f03 fix: mlog submit wm belong_dept 缺失 caoqianming 2024-07-24 16:43:30 +0800
3b489fdd52 feat: base permission增加搜索字段 caoqianming 2024-07-24 14:28:29 +0800
da2e880d66 Merge branch 'erp1' caoqianming 2024-07-24 13:50:22 +0800
b98227b032 feat: FtestWorkCreateUpdate 可更新抽检和合格数量 caoqianming 2024-07-24 13:50:05 +0800
7af77c484b fix: order destory bug caoqianming 2024-07-24 13:44:10 +0800
34c0f82ed1 fix: gen_material_out 优化 caoqianming 2024-07-12 10:58:48 +0800
e3f32932d8 Merge branch 'erp1' caoqianming 2024-07-24 10:55:08 +0800
94c492166d fix: orderviewset filter属性错误 caoqianming 2024-07-24 10:54:56 +0800
4bbe973071 Merge branch 'erp1' caoqianming 2024-07-24 10:52:35 +0800
2e1f94b24c feat: order增加filter/miosale增加校验 caoqianming 2024-07-24 10:51:42 +0800
0a1679d8a2 Merge branch 'erp1' caoqianming 2024-07-23 13:02:20 +0800
0e26b2188e feat: 增加ftestwork count_ok 字段 caoqianming 2024-07-23 12:56:11 +0800
c068c47bc7 feat: 增加外协生产日志功能 caoqianming 2024-07-23 10:11:31 +0800
caf83b7e0f feat: 供应商里增加外协字段 caoqianming 2024-07-23 09:42:36 +0800
da8e381b3f doc: 添加NotokOption注释 caoqianming 2024-07-23 08:39:36 +0800
0ab6e0bc72 feat: 增加不合格项接口 caoqianming 2024-07-22 17:58:21 +0800
ec0df66542 feat: 完成返工交接2 caoqianming 2024-07-22 15:32:23 +0800
9c67675ca7 feat: 完成返工交接 caoqianming 2024-07-22 15:26:45 +0800
19cac7729a feat: handoverserializer type设置为非必填 caoqianming 2024-07-19 10:24:13 +0800