 zty
|
4d498f99a3
|
fix: enm/task 水泥批号插入
|
2024-08-06 16:11:27 +08:00 |
 caoqianming
|
b2abf0128a
|
feat: pum sam 增加检索条件
|
2024-08-06 12:24:21 +08:00 |
|
caoqianming
|
06d2c5a096
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 12:21:11 +08:00 |
|
caoqianming
|
abccaf4c78
|
feat: pum sam 增加检索条件
|
2024-08-06 12:21:08 +08:00 |
|
zty
|
50cdbf9428
|
fix :enm/task 修改数据库连接
|
2024-08-06 10:53:01 +08:00 |
|
zty
|
f09a8fe4cd
|
add : db_ins_mplogx 增加测点插入数据库
|
2024-08-06 10:01:21 +08:00 |
|
zty
|
341a681d00
|
fix: get_sflog 提前起始时间
|
2024-08-06 09:54:34 +08:00 |
|
zty
|
f1a76cba74
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 09:45:10 +08:00 |
|
zty
|
73176847e0
|
feat: make_sflogs_simple 扩大范围
|
2024-08-06 09:44:24 +08:00 |
|
caoqianming
|
42c1386efd
|
feat: sflogexp增加返回信息
|
2024-08-06 08:29:21 +08:00 |
|
caoqianming
|
6931c49b3b
|
feat: oplserializer 添加返回信息
|
2024-08-04 20:28:18 +08:00 |
|
caoqianming
|
fe97d36f54
|
feat: opl添加字段
|
2024-08-04 18:50:42 +08:00 |
|
caoqianming
|
1003e0aea7
|
feat: route添加filter
|
2024-08-02 21:13:15 +08:00 |
|
caoqianming
|
c58e34a7fd
|
feat: route添加filter
|
2024-08-02 21:00:13 +08:00 |
|
caoqianming
|
fa56d61ffc
|
feat: 修改nowx使用aware
|
2024-08-02 16:39:07 +08:00 |
|
caoqianming
|
4604809bf4
|
feat: bind_routepack 时取消第一步的批次校验
|
2024-08-02 13:52:14 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
313e9ed1cd
|
fix: routeserializer优化routepack process校验3
|
2024-08-02 11:14:45 +08:00 |
|
caoqianming
|
f5482285f2
|
fix: routeserializer优化routepack process校验2
|
2024-08-02 11:11:08 +08:00 |
|
caoqianming
|
757bf89d71
|
fix: enstat hour_s查询时按真实事件查询
|
2024-08-02 10:50:22 +08:00 |
|
caoqianming
|
adffac48ad
|
fix: routeserializer优化routepack process校验
|
2024-08-02 09:13:00 +08:00 |
|
caoqianming
|
aa42ba6e3f
|
feat: submit时校验消耗和产出是否已经填写
|
2024-08-01 18:12:30 +08:00 |
|
caoqianming
|
071558af8d
|
feat: mlogbin 校验记录已存在
|
2024-08-01 17:32:48 +08:00 |
|
caoqianming
|
cbedb81b0e
|
fix: mlogbin 不合格物料校验去除
|
2024-08-01 16:54:09 +08:00 |
|
zty
|
c293dd068f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-01 15:55:22 +08:00 |
|
zty
|
261ed40d94
|
fix: fim.py cost_unit 字段
|
2024-08-01 15:55:19 +08:00 |
|
caoqianming
|
cbe516ccf5
|
fix: handover submit时更新bug
|
2024-08-01 15:25:16 +08:00 |
|
caoqianming
|
6efcf19716
|
fix: mlog_revert bug
|
2024-08-01 15:15:00 +08:00 |
|
caoqianming
|
f3f0ea132c
|
fix: find_material_can_change 只可返工到半成品
|
2024-08-01 10:30:55 +08:00 |
|
caoqianming
|
9ff4f21f9a
|
fix: mlogbin create时生成编号变更3
|
2024-08-01 09:59:39 +08:00 |
|
caoqianming
|
99ab4e1957
|
feat: mlogbin create时生成编号变更2
|
2024-08-01 09:20:15 +08:00 |
|
caoqianming
|
3f62e8709f
|
feat: 采购计划和订单增加单价和总价
|
2024-07-31 19:18:51 +08:00 |
|
caoqianming
|
9e26f416a5
|
feat: 变更物料单价字段为小数
|
2024-07-31 19:18:24 +08:00 |
|
caoqianming
|
a589fec67e
|
feat: enstat2添加统计字段
|
2024-07-31 16:53:23 +08:00 |
|
caoqianming
|
0813a3b568
|
feat: mlogbin create时生成编号变更
|
2024-07-31 16:33:32 +08:00 |
|
caoqianming
|
9dcc4c0910
|
feat: 工序增加字段batch_append_equip
|
2024-07-31 16:30:00 +08:00 |
|
caoqianming
|
93b1a80cfb
|
feat: 供应商增加字段number
|
2024-07-31 16:29:11 +08:00 |
|
caoqianming
|
821d7613d1
|
fix: get_sflog 增加 sflog创建范围
|
2024-07-31 15:55:34 +08:00 |
|
caoqianming
|
19167887d5
|
fix: mgroup_run_change bug
|
2024-07-31 15:34:50 +08:00 |
|
caoqianming
|
bea83f93d5
|
fix: 批次号追加设备编号
|
2024-07-31 14:30:53 +08:00 |
|
caoqianming
|
9ad0cf6498
|
feat: 批次号追加number
|
2024-07-31 14:27:15 +08:00 |
|
caoqianming
|
166ae8b12c
|
feat: base user增加筛选条件
|
2024-07-31 13:43:32 +08:00 |
|
caoqianming
|
321be50323
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:06:28 +08:00 |
|
caoqianming
|
e3a276c634
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:05:55 +08:00 |
|
zty
|
181a4e3a5f
|
fix: HandoverSerializer recive_mgroup 校验bug
|
2024-07-30 15:11:23 +08:00 |
|
zty
|
ebf6f739ca
|
feat: 出入库添加工段逻辑
|
2024-07-30 13:24:21 +08:00 |
|
zty
|
a587e570f0
|
feat: mio 添加 mgroup字段
|
2024-07-30 11:40:18 +08:00 |
|
caoqianming
|
893781ec7f
|
feat: db_insert_mplogx不用thread
|
2024-07-30 10:01:42 +08:00 |
|
caoqianming
|
f5c22d460b
|
Merge branch 'erp1'
|
2024-07-29 17:24:42 +08:00 |
|
caoqianming
|
e853fe33b1
|
feat: gen_material_out 优化并变更物料信息
|
2024-07-29 17:24:25 +08:00 |
|
caoqianming
|
93d26ec100
|
Merge branch 'erp1'
|
2024-07-29 16:21:22 +08:00 |
|
caoqianming
|
a4417e7a4f
|
fix: gen_material_out bug
|
2024-07-29 16:20:43 +08:00 |
|
caoqianming
|
ebfb96b12e
|
feat: material delete 时 update 子物料
|
2024-07-29 16:16:20 +08:00 |
|
caoqianming
|
76c14460f5
|
fix: base handle_parent 错误
|
2024-07-29 11:12:53 +08:00 |
|
caoqianming
|
effffe34bf
|
fix: base handle_parent 错误
|
2024-07-29 11:12:13 +08:00 |
|
caoqianming
|
92c6939a9c
|
refactor: base 更新permission 描述
|
2024-07-29 10:32:36 +08:00 |
|
caoqianming
|
38eaefe3bb
|
refactor: base 更新permission 描述
|
2024-07-29 10:31:46 +08:00 |
|
caoqianming
|
05b46b5351
|
fix: EnvData get_or_create 避免报错
|
2024-07-29 08:38:57 +08:00 |
|
caoqianming
|
b428f36014
|
Merge branch 'erp1'
|
2024-07-26 17:41:09 +08:00 |
|
caoqianming
|
7f935dbf57
|
fix: datarecordviewset 继承错误
|
2024-07-26 17:40:54 +08:00 |
|
caoqianming
|
e78cdca9ae
|
Merge branch 'erp1'
|
2024-07-26 17:33:26 +08:00 |
|
caoqianming
|
02a9445596
|
feat: 添加dataset接口
|
2024-07-26 17:32:08 +08:00 |
|
caoqianming
|
ae55a62ced
|
Merge branch 'erp1'
|
2024-07-26 17:19:00 +08:00 |
|
caoqianming
|
2a225bdc86
|
feat: 添加定时执行bi的task和记录表
|
2024-07-26 17:18:42 +08:00 |
|
caoqianming
|
e5cd203e04
|
Merge branch 'erp1'
|
2024-07-26 16:57:04 +08:00 |
|
caoqianming
|
9c27ffd7dd
|
feat: testitem 增删改查
|
2024-07-26 16:56:29 +08:00 |
|
caoqianming
|
23d452fe2c
|
fix: mgroup_run_change 再从开到停时再查询一次last_stlog
|
2024-07-26 10:06:31 +08:00 |
|
caoqianming
|
b6d4b38103
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2
|
2024-07-26 09:07:59 +08:00 |
|
caoqianming
|
7df2cbba1e
|
feat: base 处理父级引用parent_link bug
|
2024-07-26 09:04:46 +08:00 |
|
caoqianming
|
cab46ea229
|
fix: base handle_parent时要处理所有相关的父子关系
|
2024-07-26 09:03:54 +08:00 |
|
caoqianming
|
eb81c2db2d
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误
|
2024-07-26 09:03:35 +08:00 |
|
caoqianming
|
370cda6a41
|
feat: base permission增加搜索字段
|
2024-07-26 09:03:08 +08:00 |
|
caoqianming
|
52ce49a9f3
|
feat: base 处理父级引用parent_link bug
|
2024-07-26 08:52:24 +08:00 |
|
caoqianming
|
f4c04cdf90
|
fix: base handle_parent时要处理所有相关的父子关系
|
2024-07-25 18:40:55 +08:00 |
|
caoqianming
|
db95b27b5c
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2
|
2024-07-25 16:00:11 +08:00 |
|
caoqianming
|
7fe59518c1
|
fix: routepack destory bug
|
2024-07-25 15:40:19 +08:00 |
|
caoqianming
|
6a43dcfd0d
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误
|
2024-07-25 15:38:25 +08:00 |
|
caoqianming
|
51e6cc041e
|
fix: bind_routepack bug
|
2024-07-25 15:25:37 +08:00 |
|
caoqianming
|
3a5d6cac55
|
feat: route update做限制
|
2024-07-25 13:34:09 +08:00 |
|
caoqianming
|
6759ea76bf
|
feat: material增加into_wm字段控制与车间库存交互
|
2024-07-25 13:27:44 +08:00 |
|
caoqianming
|
c125652de4
|
feat: material添加单价字段
|
2024-07-25 13:11:01 +08:00 |
|
caoqianming
|
c31bd32fb5
|
feat: bind_routepack 添加 t_create_by 字段
|
2024-07-25 13:06:57 +08:00 |
|
caoqianming
|
71dbd6c572
|
feat: handover 添加返回信息
|
2024-07-25 11:31:39 +08:00 |
|
caoqianming
|
b0004ba12e
|
feat: mpointcache 存库时若测点不存在删除缓存
|
2024-07-25 10:51:54 +08:00 |
|
caoqianming
|
391d9b137d
|
feat: handover filter增加筛选条件
|
2024-07-25 08:34:50 +08:00 |
|
caoqianming
|
47f4222f03
|
fix: mlog submit wm belong_dept 缺失
|
2024-07-24 16:43:30 +08:00 |
|
caoqianming
|
3b489fdd52
|
feat: base permission增加搜索字段
|
2024-07-24 14:28:29 +08:00 |
|
caoqianming
|
da2e880d66
|
Merge branch 'erp1'
|
2024-07-24 13:50:22 +08:00 |
|
caoqianming
|
b98227b032
|
feat: FtestWorkCreateUpdate 可更新抽检和合格数量
|
2024-07-24 13:50:05 +08:00 |
|
caoqianming
|
7af77c484b
|
fix: order destory bug
|
2024-07-24 13:44:10 +08:00 |
|
caoqianming
|
34c0f82ed1
|
fix: gen_material_out 优化
|
2024-07-24 11:20:30 +08:00 |
|
caoqianming
|
e3f32932d8
|
Merge branch 'erp1'
|
2024-07-24 10:55:08 +08:00 |
|
caoqianming
|
94c492166d
|
fix: orderviewset filter属性错误
|
2024-07-24 10:54:56 +08:00 |
|
caoqianming
|
4bbe973071
|
Merge branch 'erp1'
|
2024-07-24 10:52:35 +08:00 |
|
caoqianming
|
2e1f94b24c
|
feat: order增加filter/miosale增加校验
|
2024-07-24 10:51:42 +08:00 |
|
caoqianming
|
0a1679d8a2
|
Merge branch 'erp1'
|
2024-07-23 13:02:20 +08:00 |
|
caoqianming
|
0e26b2188e
|
feat: 增加ftestwork count_ok 字段
|
2024-07-23 12:56:11 +08:00 |
|
caoqianming
|
c068c47bc7
|
feat: 增加外协生产日志功能
|
2024-07-23 10:11:31 +08:00 |
|
caoqianming
|
caf83b7e0f
|
feat: 供应商里增加外协字段
|
2024-07-23 09:42:36 +08:00 |
|
caoqianming
|
da8e381b3f
|
doc: 添加NotokOption注释
|
2024-07-23 08:39:36 +08:00 |