factory

Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

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

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
92fc1e9e0a feat: 添加返修交接支持 caoqianming 2024-07-19 10:04:02 +0800
cb5ede39f0 feat: process admin 字段展示 caoqianming 2024-07-18 16:46:49 +0800
a3e51a84db refector: HandoverSerializer validate 优化 caoqianming 2024-07-18 16:32:31 +0800
30be6dc291 fix: mlogchange 改 mlogupdate caoqianming 2024-07-18 15:58:53 +0800
6fd2f2a009 fix: MyThread 调用错误 caoqianming 2024-07-18 15:36:23 +0800
950b017073 feat: mlog_submit 时校验handle_date caoqianming 2024-07-18 14:48:55 +0800
9b3cbe75ae feat: submit时校验mlogbout caoqianming 2024-07-18 14:48:36 +0800
6778af3f07 fix: 增加mlogb.update权限标识 caoqianming 2024-07-18 14:31:34 +0800
8d75f3f251 feat: 增加mlogb.update权限标识 caoqianming 2024-07-18 14:26:39 +0800
6a51fd1177 feat: 添加筛选条件和mlogbin 校验 caoqianming 2024-07-18 13:46:16 +0800
d561a0d24b feat: 日志提交时不合格品存储到车间库存 caoqianming 2024-07-18 11:30:10 +0800
ee65658145 fix: MlogbInSerializer bug caoqianming 2024-07-17 17:08:42 +0800
c058fe9338 feat: 支持不合格品处理/添加不合格品存储字段 caoqianming 2024-07-17 16:58:28 +0800
83ec822f9d fix: db_insert_mplogx bug caoqianming 2024-07-16 15:36:40 +0800
d31cf4d143 feat: 从数据库转存到超表做count限制 caoqianming 2024-07-16 14:50:50 +0800
bf98ea8a48 feat: 从数据库转存到超表 caoqianming 2024-07-16 14:06:46 +0800
ab413eed81 feat: 停机记录在小于60s可删除 caoqianming 2024-07-16 10:58:33 +0800
061a291889 feat: 增加handover和mio的查询条件 caoqianming 2024-07-15 17:57:39 +0800
876c18149e feat: route增加返回字段 caoqianming 2024-07-15 17:32:45 +0800
79900462ff feat: 交接记录receive_dept非必填 caoqianming 2024-07-15 17:05:13 +0800
07680704ec feat: cal_mtask_progress_from_mlog caoqianming 2024-07-15 16:57:09 +0800
6e904f083a fix: gen_material_out 优化 caoqianming 2024-07-12 10:58:48 +0800
af80e3ce5b fix: mlogb type filter bug caoqianming 2024-07-12 10:50:41 +0800
4934327808 feat: mlogbout url register caoqianming 2024-07-11 17:44:18 +0800
d38e91667e fix: mlogb init serializer bug caoqianming 2024-07-11 17:04:01 +0800
b33c86fd6e feat: mlogb in update 接口 caoqianming 2024-07-11 15:58:08 +0800
ac1b4b6c3e feat: mlogb增加筛选条件 caoqianming 2024-07-11 15:57:49 +0800
debc268c88 feat: mlog增加不合格项目字段= caoqianming 2024-07-11 15:57:18 +0800
deeda736b9 feat: mlog增加不合格项目字段 caoqianming 2024-07-11 15:55:44 +0800
12fb18205d feat: 增加route和routepack查询条件 caoqianming 2024-07-11 13:28:30 +0800
4177ba93f8 feat: wmaterial增加mgroupx 查询条件 caoqianming 2024-07-11 13:13:39 +0800
5ad15c0a9e feat: MlogbIn create时同步创建out caoqianming 2024-07-11 13:06:48 +0800
2d522a1fd4 feat: route增加batch_bind字段/mlogbin接口 caoqianming 2024-07-11 11:26:18 +0800
2f08b9ce81 feat: mtask 添加route查询条件 caoqianming 2024-07-11 11:24:37 +0800
2e60cb7eaf feat: mlog change接口 caoqianming 2024-07-11 08:44:40 +0800
2f5edc041c feat: mlog init caoqianming 2024-07-10 15:32:33 +0800
4c93bb98de fix: daoru_mb cal_material bug caoqianming 2024-07-09 16:16:32 +0800
6754b668bc fix: handover serializer validate bug caoqianming 2024-07-09 14:03:44 +0800
8872d63aae fix: 优化cal_material_count caoqianming 2024-07-08 08:57:38 +0800
b18f39d95d fix: routepack serializer validate bug caoqianming 2024-07-08 08:25:45 +0800
56e40e6dd3 fix: 更改mythread的使用 caoqianming 2024-07-05 10:49:17 +0800
b9f2264ff4 fix: base thread添加日志 caoqianming 2024-07-05 10:46:33 +0800
24b2a98440 refecor: 一些处理 caoqianming 2024-07-05 08:49:36 +0800
df2db0ddd9 fix: schedue_mtasks serializer用错 caoqianming 2024-07-04 17:26:13 +0800
e4f9fd34f0 fix: schedule_type 单词错误 caoqianming 2024-07-04 17:20:20 +0800
92903e7014 feat: cal_material_count 重构 caoqianming 2024-07-04 16:23:28 +0800
511b149290 feat: 增加routepack返回信息 caoqianming 2024-07-04 10:25:22 +0800
7381a65c24 feat: 重新梳理计算物料总数量 caoqianming 2024-07-04 10:04:49 +0800
ffc9f0ee4d feat: base 增加自定义的thread以记录日志或发送邮件 caoqianming 2024-07-04 09:45:19 +0800
436719d9ff feat: 依据routepack进行任务派发 caoqianming 2024-07-03 16:46:01 +0800
14994b424a fix: enp添加设备权限bug caoqianming 2024-07-03 15:56:52 +0800
a0dae66cf7 feat: 根据光芯需求对wpm做兼容性处理2 caoqianming 2024-07-03 13:19:21 +0800
439c8a0f88 feat: routepack增加返回信息 caoqianming 2024-07-03 13:02:39 +0800
59b8634d3e fix: handover serializer bug2 caoqianming 2024-07-02 23:25:14 +0800
67ca07bb35 fix: handover serializer bug caoqianming 2024-07-02 23:04:16 +0800
bad338ba67 feat: 增加routepack_ticket_change方法 caoqianming 2024-07-02 17:09:15 +0800
c1161c4391 feat: routepack bind ticket caoqianming 2024-07-02 16:40:43 +0800
b2664ca81b feat: 修改route serializer caoqianming 2024-07-02 15:44:48 +0800
15c4e195f3 feat: 添加routepack表 caoqianming 2024-07-02 14:12:13 +0800
427bf31d50 fix: mlogb 取material bug caoqianming 2024-07-02 12:09:08 +0800
a6a3dcf33c fix: handover validate bug caoqianming 2024-07-01 16:21:52 +0800
d579a7358d feat: 根据光芯需求对wpm做兼容性处理 caoqianming 2024-07-01 10:07:57 +0800
3c52125440 feat: wm,handover,mlog增加检索条件 caoqianming 2024-06-28 15:29:39 +0800
9572614b02 fix: enstat to_repre时若使用query时的bug caoqianming 2024-06-27 09:05:45 +0800
85bbdd6cd9 feat: 优化transfer_mpoint_val_to_ep_running_state caoqianming 2024-06-26 10:11:43 +0800
02d672a39d feat: 增加mpoint查询条件 caoqianming 2024-06-26 10:11:21 +0800
450fe06093 fix: schedue_mtasks schedue_type bug caoqianming 2024-06-25 15:50:30 +0800
d766d880e7 feat: utask支持恢复任务/排产支持传入to_day caoqianming 2024-06-24 18:23:51 +0800
643efa448e fix: mpointserializer获取last_data优化 caoqianming 2024-06-24 16:45:05 +0800
499e5732aa fix: 更新所监测设备测点的total_production忽略必须指定设备 caoqianming 2024-06-24 10:02:54 +0800
ac7e0a84ea feat: pm 添加工时字段 caoqianming 2024-06-21 15:48:14 +0800
2bb860f8dd feat: 添加工时字段 caoqianming 2024-06-21 14:31:31 +0800
5efd9888dd feat: 交接记录提交只要是同部门的就可以2 caoqianming 2024-06-21 13:27:47 +0800