Commit Graph

857 Commits

Author SHA1 Message Date
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 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 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 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 9c69711f38 feat: mlog返回子级详情 2025-05-15 09:50:37 +08:00
caoqianming c50e4bf3a7 fix: batch_gxerp bug 2025-05-14 16:16:33 +08:00
caoqianming 356310db3f feat: 触发批次统计分析在线程里sleep下 2025-05-14 12:57:11 +08:00
caoqianming 09072f7998 feat: 光芯质检表格 2025-05-09 16:51:55 +08:00
caoqianming 06e04858df feat: batchst字段同步数据库 2025-05-08 16:24:06 +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 cdb4e65159 feat: 初步添加光芯的批次分析函数 2025-05-08 13:12:07 +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 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
caoqianming 7338d09f5d feat: 支持个号转批号的配置2 2025-04-28 15:25:41 +08:00
caoqianming 0ff9aa1e5a feat: 支持个号转批号的配置 2025-04-28 14:43:22 +08:00
caoqianming c5a7a19f74 feat: 尝试从个号追踪到历史记录的个号2 2025-04-28 14:12:00 +08:00
caoqianming 25a111bc6b feat: 同步数据库 2025-04-28 13:51:00 +08:00
caoqianming 849e63da3e feat: 尝试从个号追踪到历史记录的个号 2025-04-28 13:48:22 +08:00
caoqianming 76a48d46ee feat: 个到批时支持若是一个还是沿用原有批号 2025-04-28 11:28:45 +08:00
caoqianming 76adab1571 feat: 批次追踪链条还是可以复用批次 2025-04-28 11:08:47 +08:00
caoqianming 9d634940d3 feat: mlog结合工序支持批到个 2025-04-28 10:24:28 +08:00
caoqianming cd0045c561 feat: mlogbw支持批量创建 2025-04-27 14:12:37 +08:00
caoqianming 8a83f8b7d8 fix: cal_count_notok锁定mlogb以防止并发修改 2025-04-27 13:41:45 +08:00
caoqianming 2ca9b3ce02 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-27 12:17:24 +08:00
caoqianming 8697288d69 feat: mlogbwcreate校验增加wm所属 2025-04-27 12:17:13 +08:00
zty 89c8cac7c1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-27 09:21:23 +08:00
zty c0277ad9a6 feat: ichat 修改LLM 的接口 2025-04-27 09:21:19 +08:00
caoqianming 139aa6de27 feat: wmaterial筛选条件优化来料已完成 2025-04-26 00:07:44 +08:00
caoqianming cdb9083def fix: batchst恢复成batch单一校验 2025-04-25 23:41:59 +08:00
caoqianming c8d05bed68 feat: 获取该批次的dag数据需要传入version 2025-04-25 21:35:37 +08:00
caoqianming be57fec29f fix: 获取batchst时默认使用version=1 2025-04-25 16:27:48 +08:00
caoqianming d6fe5af39c feat: 单填写mlog支持返工 2025-04-25 15:24:38 +08:00
caoqianming 6033216869 fix: mloginit在返工时不接收route 2025-04-25 14:21:24 +08:00
caoqianming 439bfeb7d6 fix: 返工校验输入物料选择错误 2025-04-25 11:27:14 +08:00
caoqianming 84380931fd fix: 完善负数校验2 2025-04-24 16:12:38 +08:00
caoqianming ca7d56a462 fix: 完善负数校验 2025-04-24 16:07:55 +08:00
caoqianming 9df6294617 feat: mlogbupdate支持变更批号 2025-04-24 13:44:30 +08:00
caoqianming 1cb4128be2 fix: mlogbupdate时attrs遍历时修改的bug 2025-04-24 13:36:18 +08:00
caoqianming 0f728d8b29 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-24 09:18:05 +08:00
caoqianming 960787d7d8 feat: 6车间合格率统计decimal invalid 2025-04-24 09:18:03 +08:00
zty 8183073026 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
合并
2025-04-23 16:49:00 +08:00
zty b66157edb8 feat: model add note 2025-04-23 16:48:52 +08:00
caoqianming dd4d958f86 fix: batchst的version字段bug 2025-04-23 13:02:11 +08:00
caoqianming 2987853afb feat: 通过django settings延迟获取BASE_PROJECT_CODE 2025-04-23 12:42:50 +08:00
caoqianming 75503fc7e8 feat: 切分工序切分数量支持1 2025-04-23 10:59:59 +08:00
caoqianming 433d85456e fix: mlog的need_inout逻辑3 2025-04-23 09:28:45 +08:00
caoqianming 32185abffd fix: mlog的need_inout逻辑2 2025-04-22 16:33:52 +08:00
caoqianming c2539185e2 feat: mlog增加team字段 2025-04-22 15:49:42 +08:00
caoqianming 3811c055f9 feat: mlog的need_inout逻辑 2025-04-22 15:27:02 +08:00
caoqianming 6e12ca3137 feat: 批次关系链时创建新批次支持使用已有批次号2 2025-04-22 14:30:19 +08:00
caoqianming f22ba2752f feat: 批次关系链时创建新批次支持使用已有批次号 2025-04-22 14:29:33 +08:00
caoqianming ea00a38406 feat: mlogb返回test_user_name 2025-04-22 10:16:10 +08:00
caoqianming 3d0536745a fix: count_working获取逻辑优化2 2025-04-22 09:56:23 +08:00
caoqianming e329c8cbc8 fix: count_working获取逻辑优化 2025-04-22 09:34:34 +08:00
caoqianming 8ac3ad3477 feat: mlogb添加test_user/need_inout字段用于处理抽检逻辑 2025-04-22 09:19:19 +08:00
caoqianming 42c249330e fix: mlogbin解决负值校验存在的bug 2025-04-22 09:14:11 +08:00
caoqianming 311e9e9e04 feat: 校验只有合并时才能提供新批次号 2025-04-22 08:43:05 +08:00
caoqianming 5cab0d018b feat: 交接查询可查询子批次号 2025-04-21 16:27:31 +08:00
caoqianming ced7515d80 feat: 日志完善负值校验 2025-04-21 15:43:54 +08:00
caoqianming 2ea3dc79cb feat: 批号追加工段标识2 2025-04-21 13:22:39 +08:00
caoqianming 82587b1736 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-21 11:33:11 +08:00
caoqianming 786d178edc feat: 批号追加工段标识 2025-04-21 11:32:57 +08:00
caoqianming 181d477425 fix: 日志和交接记录操作数正值校验 2025-04-19 23:40:42 +08:00
caoqianming 101a51050d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2025-04-19 21:15:35 +08:00
caoqianming 9e4e5a28c6 fix:: 交接记录提交时校验count>0 2025-04-19 21:11:45 +08:00
caoqianming 00e352d8ef feat: 改版交接需要触发统计数量 2025-04-18 14:52:03 +08:00
caoqianming b44fec0695 feat: 合并的交接需要校验物料是否一致 2025-04-17 14:05:56 +08:00
caoqianming 6d904341a0 feat: 交接需要校验物料是否一致 2025-04-17 13:30:30 +08:00
caoqianming 369c452dd5 fix: 正常交接后的物料状态不变 2025-04-17 11:17:05 +08:00
caoqianming fafe39c1bd fix: 存在fmlog时将route带给mlog并进行物料校验 2025-04-17 11:16:40 +08:00
caoqianming 5f2385ccd1 fix: fmlog填写mtask或route即可 2025-04-17 09:06:34 +08:00
caoqianming 896be043f5 feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 2025-04-16 19:14:18 +08:00
caoqianming b5c21b7472 feat: fmlog添加工艺步骤字段及相应返回数据 2025-04-16 17:59:20 +08:00
caoqianming 300023ff81 fix: 交接分批bug/加工前不良的bug 2025-04-16 13:43:38 +08:00
caoqianming e0217e86c4 feat: 添加count_json_from字段及相应逻辑 2025-04-16 11:31:23 +08:00
caoqianming 4c7f2b24f8 feat: 车间库存按任务筛选时count>0 2025-04-16 08:57:12 +08:00