Commit Graph

3222 Commits

Author SHA1 Message Date
caoqianming b400b13ded feat: 通过指定mat_in/mat_out复制工艺路线 2025-04-03 14:48:14 +08:00
caoqianming a8f9676ed0 fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal 2025-04-03 08:34:57 +08:00
caoqianming a79717abd8 fix: 组合件入库后未添加count的bug 2025-04-02 18:39:31 +08:00
caoqianming 18546d48f5 feat: 销售发货编号非必填 2025-04-02 16:31:12 +08:00
caoqianming 2923fad2a8 feat: HTML_BASE_URL 前缀统一修改 2025-04-02 11:04:46 +08:00
caoqianming 5fe24c381b feat: sysbaseview返回系统版本号 2025-04-02 10:12:30 +08:00
caoqianming 783a56dfea fix: get_can_save_from_save_expr的match转为str 2025-04-02 09:32:33 +08:00
caoqianming 6dfb5c489a fix: 该工艺步骤已存在的校验bug 2025-04-01 15:41:33 +08:00
caoqianming c05c59b004 feat: handover数据库变动/初步更新批次数据关系链 2025-03-31 16:42:18 +08:00
caoqianming cb28f1d9ef feat: 添加mio,mlog,handover关于batch的查询条件 2025-03-31 15:35:39 +08:00
caoqianming 146fe6641f feat: get_batch_dag节点排序改动 2025-03-31 15:11:43 +08:00
caoqianming 3c0e416735 feat: 支持退料交接 2025-03-31 14:17:20 +08:00
caoqianming 88da422f54 feat: mlogchangeserializer增加生产设备选择 2025-03-31 13:36:25 +08:00
caoqianming cb1b2dfae6 fix: cal_x_task_count bug 2025-03-28 10:25:30 +08:00
caoqianming 98d76424c7 feat: route create update 强校验4 2025-03-28 09:20:08 +08:00
caoqianming c541e58006 feat: route create update 强校验3 2025-03-28 09:07:50 +08:00
caoqianming 6b3a34879e feat: route create update 强校验2 2025-03-28 08:49:57 +08:00
caoqianming 4b9e65ba40 feat: route create update 强校验 2025-03-28 08:48:05 +08:00
caoqianming 18e5ca2598 fix: routeserializer material_out_tracking错误 2025-03-28 08:29:25 +08:00
caoqianming 73f0e504c9 feat: batchst g_create 默认relation_type 2025-03-28 08:28:58 +08:00
caoqianming 40370b876f fix: 分配任务的get_routes 参数bug 2025-03-27 17:21:58 +08:00
caoqianming ce38115255 fix: validate_and_return_gjson bug 2025-03-27 13:36:34 +08:00
caoqianming afe53f3687 fix: _validate_subgraph bug 2025-03-27 12:50:07 +08:00
caoqianming c002017a84 feat: 工艺路线支持子图逻辑 2025-03-27 12:40:09 +08:00
caoqianming a31faa0cda feat: 添加route pack dag显示 2025-03-26 17:23:38 +08:00
caoqianming 2d7183f8dd feat: 简化validate dag 的报错提示 2025-03-26 16:45:39 +08:00
caoqianming eaa5d75b99 feat: 工艺路线校验 2025-03-26 16:36:29 +08:00
caoqianming bac30a2925 feat: wpr追溯上游 2025-03-26 15:17:26 +08:00
caoqianming 4e7757f64d feat: 合批时的物料校验 2025-03-26 13:30:39 +08:00
caoqianming 0ddc6692ac feat: handover 合并可指定现有库存 2025-03-26 13:19:30 +08:00
caoqianming 3e074b51e3 feat: routepack变更工艺路线的状态 2025-03-26 09:10:33 +08:00
caoqianming 5c77eb2742 feat: testscan页面2 2025-03-25 16:15:53 +08:00
caoqianming 0c9c38890e feat: testscan页面 2025-03-25 16:04:52 +08:00
caoqianming 8bf3ad06d6 feat: mlog get_queryset bug 2025-03-25 15:40:53 +08:00
caoqianming 546b020dae feat: mloguserserializer handle_user_name 2025-03-25 14:59:01 +08:00
caoqianming 7f2aaf3f86 feat: process添加查询条件 2025-03-25 14:19:29 +08:00
caoqianming 22e64e5b84 fix: 其他入库允许wpr非必填 2025-03-25 11:17:27 +08:00
caoqianming 0e8cce0669 feat: get_batch_dag bug2 2025-03-25 09:54:57 +08:00
caoqianming 11d7e1a772 feat: get_batch_dag bug 2025-03-25 09:51:25 +08:00
caoqianming 52b96dc740 fix: batchst g_create bug 2025-03-25 09:48:17 +08:00
caoqianming 6f28056ed4 feat: 重构以下batchlog 2025-03-25 09:44:22 +08:00
caoqianming b9a3427162 feat: batchst添加查询条件 2025-03-24 15:18:44 +08:00
caoqianming d4df340c1c feat: batchst添加字段以追踪material_start 2025-03-24 15:16:37 +08:00
caoqianming b070b312a8 feat: batchst添加字段以追踪 2025-03-24 15:07:50 +08:00
caoqianming e07f9c877c feat: 添加mloguser字段及逻辑 2025-03-24 14:37:18 +08:00
caoqianming c1a4edf9e5 fix: handover 创建并提交的接口 2025-03-24 09:02:03 +08:00
caoqianming 468cb7b658 feat: handover 创建并提交的接口 2025-03-24 08:42:02 +08:00
caoqianming 5ee10e7cc5 fix: handover 合批时创建关系链的bug 2025-03-24 08:41:43 +08:00
caoqianming f57604492b fix: batchst create bug 2025-03-21 17:54:50 +08:00
caoqianming 9780cd8021 feat: utask编号可不填2 2025-03-21 16:54:52 +08:00
caoqianming d8c421969c feat: utask编号可不填 2025-03-21 16:48:52 +08:00
caoqianming 43ddafa6d7 feat: mio 编号可不填 2025-03-21 16:47:03 +08:00
caoqianming 0842806f83 feat: process添加parent字段 2025-03-21 16:33:30 +08:00
caoqianming 108116342e feat: batchlog数据链 2025-03-21 14:15:10 +08:00
caoqianming 23ad849e36 fix: wpr oinfo bug 2025-03-21 12:15:05 +08:00
caoqianming 8867e76701 feat: wpr oinfo bug 2025-03-21 11:30:56 +08:00
caoqianming 0474d0a943 feat: mioitem wm校验 2025-03-20 11:34:51 +08:00
caoqianming 1289c19aaa feat: MIODo 可不填belong_dept 2025-03-20 11:24:06 +08:00
caoqianming a773f4884b feat: mio number不设置为只读 2025-03-20 10:50:44 +08:00
caoqianming 5e3069b147 feat: mlog count_fields 可不带count_ok_full 2025-03-20 09:51:15 +08:00
caoqianming fa66a9a4d5 fix: wmaterial search bug 2025-03-20 09:38:28 +08:00
caoqianming 3ad7acafc9 fix: wmaterial search bug3 2025-03-20 09:37:07 +08:00
caoqianming cde3d68d7f fix: wmaterial search bug2 2025-03-20 09:34:59 +08:00
caoqianming d136f96bcc fix: wmaterial search bug 2025-03-20 09:33:11 +08:00
caoqianming 77f411887a feat: mio utask number非必填 2025-03-20 09:30:33 +08:00
caoqianming 48988d3237 fix: wmaterial 去除 material__process__exclude 字段 2025-03-20 09:09:41 +08:00
caoqianming 1761dcdf6d feat: mioitemcreate 增加校验 2025-03-19 18:51:31 +08:00
caoqianming a0084f7825 feat: mgroup增加自产和外协字段及相关逻辑校验 2025-03-19 14:32:24 +08:00
caoqianming 459fc3bbe8 feat: mgroup增加自产和外协字段及相关逻辑 2025-03-19 14:27:07 +08:00
caoqianming 1040e55a48 feat: wpr增加wpr_from的相关逻辑 2025-03-19 14:08:34 +08:00
caoqianming da084e21cb feat: wmaterial增加来源批次和物料 2025-03-19 13:35:27 +08:00
caoqianming b9b418e81f feat: FtestWorkCreateUpdateSerializer defect非必填 2025-03-19 11:17:20 +08:00
caoqianming 6d435a21e4 feat: base route支持iframe 2025-03-19 08:59:36 +08:00
caoqianming f92c696a9e feat: base get_user_route排序增加create_time 2025-03-19 08:14:16 +08:00
caoqianming 982fa7f373 fix: mlogbupdate serializer 2025-03-18 14:35:11 +08:00
caoqianming 2238ab119d feat: mpoint增加存储表达式用于决定是否存储 2025-03-18 14:15:22 +08:00
caoqianming 70c415aa1f feat: mlogbinserializer update也进行支持 2025-03-18 13:58:49 +08:00
caoqianming da3c672dd1 feat: qm增加最大不合格率字段 2025-03-18 13:43:15 +08:00
caoqianming 232ecb0f45 fix: MlogbSerializer mlog字段只读 2025-03-18 10:47:46 +08:00
caoqianming 6d6e4e88ae fix: MlogbSerializer mlog字段取消 2025-03-18 10:36:58 +08:00
caoqianming f7e3e7977d feat: mlogb增加count_json 2025-03-18 10:30:13 +08:00
caoqianming c44b71b847 feat: 默认密码从get_sysconfig获取 2025-03-18 10:07:23 +08:00
caoqianming 64af59d22d fix: kingclient 优化 2025-03-17 16:32:56 +08:00
caoqianming 2b1d22df85 feat: pm改成小数字段 2025-03-17 10:45:33 +08:00
caoqianming 53a3105f10 fix: 转成 小数后的to_representation bug 2025-03-17 10:33:11 +08:00
caoqianming 5bda6adf92 fix: mlogdefect 非必填 2025-03-17 10:06:21 +08:00
caoqianming 10a5d3301e feat: 日志变更模型以支持小数 2025-03-17 09:55:31 +08:00
caoqianming 8928bb4307 fix: wpr delete在撤销时可以触发 2025-03-14 18:19:31 +08:00
caoqianming 443a818aec feat: 一次填写的也mlogb_from 2025-03-14 18:14:43 +08:00
caoqianming 8f079c9d5d feat: 通过is_fix支持ftestwork转mlog 2025-03-14 17:07:08 +08:00
caoqianming 9489f80b3f fix: 个到个的拆分bug9 2025-03-14 16:32:55 +08:00
caoqianming 42f5c20f86 fix: 个到个的拆分bug8 2025-03-14 16:32:02 +08:00
caoqianming 099fe4b18b fix: 个到个的拆分bug7 2025-03-14 16:10:40 +08:00
caoqianming a66d47ec47 fix: 个到个的拆分bug6 2025-03-14 16:06:49 +08:00
caoqianming 43ca73ab15 feat: 添加update_dict函数 2025-03-14 16:02:06 +08:00
caoqianming c8cde0a436 fix: 个到个的拆分bug5 2025-03-14 16:01:54 +08:00
caoqianming 6fa9c9182b fix: 个到个的拆分bug4 2025-03-14 15:35:37 +08:00
caoqianming 82b4f39fed fix: 个到个的拆分bug3 2025-03-14 15:28:26 +08:00
caoqianming 60a7827e1b fix: 个到个的拆分bug2 2025-03-14 15:20:32 +08:00
caoqianming 5ba937ecd8 fix: 个到个的拆分bug 2025-03-14 14:29:36 +08:00
caoqianming 20e431cb7d feat: mtask添加筛选条件 2025-03-14 14:16:54 +08:00
caoqianming 7488900ac8 feat: mlogbw destory bug 2025-03-14 13:17:53 +08:00
caoqianming b067ec2ea7 fix: handover validate handoverbw的bug 2025-03-14 09:57:28 +08:00
caoqianming 143408ab4f feat: 添加mes的清空数据操作 2025-03-14 09:05:31 +08:00
caoqianming dcfa6155a9 feat: 调整wpmw允许编号重复 2025-03-14 09:02:49 +08:00
caoqianming f58b84a4ee feat: 物料编号允许非不同物料的重复 2025-03-13 17:37:54 +08:00
caoqianming dafdb8f608 fix: 调整数据结构4 2025-03-13 17:13:34 +08:00
caoqianming 9ef752cb05 fix: 调整数据结构3 2025-03-13 17:11:02 +08:00
caoqianming a350d97202 fix: 调整数据结构2 2025-03-13 16:58:07 +08:00
caoqianming ed80edbef8 fix: 调整数据结构 2025-03-13 16:46:32 +08:00
caoqianming 38dc9199e2 feat: 调整数据结构 2025-03-13 16:33:59 +08:00
caoqianming f43726a884 fix: mlogbin 删除时未对应删除mlogbout的bug 2025-03-13 12:48:16 +08:00
caoqianming 7cca8b7277 fix: handover需要进行3层校验 2025-03-13 12:02:43 +08:00
caoqianming 31ef257a60 feat: attrs["count"] = len(attrs["handoverb"]) 2025-03-13 10:58:09 +08:00
caoqianming 71b67b7210 feat: miodo 所属部门可不编辑 2025-03-13 09:56:15 +08:00
caoqianming c0ffb175a9 feat: wpmw number允许重复 2025-03-12 16:10:44 +08:00
caoqianming 64ca8b97ad fix: mlogbw删除bug2 2025-03-12 14:55:43 +08:00
caoqianming 8bd3e120df fix: mlogbw删除bug 2025-03-12 14:53:28 +08:00
caoqianming e52b894603 fix: mlogbw delete bug3 2025-03-12 14:28:11 +08:00
caoqianming 459d2348d4 fix: mlogbw delete bug2 2025-03-12 14:24:01 +08:00
caoqianming d847b84fd8 fix: mlogbw delete bug 2025-03-12 14:21:37 +08:00
caoqianming 90e0e7ad3b fix: mlogbin delete数据 2025-03-12 14:10:34 +08:00
caoqianming 8d67c06e63 feat: 生成产出出错2的bug 2025-03-12 13:34:56 +08:00
caoqianming 378648436f fix: 生成产出出错3的bug 2025-03-12 11:22:50 +08:00
caoqianming 9a7230d752 feat: 自动生成任务编号 2025-03-12 09:35:24 +08:00
caoqianming 5a05710ff2 feat: 增加mlogbw_to以进行追踪 2025-03-12 09:23:38 +08:00
caoqianming c74de4ef21 fix: mio自动生成编号 2025-03-11 13:25:11 +08:00
caoqianming 5bd17c4a37 feat: mio自动生成编号 2025-03-11 12:40:45 +08:00
caoqianming f59cb2cbc2 feat: 个拆批2 2025-03-10 17:58:09 +08:00
caoqianming 75ec24702c feat: 个拆批 2025-03-10 17:48:11 +08:00
caoqianming 8f46507a6b feat: mlogbin时从单个拆分为多个批次2 2025-03-10 16:03:50 +08:00
caoqianming 85cc38c842 feat: mlogbin时从单个拆分为多个批次 2025-03-10 16:00:01 +08:00
caoqianming f295956c69 fix: mlogbw cal_count_notok 2025-03-10 11:29:43 +08:00
caoqianming fbb18ae990 feat: 部分bug修复 2025-03-09 11:36:17 +08:00
caoqianming cb45e0bab1 feat: 子任务可为空以及一些查询条件 2025-03-07 13:00:00 +08:00
caoqianming 25d63c0b27 feat: fmlog update 更新是否可用字段 2025-03-07 11:00:57 +08:00
caoqianming 456f05a83e feat: 针对加工前不良的处理2 2025-03-07 10:42:27 +08:00
caoqianming 330d44e2a3 feat: 优化一下mlogbdefect的代码结构 2025-03-07 10:09:49 +08:00
caoqianming fd26a65966 feat: qct get bug 2025-03-07 09:20:41 +08:00
caoqianming 8a715ed136 feat: wpm revert支持加工强不良 2025-03-07 09:20:20 +08:00
caoqianming 925bc2027c feat: mlogb_submit支持加工前不良 2025-03-07 08:51:22 +08:00
caoqianming 2a9bd7ef6a feat: mlogbdefect defect可为空代表合格品 2025-03-07 08:51:01 +08:00
caoqianming 1844fa7228 feat: mlogb添加字段 2025-03-06 19:00:04 +08:00
caoqianming e2fbc63293 feat: 支持传入加工前不良的数据 2025-03-06 18:51:18 +08:00
caoqianming 73b3ab9377 feat: handover增加筛选条件 2025-03-06 16:36:32 +08:00
caoqianming f7843621df feat: wm 增加 来料/完成 筛选 2025-03-06 16:15:08 +08:00
caoqianming 4f60483a49 feat: qct get_qs接口 bug 2025-03-06 15:35:19 +08:00
caoqianming 0d45c380c0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-03-06 15:26:14 +08:00
caoqianming 767896f3dc feat: qct get_qs接口 2025-03-06 15:26:11 +08:00
caoqianming 3a1ed151c7 feat: qctdefect 返回时添加defect_okcate 2025-03-06 14:20:26 +08:00
caoqianming 74f0db77ed feat: Handoverb 支持拆批 2025-03-06 14:15:45 +08:00
caoqianming afdcc5374e feat: 添加wmaterial检索字段 2025-03-06 09:02:07 +08:00
caoqianming 33957216cd feat: handover recive user可为空 2025-03-06 09:01:45 +08:00
caoqianming deb50efba1 feat: 添加wmaterial筛选条件 2025-03-06 09:01:23 +08:00
zty c8ba7dc563 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-03-05 18:36:10 +08:00
zty 0dd62244ab feat: 修改采集更新时间换成 data_time 2025-03-05 18:36:07 +08:00
caoqianming 62d2c8b21e feat: inm batch textfield 2025-03-04 18:08:52 +08:00
caoqianming 47976de657 feat: 使用身份证强校验函数 2025-03-04 16:27:00 +08:00
caoqianming a8ce6c3989 feat: base 添加身份证校验函数 2025-03-04 16:26:35 +08:00
caoqianming df427d60b2 fix: mlog ftestwork submit关于合格b类的调整 2025-03-04 15:45:56 +08:00
caoqianming aa32047bf7 fix: 一些bug调整 2025-03-04 12:33:51 +08:00
caoqianming 71cbda504c fix: ftestwork validate bug 2025-03-04 09:07:30 +08:00
caoqianming 46d586430e fix: FmlogViewSet test 2025-03-03 19:09:17 +08:00
caoqianming eca0f26623 fix: bulk create bug 2025-03-03 19:05:27 +08:00
caoqianming 07f60a1a29 feat: mlogbdefect返回defect_okcate 2025-03-03 19:00:51 +08:00
caoqianming de27865a3b fix: swagger bug 2025-03-03 18:29:36 +08:00
caoqianming 9907bf7c43 feat: mlog填写支持defect定义 2025-03-03 18:21:03 +08:00
caoqianming 5245689ec2 feat: ftestwork create update serializer 2025-03-03 16:17:52 +08:00
caoqianming 8fdd56555f feat: testitem description可为空 2025-03-03 15:53:00 +08:00
caoqianming 7e40596665 fix: mlogbupdate bug 2025-03-03 15:47:53 +08:00
caoqianming 666fbd306b fix: 获取qct提出到model 2025-03-03 15:13:28 +08:00
caoqianming bbed6fa646 feat: mlogbdefect添加字段floor 2025-03-03 14:50:26 +08:00
caoqianming 6ad6670a90 feat: mlogbdetail 增加返回mlogbdefect 2025-02-28 17:06:50 +08:00
caoqianming 7c7dcee194 fix: cal_count_notok bug2 2025-02-28 16:57:46 +08:00
caoqianming 2311e1773f fix: cal_count_notok bug 2025-02-28 16:49:08 +08:00
caoqianming 278e55c08a fix: cal_count_notok 是一个类方法 2025-02-28 16:39:49 +08:00
caoqianming 12416a4f61 fix: mlogbw create bug2 2025-02-28 16:30:47 +08:00
caoqianming 9eb3abefc4 fix: mlogbw create bug 2025-02-28 16:27:23 +08:00
caoqianming a2fb5598f8 fix: get_alldata_with_batch 除0bug 2025-02-28 16:23:24 +08:00
caoqianming 31e8b92d29 feat: mlogbin create时处理qct 2025-02-28 15:50:23 +08:00
caoqianming c5bcfb4e53 feat: mlogboutupdate兼容性处理 2025-02-28 15:38:36 +08:00
caoqianming 286a5306e3 feat: 批次处理做兼容性处理 2025-02-28 15:31:38 +08:00
caoqianming 77f7a454a1 feat: mlogbw变更出发mlogbdefect 2025-02-28 11:28:40 +08:00
caoqianming fac85d17d2 feat: defect code设置为非必填 2025-02-28 09:50:30 +08:00
caoqianming fb7fbb7388 fix: drf swagger bug 2025-02-28 09:41:13 +08:00
caoqianming 1bddfaa920 fix: get_alldata_with_batch bug 2025-02-28 09:18:10 +08:00
caoqianming b2f801deda feat: 添加mlogbdefect 2025-02-28 09:14:55 +08:00
caoqianming d69d4568f6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-02-27 16:59:24 +08:00
caoqianming 8c4b11d9c9 feat: mb添加查询条件state 2025-02-27 16:59:20 +08:00
zty ea5e041575 feat: enm/task 修改班时校正 2025-02-27 14:28:32 +08:00
caoqianming bf35064f6e feat: 优化em增加采集数据方法 2025-02-27 12:37:17 +08:00
caoqianming d30ecabd16 feat: em增加采集数据方法2 2025-02-27 12:24:27 +08:00
caoqianming 1925e3e5d6 feat: em增加采集数据方法 2025-02-27 11:34:19 +08:00
caoqianming 1dbb07ddcb feat: route支持传入material_out_tracking 2 2025-02-26 17:37:29 +08:00
caoqianming d1c15b0b2e feat: route支持传入material_out_tracking 2025-02-26 17:36:52 +08:00
caoqianming 39eef7d2b4 fix: material_out.tracking的比较bug 2025-02-26 12:07:02 +08:00
caoqianming c71bb0d8f6 fix: 不能删除该产出明细更新限制条件 2025-02-26 11:27:25 +08:00
caoqianming ccce92f9f6 feat: testitem添加采集表达式 2025-02-26 09:19:48 +08:00
caoqianming 2010078665 perf: 优化mlog list速度3 2025-02-25 17:33:41 +08:00
caoqianming 4e6aa547b5 perf: 优化mlog list速度2 2025-02-25 17:30:40 +08:00