Commit Graph

207 Commits

Author SHA1 Message Date
caoqianming 1a296e8e30 feat: process添加工序类型 2024-12-12 15:17:26 +08:00
caoqianming a432dca39b feat: mgroup添加查询条件 2024-12-12 11:18:07 +08:00
caoqianming 80fd2090ad feat: 工段添加code标识 2024-12-12 11:10:01 +08:00
caoqianming c79cc14f46 feat: mpoint增加is_rep_ep0_running_state字段 2024-12-11 17:54:45 +08:00
caoqianming 15de6e3a5e feat: srule list 返回rule_display 2024-12-05 18:13:11 +08:00
zty 4c38cee983 add: mtm/model serializer view 增加tkx 自动排班 2024-11-28 14:28:24 +08:00
zty 96f4b0c445 feat: apps/enm 新增成本计算 2024-10-10 13:33:58 +08:00
zty 9a3e15f926 feat: 优化mgroup_run_change 2024-09-26 11:51:36 +08:00
zty 6c6a6ce440 fix: mtm/service note 2024-09-13 15:21:26 +08:00
zty 7aae49b378 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-09-13 13:41:29 +08:00
zty c4607e1608 fix /enm/service.py 停机时间短 无班组 加入异常原因 2024-09-13 13:40:45 +08:00
caoqianming 0148efba62 feat: process添加中间状态 2024-09-03 10:58:33 +08:00
caoqianming 2a8254b581 feat: process添加mlog_need_ticket字段 2024-09-02 17:04:59 +08:00
caoqianming 1855e3ae67 feat: bind_routepack 时校验产出是否一致 2024-08-29 10:51:44 +08:00
caoqianming 33a7e7320b fix: daoru_material 增加校验 2024-08-21 14:12:52 +08:00
caoqianming 1e667e69ac feat: daoru_material 增加校验 2024-08-20 14:39:38 +08:00
caoqianming 592e34c07e refector: mgroup_on_change时创建stlog优化 2024-08-20 08:56:08 +08:00
caoqianming a9acf6d187 feat: 物料导入模板增加编号列 2024-08-14 17:42:27 +08:00
caoqianming cc5dcc9685 fix: gen_material_out bug 2024-08-13 16:29:59 +08:00
caoqianming 3f32390fb2 feat: 自动生成物料时延续cate 2024-08-08 09:12:46 +08:00
caoqianming 211fd1ac77 feat: 增加material cate 接口 2024-08-07 10:54:00 +08:00
caoqianming c58e34a7fd feat: route添加filter 2024-08-02 21:00:13 +08:00
caoqianming 4604809bf4 feat: bind_routepack 时取消第一步的批次校验 2024-08-02 13:52:14 +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 adffac48ad fix: routeserializer优化routepack process校验 2024-08-02 09:13:00 +08:00
caoqianming 9e26f416a5 feat: 变更物料单价字段为小数 2024-07-31 19:18:24 +08:00
caoqianming 9dcc4c0910 feat: 工序增加字段batch_append_equip 2024-07-31 16:30:00 +08:00
caoqianming 19167887d5 fix: mgroup_run_change bug 2024-07-31 15:34:50 +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 e5cd203e04 Merge branch 'erp1' 2024-07-26 16:57:04 +08:00
caoqianming 23d452fe2c fix: mgroup_run_change 再从开到停时再查询一次last_stlog 2024-07-26 10:06:31 +08:00
caoqianming 7fe59518c1 fix: routepack destory bug 2024-07-25 15:40:19 +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 34c0f82ed1 fix: gen_material_out 优化 2024-07-24 11:20:30 +08:00
caoqianming cb5ede39f0 feat: process admin 字段展示 2024-07-18 16:46:49 +08:00
caoqianming d561a0d24b feat: 日志提交时不合格品存储到车间库存 2024-07-18 11:30:10 +08:00
caoqianming 876c18149e feat: route增加返回字段 2024-07-15 17:32:45 +08:00
caoqianming 6e904f083a fix: gen_material_out 优化 2024-07-12 10:58:48 +08:00
caoqianming 12fb18205d feat: 增加route和routepack查询条件 2024-07-11 13:28:30 +08:00
caoqianming 2d522a1fd4 feat: route增加batch_bind字段/mlogbin接口 2024-07-11 11:26:18 +08:00
caoqianming 2f5edc041c feat: mlog init 2024-07-10 15:32:33 +08:00
caoqianming 8872d63aae fix: 优化cal_material_count 2024-07-08 08:57:38 +08:00
caoqianming b18f39d95d fix: routepack serializer validate bug 2024-07-08 08:25:45 +08:00
caoqianming 92903e7014 feat: cal_material_count 重构 2024-07-04 16:23:28 +08:00
caoqianming 511b149290 feat: 增加routepack返回信息 2024-07-04 10:25:22 +08:00
caoqianming 7381a65c24 feat: 重新梳理计算物料总数量 2024-07-04 10:04:49 +08:00
caoqianming 436719d9ff feat: 依据routepack进行任务派发 2024-07-03 16:46:01 +08:00
caoqianming 439c8a0f88 feat: routepack增加返回信息 2024-07-03 13:02:39 +08:00
caoqianming bad338ba67 feat: 增加routepack_ticket_change方法 2024-07-02 17:09:15 +08:00
caoqianming c1161c4391 feat: routepack bind ticket 2024-07-02 16:40:43 +08:00
caoqianming b2664ca81b feat: 修改route serializer 2024-07-02 15:44:48 +08:00
caoqianming 15c4e195f3 feat: 添加routepack表 2024-07-02 14:12:13 +08:00
caoqianming d579a7358d feat: 根据光芯需求对wpm做兼容性处理 2024-07-01 10:07:57 +08:00
caoqianming 2bb860f8dd feat: 添加工时字段 2024-06-21 14:31:31 +08:00
caoqianming 7c0df5f804 fix: raise 工艺路线未配置 2024-06-21 11:15:35 +08:00
caoqianming 458385c0f6 feat: material增加count_mb字段 2024-05-28 14:29:20 +08:00
caoqianming b4b3d6eadc feat: hour计数改为sec计数 步骤2 2024-05-15 10:31:17 +08:00
caoqianming a3f5e48b8c feat: hour计数改为sec计数 2024-05-15 10:06:49 +08:00
caoqianming 52d9407346 feat: 班次表增加排序 2024-05-13 09:39:15 +08:00
caoqianming 02a8693a65 fix: cal_enstat前调用一下get_total_hour_now 2024-05-07 09:58:32 +08:00
caoqianming d720dc9c9b fix: mgroup is_running字段更改2 2024-04-29 10:17:42 +08:00
caoqianming fa6d6da1d2 fix: mgroup is_running字段更改 2024-04-29 10:17:31 +08:00
caoqianming 3e56fa7390 feat: 物料删除时进行校验和相应的数据矫正 2024-04-19 14:32:06 +08:00
caoqianming bd1897f6f6 feat: correct_material_cate 2024-04-11 11:29:21 +08:00
caoqianming 3c1319d48f feat: material增加search字段 2024-04-07 19:15:10 +08:00
caoqianming 3eb7b76095 fix: material create指定所到工序校验 2024-04-02 16:12:14 +08:00
caoqianming 6e4298873f feat: 增加周预估消耗量字段 2024-03-20 17:39:44 +08:00
caoqianming 5aab22e9d9 fix: 工段删除同时更新route 2024-03-04 14:22:22 +08:00
caoqianming eecda9e5a6 fix: material导入可更改count_safe 2024-03-04 10:44:42 +08:00
caoqianming 70b5a4d87e fix: material unit 忽略大小写2 2024-03-04 10:37:33 +08:00
caoqianming 9cd5bfc8f9 fix: material unit 忽略大小写 2024-03-04 10:25:58 +08:00
caoqianming fcc613170e feat: 物料信息导入功能 2024-03-04 09:58:09 +08:00
caoqianming 373a4999c3 fix: materialcreateserializer bug 2024-03-01 15:58:04 +08:00
caoqianming d3ae9d4a79 fix: mgroup筛选bug 2024-03-01 15:57:19 +08:00
caoqianming e089a02a32 feat: Material create校验是否存在 2024-01-29 18:25:10 +08:00
caoqianming e1fae87bcb feat: 更改物料排序 2024-01-29 18:15:57 +08:00
caoqianming 32733e9800 fix: materialserializer count只读 2024-01-29 18:10:07 +08:00
caoqianming 9ff3ee2040 feat: 修改物料清单默认排序 2024-01-29 16:00:00 +08:00
caoqianming c88f33ad4d feat: 增加material name查询条件 2024-01-19 14:56:48 +08:00
caoqianming 679e6bac4f feat: 增加物料导入功能 2024-01-19 14:36:08 +08:00
caoqianming c11132e38f feat: 添加drainequip及其返回envdata信息 2024-01-15 17:30:29 +08:00
caoqianming 059aee0acf feat: material增加筛选条件 2023-12-28 09:55:24 +08:00
caoqianming 90c7d0e5a1 feat: gen_material_out 优化 2023-12-23 20:58:31 +08:00
caoqianming 0b20386fcc fix: 取消带-中字样的 2023-12-21 09:41:10 +08:00
caoqianming 85a49c4b0f feat: material 返回 __str__修改 2023-12-20 15:05:22 +08:00
caoqianming 570570b517 feat: materialserializer 也返回full_name 2023-12-20 14:47:11 +08:00
caoqianming 1e6faad79b feat: material_simple_serializer full_name完整信息 2023-12-20 14:41:28 +08:00
caoqianming ea8465cb2e feat: route serializer增加返回数据 2023-12-20 14:31:26 +08:00
caoqianming dff1e412b6 feat: 修改material __str__ 2023-12-16 12:00:20 +08:00
caoqianming aa2dc2e0fc feat: 增加materialsimpleserializer的返回full_name 2023-12-16 11:56:51 +08:00
caoqianming e3c0273e0d feat: 增加material查询条件 2023-12-01 15:25:39 +08:00