Commit Graph

685 Commits

Author SHA1 Message Date
caoqianming 8375345e56 fix: stlog create时validate2 2024-04-28 11:30:05 +08:00
caoqianming 05f675f610 fix: stlog create时validate 2024-04-28 11:26:55 +08:00
caoqianming 6f98d9dfb3 fix: stlog validate total_secondsbug 2024-04-28 10:04:30 +08:00
caoqianming d01bb012b9 fix: 异常值班处理的权限 2024-04-28 09:35:16 +08:00
caoqianming 1139bb6119 feat: 优化make_sflog/get_sflog 2024-04-11 10:56:32 +08:00
caoqianming 5078a516d2 feat: mlog增加退火后碎字段 2024-04-02 15:44:19 +08:00
caoqianming 779488589a fix: handover_submit针对混料特殊处理的bug3 2024-03-06 22:24:11 +08:00
caoqianming 2addfc8433 fix: handover_submit针对混料特殊处理的bug2 2024-03-06 21:52:55 +08:00
caoqianming 3ddb050330 fix: handover_submit针对混料特殊处理的bug 2024-03-06 21:45:17 +08:00
caoqianming b429ad9059 fix: 废弃一些接口 2024-03-06 18:01:24 +08:00
caoqianming 8a32690395 feat: handoverserializer返回更多数据 2024-03-06 17:44:50 +08:00
caoqianming abdee3d2d5 feat: 增加wmaterial查询条件 2024-03-06 17:21:48 +08:00
caoqianming 4c3610ac25 feat: 混料支持车间库存 2024-03-06 17:07:51 +08:00
caoqianming f6db92f815 feat: 增加wmaterial查询条件 2024-03-06 15:50:29 +08:00
caoqianming 0de0489272 feat: 增加箱中破不合格字段 2024-03-05 10:11:33 +08:00
caoqianming 5c0c016872 fix: correct_tuihuo_log矫正退火日志2 2024-03-04 15:50:49 +08:00
caoqianming c1d5ef86f1 fix: correct_tuihuo_log矫正退火日志 2024-03-04 14:58:36 +08:00
caoqianming e99854b56f fix: mlog填写时进行更进一步校验 2024-03-04 13:54:31 +08:00
caoqianming eef99ed624 feat: 出入库操作支持提交后可撤销功能 2024-02-29 17:10:50 +08:00
caoqianming d483bb6b61 fix: mlog update时mlogb不更新 2024-01-28 00:18:10 +08:00
caoqianming d0b13ac215 feat: do_in时增加更完整的提示信息 2024-01-25 09:49:37 +08:00
caoqianming 6f8c7c0567 feat: mlog validate时计算count_notok 2024-01-20 23:30:09 +08:00
caoqianming 78fd0c9721 feat: 日志撤回后修改任务状态 2024-01-18 10:55:41 +08:00
caoqianming a4d23f534a fix: mlog validate bug 2024-01-18 10:27:38 +08:00
caoqianming 4a6aabd860 fix: do_in new_count为0时wm.delete 2024-01-12 16:45:07 +08:00
caoqianming 7ca12228e2 feat: 库存减到0时删除该记录 2024-01-11 17:56:00 +08:00
caoqianming 89215d4752 feat: 任务停止后日志不可再提交 2024-01-04 09:11:53 +08:00
caoqianming 6165af7c47 feat: mlog_submit返回更详细的报错 2023-12-28 17:28:46 +08:00
caoqianming c91533a328 feat: mlog增加equipments字段 2023-12-27 09:51:04 +08:00
caoqianming 03d6a6c99f fix: mtask_submit时导致重复计算 2023-12-27 09:03:12 +08:00
caoqianming d131741f4b feat: handover返回material_name 2023-12-25 13:04:37 +08:00
caoqianming 93de5ea879 feat: wmaterialserializer返回全名 2023-12-22 13:47:59 +08:00
caoqianming c80b486a00 feat: equipment_name 返回—的为__str__数据 2023-12-22 10:19:25 +08:00
caoqianming 00c860b001 fix: mlog update时mtask, mgroup不可变 2023-12-21 08:49:07 +08:00
caoqianming ef2975d05d feat: wmaterial增加筛选条件 2023-12-21 00:14:13 +08:00
caoqianming ec3014d5ee feat: mlog增加返回数据 2023-12-20 23:30:27 +08:00
caoqianming 0f2d2dbee9 feat: 其他生产记录增加查询handle_date 2023-12-20 15:17:31 +08:00
caoqianming 043869e828 feat: mlog增加不合格原因字段 2023-12-18 14:21:56 +08:00
caoqianming bf5d62e99d fix: mlog提交时如有mtask则handle_date为mtask日期2 2023-12-18 12:25:19 +08:00
caoqianming 6182ef3c58 feat: mlog提交时如有mtask则handle_date为mtask日期 2023-12-18 11:20:51 +08:00
caoqianming a9c16c4a9d feat: 日志提交和撤回返回序列化信息 2023-12-18 11:12:33 +08:00
caoqianming 625074049e feat: mlog日志撤回 2023-12-18 09:18:06 +08:00
caoqianming 845a510068 fix: mlog撤回1未完成 2023-12-18 08:08:42 +08:00
caoqianming 8c43f8ec62 fix: handover update validate更严谨一些 2023-12-17 19:55:45 +08:00
caoqianming 1b5c910cf8 fix: 交接记录的提交bug 2023-12-16 13:00:56 +08:00
caoqianming 4f1ae6ddc6 fix: mlogsubmit bug 2023-12-16 11:46:57 +08:00
caoqianming bd6b4a5f82 fix: gen_by_wm需提供send_mgroup 2023-12-16 11:42:38 +08:00
caoqianming 128dc2a7e3 feat: utask mtask状态submit调整 2023-12-15 09:05:08 +08:00
caoqianming 6b6ff7cd3c feat: mlog更新时更新日志 2023-12-14 10:36:47 +08:00
caoqianming ea63c29a69 feat: mlog有mtask时固定handle_date 2023-12-07 10:55:06 +08:00
caoqianming 2d8169849f feat: 将mlog添加审计日志 2023-12-07 09:39:52 +08:00
caoqianming 95f67b6543 feat: is_hidden的物料也需要进行车间库存管理 2023-12-05 13:02:14 +08:00
caoqianming ac323781eb feat 增加wm查询条件 2023-12-01 15:51:32 +08:00
caoqianming e3d37c6dfa feat: wm增加查询条件 2023-12-01 14:16:06 +08:00
caoqianming dc47570a5b feat: wm增加查询条件 2023-12-01 11:33:23 +08:00
caoqianming 6e8d78a5e9 doc: 增加注释 2023-11-30 17:10:42 +08:00
caoqianming cc0a2719de feat: mtask增加submit_time 2023-11-30 16:30:07 +08:00
caoqianming 81e97c4789 feat: 日志提交时间校验 2023-11-30 14:48:47 +08:00
caoqianming 9dc31b366b fix: handover submit bug 2023-11-30 14:14:52 +08:00
caoqianming abb3fef89f feat: 交接记录修改 2023-11-30 10:47:38 +08:00
caoqianming a7ff21bb80 fix: handover增加送料工段 2023-11-30 10:15:31 +08:00
caoqianming 3a24e6f858 feat: handover增加送料工段 2023-11-29 16:52:00 +08:00
caoqianming eb665c7943 feat: mlog增加查询条件 2023-11-29 16:23:07 +08:00
caoqianming e24a16b692 fix: mlog设置必填项目 2023-11-28 00:23:48 +08:00
caoqianming 9ba83cc1fe feat: 交接记录增加查询条件 2023-11-27 23:19:35 +08:00
caoqianming 64ac57d217 feat: handover material必填 2023-11-27 23:15:19 +08:00
caoqianming 014b21ba2b feat: mlog增加筛选条件 2023-11-27 22:45:13 +08:00
caoqianming 4e3f6686c2 feat: 增加mlog返回数据 2023-11-27 17:39:59 +08:00
caoqianming 697daadb8a feat: 增加mlog返回数据 2023-11-27 17:33:51 +08:00
caoqianming ee3841cd52 feat: 去除mlog重复校验 2023-11-27 17:25:11 +08:00
caoqianming 555700793f feat: otherlog路由注册 2023-11-27 13:21:14 +08:00
caoqianming ec5c246bdc feat: 其他生产日志 2023-11-27 11:33:15 +08:00
caoqianming e78f864666 feat: stlogserializer增加校验 2023-11-22 16:33:41 +08:00
caoqianming 2030812c18 fix: 能管的工段异常修改 2023-11-22 16:07:00 +08:00
caoqianming dd2189900f feat: sflog增加total_hour字段 2023-11-20 19:09:40 +08:00
caoqianming a7204ec897 doc: 添加注释 2023-11-20 19:08:10 +08:00
caoqianming fddadfe30c feat: wpm中增加到岗记录 2023-11-20 16:26:14 +08:00
caoqianming 2ae8913b25 feat: 一些统计分析接口可用bi替代 2023-11-14 13:48:07 +08:00
caoqianming a591abab8a feat: mtask serializer增加mlogs 2023-11-14 13:47:49 +08:00
caoqianming 1b85a7f88a fix: 可不用隐式物料 2023-11-03 18:33:12 +08:00
caoqianming d9ef7548e4 feat: 出入库明细检验 2023-11-03 14:01:03 +08:00
caoqianming 9315efe6f4 perf: 一些调整 2023-11-03 09:07:33 +08:00
caoqianming b2c201877f fix: receive user 返回错误 2023-11-02 18:50:02 +08:00
caoqianming fd13551150 fix: mlogb update 只更新存在的 2023-11-02 17:42:19 +08:00
caoqianming 9c30d43dd0 feat: 增加碎料数字段 2023-11-02 16:20:09 +08:00
caoqianming 3b3434fcf1 feat: mlog增加material_in字段 2023-11-02 16:13:10 +08:00
caoqianming 4460d4af61 fix: mlogserializer material_outs_ bug修复 2023-11-02 15:20:14 +08:00
caoqianming 2cd4a68e23 fix: mlogserializer material_outs_ bug修复 2023-11-02 14:38:59 +08:00
caoqianming 03f80ed99d fix: mlog create bug 2023-11-02 09:05:55 +08:00
caoqianming b742fecf50 fix: datetime引用出错2 2023-11-02 08:44:07 +08:00
caoqianming 1ae6c3fde7 fix: datetime引用出错 2023-11-02 08:42:46 +08:00
caoqianming e544c1112d feat: wmaterial 创建联合主键 2023-11-01 18:15:52 +08:00
caoqianming 03ae93f7e9 feat: 车间库存形成交接记录以及交接记录的提交 2023-11-01 18:11:26 +08:00
caoqianming 9f3300c04c fix: get_total_hour_now bug 2023-11-01 17:57:06 +08:00
caoqianming f8b3868467 fix: mlog增加handle_users的返回 2023-11-01 14:41:08 +08:00
caoqianming 5b0fcd31c2 feat: 增加mlog查询条件 2023-11-01 14:18:14 +08:00
caoqianming 73186929a6 fix: mlogserializer bug 2023-11-01 14:10:02 +08:00
caoqianming 8abc008ddf feat: 单个mlog submit 2023-11-01 13:59:51 +08:00
caoqianming 1a640d9a70 feat: mlog增加submit_time/submit_user及相应逻辑 2023-11-01 13:28:07 +08:00
caoqianming 3750ea0f2a fix: mlogserializer bug 2023-11-01 09:35:09 +08:00
caoqianming d65b88157c fix: mlogbserializer bug修改 2023-11-01 09:17:14 +08:00
caoqianming 6f825546ac feat: 有mloga之后的对应mlog_confirm修改 2023-11-01 09:14:12 +08:00
caoqianming 732a33f1f2 feat: 增加mlogb表以记录多个产出 2023-11-01 08:42:10 +08:00
caoqianming b67cdde9d3 feat: mlog增加班次及序列化 2023-10-31 15:47:13 +08:00
caoqianming 9427544cca feat: mlog添加字段 2023-10-31 15:06:10 +08:00
caoqianming da43690836 feat:mlog 备注修改 2023-10-31 14:19:29 +08:00
caoqianming cb1f6444d9 feat: mlogserializer增加material_out_ 2023-10-31 14:03:58 +08:00
caoqianming 78db88f368 fix: mlog create取消批次号校验 2023-10-31 13:54:11 +08:00
caoqianming d072a01bf8 fix: mlog create 不带mtask时报错2 2023-10-31 13:39:17 +08:00
caoqianming 27e4022d9a fix: mlog create 不带mtask时报错 2023-10-31 13:33:40 +08:00
caoqianming ebb35740fd feat: handover添加进路由 2023-10-31 11:01:44 +08:00
caoqianming 2d20825716 feat: 增加交接记录表及相应接口 2023-10-31 10:50:36 +08:00
caoqianming b8bc753418 feat: mlog增加部分字段以便单独创建日志 2023-10-30 16:47:10 +08:00
caoqianming 6c14e8c8fd feat: 日志添加不合格原因数字段 2023-10-30 12:44:28 +08:00
caoqianming cbc43fdb65 feat: 增加is_count_utask字段以确认同步utask 2023-10-26 18:20:04 +08:00
caoqianming 4cea056955 feat: utask mtask增加状态以及相关逻辑 2023-10-26 16:25:04 +08:00
caoqianming e9845a246e fix: 组合件出入库bug 2023-10-25 15:51:25 +08:00
caoqianming 3e77468ea5 fix: update_mtask bug 2023-10-25 13:48:58 +08:00
caoqianming 3cbc6e3fef feat: 增加mlog查询条件 2023-10-25 10:42:29 +08:00
caoqianming bc2a16a9a4 feat: 增加组合件出入库 2023-10-24 10:26:13 +08:00
caoqianming fd4ccae448 feat: 返回可用的批次号 2023-10-23 15:03:09 +08:00
caoqianming 53b38d7cc4 feat: 获取相关任务的第一道工序日志 2023-10-23 10:30:49 +08:00
caoqianming 2725a97213 feat: handle_user也作为约束条件 2023-10-23 09:02:57 +08:00
caoqianming a69fa79de8 feat: 获取指定车间指定日期的最后工序生产任务 2023-10-20 16:55:20 +08:00
caoqianming c142f00bf3 feat: 增加handle_date及相应的校验 2023-10-20 14:50:56 +08:00
caoqianming f9b3a69552 fix: update_mtask bug 2023-10-20 14:49:54 +08:00
caoqianming 3d407795a9 feat: 增加utask 2023-10-20 09:08:14 +08:00
caoqianming 53d2276998 fix: mlog confirm bug 2023-10-19 14:07:09 +08:00
caoqianming 5e34558c02 feat: route增加主要输入和输出以及自动排产逻辑修改 2023-10-16 16:50:46 +08:00
caoqianming f3b43ab0ce fix: mgroup 增加need_enm字段 2023-10-13 13:13:31 +08:00
caoqianming c6f9b749c7 feat: mlog增加handle_user 2023-10-10 16:43:05 +08:00
caoqianming b4cc887f79 feat: mtask增加已提交状态并在提交后不允许日志变动 2023-10-08 16:38:55 +08:00
caoqianming b7ba095de7 feat: 增加生产日志表及创建逻辑 2023-10-08 11:27:41 +08:00
caoqianming 2597617a94 refector: 优化了do_in报错 2023-09-28 10:18:44 +08:00
caoqianming 9ebf15b04f feat: 生产入库后变更车间物料 2023-09-28 09:22:37 +08:00
caoqianming 9504b527cb feat: 增加车间库存并完成生产领料 2023-09-27 15:41:36 +08:00
caoqianming 7de606b496 fix: mtask级联下达任务 2023-09-27 09:43:10 +08:00
caoqianming 75533d41ed feat: sflogexp增加stlog_返回字段 2023-09-04 15:50:14 +08:00
caoqianming f719702432 fix: shutdown_or_startup 优化 2023-09-04 15:36:16 +08:00
caoqianming 1ed7c846a3 fix:cal_shut_hour 的时区问题 2023-09-04 14:41:38 +08:00
caoqianming e6127864e7 fix: 执行测点函数的bug 2023-09-04 14:10:21 +08:00
caoqianming a0955c401f feat: shutdown_or_startup 优化 2023-09-01 17:32:24 +08:00
caoqianming 4fa33a7252 fix: cal_shut_hour bug 2023-09-01 16:58:58 +08:00
caoqianming ad30803836 feat: sflogExp增加查询条件 2023-08-24 10:52:06 +08:00
caoqianming 4cd2c0f85b feat: enstat2增加day_s统计及相应的tasks改动 2023-08-23 08:33:45 +08:00
caoqianming ad9027d888 fix: 煤粉热值取白班值 2023-08-17 15:05:40 +08:00
caoqianming ccfeb9d901 feat: sflogexp合并stlog 2023-08-08 14:41:50 +08:00
caoqianming ebe6ab9f3b feat: 增加生产异常动态记录表 2023-08-04 14:26:53 +08:00
caoqianming c7b7d9cec4 fix: cal_enstat_when_pcoal_heat_change的qs获取bug 2023-08-03 14:09:47 +08:00
caoqianming a609b1db94 feat: cal_enstat_when_team_change 2023-08-03 10:31:38 +08:00
caoqianming 67d04a9a41 feat: 可以不用间隔运行get_total_hour_now 2023-08-02 17:25:07 +08:00
caoqianming 40ecd52fee feat: 可根据时间段生成排版记录 2023-08-02 15:54:09 +08:00
caoqianming 7619e5156c feat: cal_mpointstats分组执行 2023-08-02 14:12:46 +08:00
caoqianming ad2f903c89 fix: init_test bug 2023-08-02 10:51:48 +08:00
caoqianming 3dc647272a feat: cal_enstat_when_pcoal_val_change 未完成 2023-08-02 10:22:51 +08:00
caoqianming 251e373d5b feat: get_total_hour_now 修改 2023-08-01 16:41:47 +08:00
caoqianming 80b61c9f8b fix: get_total_hour_now bug 2023-08-01 08:54:01 +08:00
caoqianming d2e4439b73 fix: get_total_hour_now bug 2023-08-01 08:50:06 +08:00
caoqianming a29ed1edc8 fix: get_total_hour_now sql查询bug 2023-07-31 17:46:56 +08:00
caoqianming 6d5d2f84d4 feat: 停机记录分配到每一个班 2023-07-28 17:36:09 +08:00
caoqianming d487f0889f feat: 获取煤粉热值 2023-07-28 17:20:54 +08:00
caoqianming 1d0b43d75f feat: sflog增加total_hour_now以及pcoal_val 2023-07-28 17:18:59 +08:00
caoqianming 437d4c923e fix: init_test 报错 2023-07-25 13:25:05 +08:00
caoqianming b634bac616 feat: sflog获取年月日优化 2023-07-25 11:23:36 +08:00
caoqianming 13382171de refector: 初始化检测录入优化 2023-07-25 11:20:27 +08:00
caoqianming be9011f8f5 feat: sflog增加property以获取年月日 2023-07-25 11:19:51 +08:00
caoqianming 27a2a20cbe feat: 值班记录增加运转时间和停机时间 2023-07-24 11:19:08 +08:00
caoqianming f02135dc10 fix: init_test 排序错误 2023-07-10 16:26:23 +08:00
caoqianming 377817f04c feat: sflog增加查询参数已获取当前值班记录 2023-07-07 15:36:49 +08:00
caoqianming e51d19fac0 fix: 初始化检测录入排序及取消质检任务执行 2023-07-06 14:48:33 +08:00
caoqianming dab2d164b1 feat: 值班记录增加最后质检时间 2023-07-06 08:39:57 +08:00
caoqianming e0fcb2e22b fix: 初始化检测bug 2023-07-05 16:39:01 +08:00
caoqianming edd2dc5600 fix: 初始化检测录入rate_pass, create_by, belong_dept需要有 2023-07-05 16:17:10 +08:00
caoqianming eef4beebb4 fix: 修复quastat task 2023-07-05 16:02:28 +08:00
caoqianming 965e3169ba feat: 初始化检测录入bug 2023-07-05 14:35:21 +08:00
caoqianming 066217d6c1 fix: 初始化检测录入bug 2023-07-05 14:06:44 +08:00
caoqianming 93881852d0 feat: sflog init_test接口 2023-07-05 13:44:07 +08:00
caoqianming f620dc0bcb refector: 生成排班记录 2023-06-30 10:24:15 +08:00
caoqianming a6167294f7 feat: sflog filter 2023-06-30 10:22:46 +08:00
caoqianming 6bbbf16049 feat: 值班记录排序 2023-06-28 09:13:14 +08:00
caoqianming 49fa109233 feat: 自动创建值班记录 2023-06-28 09:00:43 +08:00
caoqianming 51737bcdd8 fix: 权限代号调整 2023-06-26 16:45:52 +08:00
caoqianming 0145beb63f feat: 值班记录质量分析数据录入 2023-06-26 16:00:23 +08:00
caoqianming 07a8e5977f feat: 值班记录增加电耗统计 2023-06-25 17:10:39 +08:00
caoqianming 1d16949d8a feat: 增加wpm,qm,mtm三个app 2023-06-20 17:05:50 +08:00