Commit Graph

3532 Commits

Author SHA1 Message Date
caoqianming c4cde1c5ea feat: handover_revert尝试支持全部撤回 2025-06-26 10:54:32 +08:00
caoqianming a6d53471fc fix: batch_gxerp添加count_pn_jgqbl 2 2025-06-26 09:14:52 +08:00
caoqianming d03f106055 feat: batch_gxerp 添加need_inout查询条件 2025-06-26 09:07:12 +08:00
caoqianming b500ad6615 feat: wpr添加对外编号字段 2025-06-25 18:19:16 +08:00
caoqianming f3263caed0 feat:: batch_gxerp添加count_pn_jgqbl 2025-06-25 17:33:50 +08:00
caoqianming ab22415e0f feat: ofm 完善1 2025-06-25 17:29:46 +08:00
caoqianming 31f4e2869d feat: sql查询有风险提示更完善 2025-06-25 11:23:59 +08:00
caoqianming 43e9642917 fix: 光子get_alldata_with_batch 其他入库获取错误2 2025-06-24 14:34:14 +08:00
caoqianming c338509854 fix: 光子get_alldata_with_batch 人员获取错误2 2025-06-24 14:28:22 +08:00
caoqianming 037008d7c9 fix: 光子get_alldata_with_batch 人员获取错误 2025-06-24 13:52:44 +08:00
caoqianming 9ff72b2da1 fix: 光子get_alldata_with_batch优化2 2025-06-24 11:23:45 +08:00
caoqianming 53972fd22a feat: 光子get_alldata_with_batch优化 2025-06-24 09:30:09 +08:00
caoqianming cb09cee753 feat: 添加行政管理App 2025-06-24 08:47:22 +08:00
caoqianming b0df18f01a feat: cd 设置清空缓冲区2 2025-06-23 17:49:02 +08:00
caoqianming c5e4cc48a4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-06-23 17:00:41 +08:00
caoqianming 8e33e084b4 feat: cd 设置清空缓冲区 2025-06-23 17:00:39 +08:00
zty ce54f326ee Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-06-23 13:55:55 +08:00
zty 1242b3d43a feat:enm/service修改排班记录生成时间 2025-06-23 13:55:53 +08:00
caoqianming 108fe0ae9f feat: mlogbout单个产品不支持直接修改 2025-06-23 13:44:28 +08:00
caoqianming f0cacf6777 feat: mioitem添加material__type查询条件 2025-06-20 15:28:49 +08:00
caoqianming 307935cb16 fix: wpr不合格的话先save再创建wm.defect 2025-06-20 13:28:55 +08:00
caoqianming 3683ddbdeb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-06-20 11:11:32 +08:00
caoqianming fec244765a fix: 该交接单不支持撤销的bug 2025-06-20 11:11:31 +08:00
zty 6a5ec34ef8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-06-20 09:44:57 +08:00
zty 7942a5168b fix: wpm/service 优化煤粉热值获取方式 2025-06-20 09:44:52 +08:00
caoqianming db2e8934ba feat: 增加交接撤回功能 2025-06-19 17:25:33 +08:00
caoqianming 4f08374ca6 feat: mlogbin的bug 2025-06-19 15:43:02 +08:00
caoqianming dce573f892 fix: mioitem price 计算bug 2025-06-19 14:23:49 +08:00
caoqianming 3b04bdf067 feat: mioitem返回mio数据 2025-06-19 14:11:24 +08:00
caoqianming 741b64142b feat: mioitem添加单价字段 2025-06-19 10:37:09 +08:00
caoqianming 25c1cce41a feat: materialsimpleserializer返回bin_number_main 2025-06-18 16:30:41 +08:00
caoqianming 8805237a44 feat: 物料增加主库位号 2025-06-18 16:29:38 +08:00
caoqianming a819566c23 fix: wmaterial添加can_handover字段 2025-06-18 10:56:39 +08:00
caoqianming 6af708d4f0 feat: wmaterial添加can_handover字段 2025-06-18 10:31:35 +08:00
caoqianming 8d6f2bfd20 fix: mlogbinupdate时的bug 2025-06-17 08:36:48 +08:00
caoqianming 2b039dd4f7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-06-16 17:43:18 +08:00
caoqianming 1366f432ee feat: mlogbin的编辑与mlogbout的联动 2025-06-16 17:42:43 +08:00
caoqianming 31421ca0aa feat: mlogb首次创建需要更新count_ok_full 2025-06-15 22:19:52 +08:00
caoqianming 95b10371b9 feat: 支持从wpr处获取切片数4 2025-06-13 16:36:51 +08:00
caoqianming a820d6803e feat: 支持从wpr处获取切片数3 2025-06-13 16:25:06 +08:00
caoqianming e774992d3a feat: workchain通过线程执行 2025-06-13 16:23:35 +08:00
caoqianming 4955ad1f11 feat: 支持从wpr处获取切片数2 2025-06-13 16:23:07 +08:00
caoqianming ab0c962053 feat: mlogbin联动mlogbout 2025-06-13 16:22:50 +08:00
caoqianming 4bd6eab9f4 feat: mlogbin 和 update时cal_count_notok cal_mlog传False 2025-06-13 15:56:43 +08:00
caoqianming b9a7138e72 feat: mlogbin 和 update时cal_count_notok 2025-06-13 15:24:53 +08:00
caoqianming cf7673cd98 feat: 支持从wpr处获取切片数 2025-06-13 14:31:48 +08:00
caoqianming 680608e16f fix: mlogserializer需要同步count_real 2025-06-13 14:29:31 +08:00
caoqianming 6d87a69d8d fix: cal_mlog_count_from_mlogb 需要传参触发 2025-06-13 11:23:02 +08:00
caoqianming c02bb6d3db fix: mlog 数值计算bug 2025-06-13 09:03:43 +08:00
caoqianming dbad152218 fix: wmaterial get在传入query参数时完善can_do的逻辑 2025-06-12 10:37:19 +08:00
caoqianming bb56becb5d feat: ichat 添加workchain接口 2025-06-12 09:07:43 +08:00
caoqianming b3000b013f feat: utask添加优先级字段 2025-06-11 11:32:07 +08:00
caoqianming 0719ef8f42 feat: gen_number_with_rule bug2 2025-06-11 11:02:50 +08:00
caoqianming fea3c320a9 feat: gen_number_with_rule bug 2025-06-11 10:58:31 +08:00
caoqianming bfc37f69af feat: 优化get_tyy_data 2 2025-06-10 13:35:38 +08:00
caoqianming 8efd28633c feat: 优化get_tyy_data 2025-06-10 12:42:02 +08:00
caoqianming 5e0c515929 feat: batch_gxerp添加加工前缺陷 2025-06-10 10:05:53 +08:00
caoqianming 438d06af2f feat: 增加check_sql_safe 稳定性 2025-06-10 08:48:13 +08:00
caoqianming 84690e7b54 feat: 放开出入库的物料匹配 2025-06-09 15:50:08 +08:00
caoqianming 2e3e8f997c feat: 采购入库节点可复用2 2025-06-09 15:44:31 +08:00
caoqianming 7d29b9c4eb feat: 采购入库节点可复用 2025-06-09 15:37:17 +08:00
caoqianming 77c4c54eb1 feat: inm 和 wpm添加wpr number的查询条件 2025-06-09 13:31:46 +08:00
caoqianming 11f06c36f7 feat: 优化设备采集cd 2025-06-09 13:03:03 +08:00
caoqianming b9cad6bbd8 feat: get_tyy_data 不更新的bug 2025-06-09 10:09:32 +08:00
caoqianming 27b225face feat: mlogb cal_count_pn_jgqbl 2025-06-06 17:44:19 +08:00
caoqianming be5dc161de feat: mlogbw也进行mlogb.cal_count_notok() 2025-06-06 17:25:39 +08:00
caoqianming 53c9afbca9 fix: mlog 的cal_count_notok_full的bug 4 2025-06-06 17:11:00 +08:00
caoqianming 519672ef3f fix: mlog 的cal_count_notok_full的bug 3 2025-06-06 16:50:24 +08:00
caoqianming 6e93d7cd68 fix: mlog 的cal_count_notok_full的bug 2 2025-06-06 16:46:41 +08:00
caoqianming c2770eed57 fix: mlog 的cal_count_notok_full的bug 2025-06-06 16:45:38 +08:00
caoqianming 4cc28b3583 feat: cal_mlog_count_from_mlogb 添加count_ok_full 2025-06-06 16:39:16 +08:00
caoqianming ff2b098210 feat: 优化batches_to 2025-06-06 16:26:52 +08:00
caoqianming fa221218f9 feat: cal_count_notok 完全合格数有bug 2025-06-06 15:58:33 +08:00
caoqianming bb9e2f337a feat: batch_gxerp 全工段查询 2025-06-06 10:48:19 +08:00
caoqianming 7d0491ac24 fix: 光芯批次统计"尺寸检验_完全合格率" 2025-06-05 14:16:41 +08:00
caoqianming dff602abd1 fix: 光芯批次统计错误 2025-06-05 14:01:01 +08:00
caoqianming 60c484ee7f feat: cd BrokenPipeError时尝试再建立连接3 2025-06-05 13:39:24 +08:00
caoqianming facee9342c feat: cd BrokenPipeError时尝试再建立连接2 2025-06-05 11:15:16 +08:00
caoqianming 370c905781 feat: cd BrokenPipeError时尝试再建立连接 2025-06-05 11:05:55 +08:00
caoqianming bd9d5a5dc2 feat: 获取到重复的缺陷项 打日志 2025-06-05 10:50:17 +08:00
caoqianming f06ad961f7 feat: can_fix 排除维修完成品 2025-06-05 08:40:55 +08:00
caoqianming 9d1af24994 fix: handover_submit batches获取bug2 2025-06-05 08:24:20 +08:00
caoqianming 014b48e135 fix: update_mb_item在检验时只做负数校验 2025-06-04 16:40:33 +08:00
caoqianming 265a15c9fc fix: handover_submit batches获取bug 2025-06-04 15:23:19 +08:00
caoqianming 9ede95a5d6 feat: batchst 添加first_time isnull筛选 2025-06-04 10:19:29 +08:00
caoqianming a34514160d feat: 获取first_time, last_time独立出一个方法 2025-06-04 10:05:06 +08:00
caoqianming 1f9800db16 fix: 自动生成物料bug 2025-05-30 15:39:13 +08:00
caoqianming 9e9501a065 fix: 优化 gen_material_out 防止自引用 2025-05-30 14:04:35 +08:00
caoqianming ec42e70118 fix: 优化 gen_number_with_rule 2025-05-30 11:11:06 +08:00
caoqianming 7429b7d5fb feat: 修改gen_number_with_rule 以获取的最后编号为准 2025-05-30 10:13:57 +08:00
caoqianming 8994b39917 fix: batches_to_limit 获取bug 2025-05-30 09:56:07 +08:00
caoqianming f689b7609c feat: handover拆批时校验批次号是否可用 2025-05-30 09:07:17 +08:00
caoqianming 45e02eae5f feat: 优化batches_to以达到自然排序功能 2025-05-29 15:30:49 +08:00
caoqianming 5d33301389 feat: batches_to 获取已指向的批次号 2025-05-29 15:08:42 +08:00
caoqianming ad5d8db283 feat: get_qct接口进行校验 2025-05-29 10:55:52 +08:00
caoqianming 4cd4ba3c9d feat: get_tyy_data优化保持socket连接 2025-05-29 10:20:46 +08:00
caoqianming 725a471fd8 fix: batchst reuse_node逻辑完善2 2025-05-29 10:16:23 +08:00
caoqianming 49efafcaff fix: batchst reuse_node逻辑完善 2025-05-29 09:39:04 +08:00
caoqianming 82958e047b fix: base ordering排序错误 2025-05-29 08:39:59 +08:00
caoqianming 70d80dafd2 feat: wmaterial提供canfix的tag查询 2025-05-28 16:30:50 +08:00
caoqianming 37dc922c34 feat: base ComplexQueryMixin 支持order查询2 2025-05-26 16:35:52 +08:00
caoqianming f4fd214110 feat: base ComplexQueryMixin 支持order查询 2025-05-26 16:31:17 +08:00
caoqianming a4f2b6eb55 fix: batchlog创建时避免回环 2025-05-26 15:26:22 +08:00
caoqianming e47464805e feat: bachst添加复杂查询接口 2025-05-26 13:28:43 +08:00
caoqianming d385fefc4f feat: base 独立出ComplexQueryMixin 2025-05-26 13:23:32 +08:00
caoqianming ed6b6c2776 feat: base with_children查询去除限制 2025-05-26 13:11:15 +08:00
caoqianming f41068e923 feat: handover根据wm完善batch字段 2025-05-26 12:10:47 +08:00
caoqianming 6539bc2e61 feat: handoverfilter完善cbatch查询 2025-05-26 11:18:36 +08:00
caoqianming 3a69075b9f feat: 处理dag时返回edge更多信息 2025-05-26 11:07:08 +08:00
caoqianming eefd3691e6 fix: batch_gxerp 优化 2025-05-26 10:33:09 +08:00
caoqianming 74e176ce97 feat: base 性能优化调整位置 2025-05-23 09:54:52 +08:00
caoqianming 9c1ba20d36 perf: 优化mlog和handover的查询 2025-05-23 09:54:24 +08:00
caoqianming 62f261fd75 feat: 所有batch设为textfield并添加索引 2025-05-23 09:24:34 +08:00
caoqianming 359dd8f898 feat: mb添加batch查询条件 2025-05-23 08:44:44 +08:00
caoqianming 1445a14a9a feat: ana batch时等待10s 2025-05-22 16:50:15 +08:00
caoqianming 0735b5d2b7 fix: BatchLog创建时获取source再创建target 2025-05-22 16:48:15 +08:00
caoqianming 6b7088997f feat: batchst复用节点仅限mio创建的 2025-05-22 15:22:49 +08:00
caoqianming 8a7c3830c9 feat: 各工段批次生产进度统计 2025-05-22 13:31:41 +08:00
caoqianming 68d065a2e3 fix: 取消提交日志时时间校验 2025-05-22 09:16:53 +08:00
caoqianming fdb454d6e5 feat: 修改服务器时间时传递密码 2025-05-22 09:09:17 +08:00
caoqianming 36790a72b4 feat: 导入棒管检验测试通过 2025-05-21 14:56:50 +08:00
caoqianming a2e45d6954 feat: 修改导入权限 2025-05-21 13:56:14 +08:00
zty c254d99c3c feat: enm 修改采集保存时间到秒 2025-05-21 09:52:38 +08:00
zty 446f705eb3 feat: auth1 utils enm 修改阿里云发送短信引入方式 2025-05-21 09:51:46 +08:00
caoqianming dbea38f82b feat: daoru棒管test 2025-05-20 16:44:36 +08:00
caoqianming a672a76eee feat: mlog和handover添加cbatch查询条件2 2025-05-20 16:03:36 +08:00
caoqianming 8fb204a93d feat: mlog和handover添加cbatch查询条件 2025-05-20 14:26:58 +08:00
caoqianming 5011ef8076 fix: is_fix支持个到个的bug 2025-05-20 10:09:09 +08:00
caoqianming 126ef8a1b8 feat: mloginit支持handle_users 2025-05-20 08:41:59 +08:00
caoqianming 3500cd25c8 feat: batch_gxerp 完全总合格数 2025-05-19 16:18:31 +08:00
caoqianming d0027679e6 feat: batch_gxerp调整 2025-05-19 13:37:10 +08:00
caoqianming 5fe2b4db48 feat: qct排序支持number 2025-05-19 11:35:23 +08:00
caoqianming b1487957b5 feat: 完善变更服务器时间的接口2 2025-05-19 10:16:49 +08:00
caoqianming 1a1f64f9fe feat: 完善变更服务器时间的接口 2025-05-19 10:08:58 +08:00
caoqianming 0f0b055101 feat: 添加变更服务器时间的接口 2025-05-19 09:34:14 +08:00
caoqianming 2e0727a2c0 feat: wpr detail 2025-05-16 16:50:57 +08:00
caoqianming b9ca9b802a feat: mlogbw添加wpr等查询条件 2025-05-16 16:42:22 +08:00
caoqianming 05bf1def23 feat: wpr增加自动编号逻辑2 2025-05-16 16:04:37 +08:00
caoqianming 88a5d55425 feat: wpr增加自动编号逻辑 2025-05-16 15:53:33 +08:00
caoqianming 9f3b3a52a7 feat: get_tyy_data优化3 2025-05-16 11:18:55 +08:00
caoqianming 518379ea35 feat: get_tyy_data优化2 2025-05-16 11:12:07 +08:00
caoqianming 1d7c2ebb35 feat: get_tyy_data优化 2025-05-16 10:59:10 +08:00
caoqianming d1ccc9043f feat: mlog添加b_mlog__batch查询条件 2025-05-16 10:12:39 +08:00
caoqianming 767cfb18e2 feat: 车间库存不足提示更准确2 2025-05-16 09:05:19 +08:00
caoqianming 5a08b5d22c feat: 车间库存不足提示更准确 2025-05-16 08:55:31 +08:00
caoqianming 3075d8ab8e feat: batchst追加查询data__has_key条件 2025-05-15 16:29:22 +08:00
caoqianming 156f6b4844 feat: mlogb_summary选用need_inout为True的数据 2025-05-15 15:35:03 +08:00
caoqianming 0057e4c181 fix: count_ok_full为None的批次处理 2025-05-15 15:19:37 +08:00
caoqianming cbeecea2dc fix: need_inout 传true时也得处理 2025-05-15 14:49:40 +08:00
caoqianming ca9d46c8d5 feat: equip_last_mlog增加报错提示 2025-05-15 10:39:33 +08:00
caoqianming bd7bbbef0e feat: wpr获取material_start 2025-05-15 10:03:14 +08:00
caoqianming 9c69711f38 feat: mlog返回子级详情 2025-05-15 09:50:37 +08:00
caoqianming 8a61ca9eb1 fix: 检验表消失的bug 2025-05-14 16:21:38 +08:00
caoqianming eb8087fdf9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-05-14 16:16:35 +08:00
caoqianming c50e4bf3a7 fix: batch_gxerp bug 2025-05-14 16:16:33 +08:00
zty 01539a32da Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-05-14 13:58:03 +08:00
zty 8834d66066 feat: ichat 修改大模型的提问 2025-05-14 13:58:01 +08:00
caoqianming 356310db3f feat: 触发批次统计分析在线程里sleep下 2025-05-14 12:57:11 +08:00
caoqianming f32adf3702 fix: 获取检验模板只用单个2 2025-05-14 11:04:36 +08:00
caoqianming 57dfab3bb9 fix: 获取检验模板只用单个 2025-05-14 11:01:21 +08:00
caoqianming d9f66d2970 feat: 获取检验模板只用单个 2025-05-14 10:49:13 +08:00
caoqianming 6fcda8c0a7 fix: wpr获取mb的state 2025-05-14 09:27:46 +08:00
caoqianming a4a9dd257f feat: qct获取通用检验表 2025-05-14 08:59:26 +08:00
caoqianming f6a99f542f feat: develop添加mylogger 2025-05-13 12:57:56 +08:00
caoqianming be6d51af7d feat: wpr添加初始物料字段 2025-05-13 11:00:45 +08:00
caoqianming 98bf81f5e0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-05-12 16:47:06 +08:00
caoqianming 56afccf0a4 feat: wpr获取新编号 2025-05-12 16:47:04 +08:00
zty 88c029f66d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-05-12 09:54:18 +08:00
zty f3ab4476a4 feat: ichat /增加ichat模块,优化对话流处理 2025-05-12 09:54:13 +08:00
caoqianming 09072f7998 feat: 光芯质检表格 2025-05-09 16:51:55 +08:00
caoqianming ad1bbaa32e feat: base 短信发送功能启动抛出异常2 2025-05-09 09:13:35 +08:00
caoqianming 1c8489a0b4 feat: base 短信发送功能启动抛出异常 2025-05-09 09:10:39 +08:00
caoqianming 06e04858df feat: batchst字段同步数据库 2025-05-08 16:24:06 +08:00
caoqianming 954f5d262f feat: 完善清空数据的接口 2025-05-08 16:13:50 +08:00
caoqianming 8a501c2681 feat: batchst添加字段并更新光子的统计2 2025-05-08 15:13:04 +08:00
caoqianming c29d1e99d8 feat: batchst添加字段并更新光子的统计 2025-05-08 14:56:40 +08:00
caoqianming 20384ca33c feat: 由输入转输出需考虑到加工前不良的影响 2025-05-08 13:53:59 +08:00
caoqianming 5e2fd57b89 feat: labeltemplate获取标签指令接口 2025-05-08 13:22:02 +08:00
caoqianming 8a75fcbc42 feat: labeltemplate添加name查询条件 2025-05-08 13:12:32 +08:00
caoqianming cdb4e65159 feat: 初步添加光芯的批次分析函数 2025-05-08 13:12:07 +08:00
caoqianming dae8d50d2c fix: gen_commands bug 2025-05-08 10:45:25 +08:00
caoqianming a9f55eb61c feat: 支持传入label_template_name 2025-05-08 10:37:58 +08:00
caoqianming 7aafa5d9f7 fix: labeltemplate filter bug 2025-05-07 10:25:40 +08:00
caoqianming cc12d80c92 feat: myjsonfield优化 2025-05-07 10:25:07 +08:00
caoqianming 2128b4e847 feat: mioitem添加排序字段 2025-05-06 10:54:09 +08:00
caoqianming adf21e716d fix: 标签模板筛选bug 2025-05-06 10:35:08 +08:00
caoqianming c05432ce56 feat: 标签物料根据模板打印功能 2025-05-06 10:32:50 +08:00
zty a4ba33550e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-30 14:33:05 +08:00
zty a5a862f7fb feat:ichat 修改接口 去掉langchain 2025-04-30 14:33:01 +08:00
caoqianming 725dd4d554 fix: mio_saleout缺少import 2025-04-30 14:20:15 +08:00
caoqianming da69e654bc feat: 生产入库和领料支持b类合格品 2025-04-30 14:19:49 +08:00
caoqianming a2cba2128f feat: 添加标签模板接口 2025-04-30 13:43:17 +08:00
caoqianming dd6dcad74a feat: 完善光子批次统计数据 2025-04-30 08:51:21 +08:00
caoqianming f35d2d7d9e fix: getattr(item, field) is not None 2025-04-29 15:14:02 +08:00
caoqianming ac610a53ce feat: 组合件和入库检验追加统计分析 2025-04-29 14:43:09 +08:00
caoqianming 7c752ec39b feat: get_alldata_with_batch添加内容 2025-04-29 14:42:29 +08:00
caoqianming e59c83aa3f feat: 支持个号转批号6 2025-04-28 15:59:29 +08:00
caoqianming ced3e7a16c feat: 支持个号转批号5 2025-04-28 15:50:36 +08:00
caoqianming 6b8fa4e58c feat: 支持个号转批号4 2025-04-28 15:45:05 +08:00
caoqianming 7131697802 feat: 支持个号转批号3 2025-04-28 15:32:04 +08:00