Commit Graph

641 Commits

Author SHA1 Message Date
caoqianming 2e5771dc6f add_wproduct_flow_log 2021-12-30 09:32:47 +08:00
caoqianming 6e7246dd71 前端修改 2021-12-29 15:25:28 +08:00
caoqianming 723b34a87f 增加product_ srm serializer 2021-12-29 15:24:39 +08:00
caoqianming 445bed8e65 更改main_product为product 2021-12-29 14:48:06 +08:00
caoqianming a5af3cd71d main_count统一为count 2021-12-29 14:29:35 +08:00
caoqianming cede23d7e2 srm gantt增加product字段 2021-12-29 14:21:31 +08:00
caoqianming c24e659e0e production_plan state字段以及增加军检完成 2021-12-29 14:09:25 +08:00
caoqianming c596e79350 genplan atomic 2021-12-29 10:16:54 +08:00
caoqianming 8a3de0accc update_process_json 2021-12-29 10:12:45 +08:00
caoqianming 3c474ea805 update_process_json 2021-12-29 10:10:33 +08:00
caoqianming d87ba48526 返工返修 工单 retest_result字段 2021-12-29 10:07:08 +08:00
caoqianming 8563a0c7f9 pm相关表增加count_notok字段, update_wproduct_log 2021-12-29 09:17:04 +08:00
caoqianming 0b989f79b1 根据产品日志更新生产进度 2021-12-28 15:56:50 +08:00
caoqianming d62a09a00c 同步wpm数据库 2021-12-28 15:48:54 +08:00
caoqianming 004030e9df 根据产品变动日志更新生产进度 2021-12-28 15:37:29 +08:00
caoqianming b76eeefe37 增加wproduct日志表,增加production_plan的查询条件 2021-12-28 14:31:59 +08:00
caoqianming 9b832719f5 执行操作决定bug 2021-12-28 10:49:17 +08:00
caoqianming 743b58ab0f bug 2021-12-28 10:35:36 +08:00
caoqianming 10525639c4 wpm signals 执行操作决定 2021-12-28 10:33:39 +08:00
caoqianming acfe00480e 生产计划detail接口 2021-12-28 10:27:00 +08:00
caoqianming 847e776568 update_plan_process_json bug 2021-12-27 15:53:32 +08:00
caoqianming c9219ea495 bug修改 2021-12-27 15:52:05 +08:00
caoqianming 756f2efc56 wpm update 不触发singal/ pm process_json字段 2021-12-27 15:49:32 +08:00
caoqianming 15812bf048 更新计划按工序字段统计 2021-12-27 14:56:55 +08:00
caoqianming c8c9cd4554 发起不合格审理单 2021-12-27 14:23:05 +08:00
caoqianming 7713cc045d 同步数据库 2021-12-27 13:18:30 +08:00
caoqianming 6afd62dc93 wf ticket detail bug 2021-12-27 10:59:40 +08:00
caoqianming 6a1641115f 同步数据库 2021-12-27 09:49:23 +08:00
caoqianming 811fe24fc7 返工返修执行操作决定 2021-12-27 09:45:23 +08:00
caoqianming 6682d43022 自定义allfield 2021-12-24 14:37:59 +08:00
caoqianming 7c073a54cb to_internal value fieldchoice bug 2021-12-24 14:25:56 +08:00
caoqianming a5062a375e 更新动态产品表selled 2021-12-24 13:52:18 +08:00
caoqianming 78aea31725 field choice serializer write only 2021-12-24 13:49:52 +08:00
caoqianming f9a71a2fa4 field choice 非必填 2021-12-24 10:19:36 +08:00
caoqianming 32a1d9020d fifoitem 增加is_tested is_testok查询条件 2021-12-24 09:33:11 +08:00
caoqianming b433476daf inm test接口bug 2021-12-24 09:19:09 +08:00
caoqianming f8224373f3 fifoitem增加fifo__type查询条件 2021-12-24 08:55:10 +08:00
caoqianming 866a0ecf48 customfield createupdate serializer 2021-12-24 08:53:05 +08:00
caoqianming dc5d7ff48e wf field_display字段 2021-12-23 17:11:37 +08:00
caoqianming 0eec676228 信号加载 2021-12-23 09:10:38 +08:00
caoqianming f3b54b219c wf_bhg接口bug 2021-12-22 14:50:00 +08:00
caoqianming 4da2f48203 工单与系统结合初步修改完毕 2021-12-22 11:56:35 +08:00
caoqianming d6c59afbc4 工作流自定义字段排序 2021-12-22 10:39:44 +08:00
caoqianming 72e5d89cac 工作流自定义字段排序 2021-12-22 10:37:24 +08:00
caoqianming 5fed3d5ad8 报废操作bug 2021-12-22 09:02:51 +08:00
caoqianming b104a93828 报废操作bug 2021-12-22 08:35:21 +08:00
caoqianming 71e00d8455 报废接口修改 2021-12-21 16:32:38 +08:00
caoqianming d892a0651d 报废操作针对冷加工进行修改 2021-12-21 16:20:20 +08:00
caoqianming 0bd5516cef handleticket bug修复 2021-12-21 10:04:19 +08:00
caoqianming 0e37cd6c9c 工作流引擎测试未修改 2021-12-21 09:26:08 +08:00
caoqianming 61a1b9c858 增加生产计划检索条件 2021-12-20 15:52:15 +08:00
caoqianming fb156d125a 半成品列表增加查询条件 2021-12-20 15:06:35 +08:00
caoqianming 186fbff1c5 报废操作bug修改 2021-12-20 10:46:36 +08:00
caoqianming 2f30f51219 报废操作bug 2021-12-20 09:30:12 +08:00
caoqianming 09de208ca5 报废操作bug 2021-12-20 09:23:50 +08:00
caoqianming 6a44978456 test record item bug 2021-12-16 17:26:21 +08:00
caoqianming fadb56715e wproduct enum bug 2021-12-16 17:07:51 +08:00
caoqianming e9cea356d3 testrecord item parent 2021-12-16 17:01:11 +08:00
caoqianming c9f21d763c 修改bug 2021-12-16 16:26:07 +08:00
caoqianming 1fad4b40ac ori tri增加field_choice 2021-12-16 16:24:59 +08:00
caoqianming f6e14a4990 只更新必填和可选的字段 2021-12-16 16:19:35 +08:00
caoqianming 7a9d18c5be 只更新必填和可选的字段 2021-12-16 16:11:18 +08:00
caoqianming 67d74bcf3e 检验记录提交bug 2021-12-16 15:55:39 +08:00
caoqianming 1f0fb52513 工作流修改 2021-12-16 15:28:32 +08:00
caoqianming 465d3cc6e9 testrecord detail bug 2021-12-16 15:09:45 +08:00
caoqianming 9d4a75497d 校验未填写项目 bug 2021-12-16 14:25:31 +08:00
caoqianming 8a255c02dc operation record item默认为空 2021-12-16 14:01:44 +08:00
caoqianming 424fa529f0 test init bug 2021-12-16 13:15:37 +08:00
caoqianming 1d8cdb4c5c test_int bug 2021-12-16 13:02:40 +08:00
caoqianming 6c5b4eea6e operation create bug 2021-12-16 11:24:24 +08:00
caoqianming 275b84d20e operation record update 2021-12-16 11:19:44 +08:00
caoqianming 8c1c0fe2cf operation record 提交bug 2021-12-16 10:56:21 +08:00
caoqianming 973dc769cb 检验记录创建时创建item 2021-12-16 10:48:08 +08:00
caoqianming 67c480730c testrecorditemupdatex serializer 2021-12-16 10:30:30 +08:00
caoqianming 221f987334 同步数据库 2021-12-16 10:20:47 +08:00
caoqianming 2062ee7b75 testrecord update接口 2021-12-16 10:19:59 +08:00
caoqianming 759062e3a2 车间操作自定义表单的可update 2021-12-16 09:46:24 +08:00
caoqianming ded0e2e61e operation record update 方法 2021-12-15 17:23:08 +08:00
caoqianming cdc4d4acaf update_subplan_main bug 2021-12-15 16:46:37 +08:00
caoqianming f6225856c4 仓库物料表和物料批次表count__gt=0 2021-12-15 16:27:52 +08:00
caoqianming 4acffd6f9e test-init增加form字段 2021-12-15 16:02:33 +08:00
caoqianming 5e057e78b2 wpm test提交is_hidden 2021-12-15 10:22:13 +08:00
caoqianming 24738bfde0 test_init修改 2021-12-15 10:17:21 +08:00
caoqianming 275068a7a5 testrecord update bug 2021-12-15 09:51:16 +08:00
caoqianming 80720a0734 testrecord update bug 2021-12-15 09:33:35 +08:00
caoqianming 0a487d4277 tesrecord update bug 2021-12-15 08:45:57 +08:00
caoqianming 3dc67158fc testrecord update序列化修改 2021-12-14 16:19:48 +08:00
caoqianming 345d49ef67 testrecord item serializer增加字段 2021-12-14 16:12:50 +08:00
caoqianming 7598e96d1f testrecord serializer增加创建人信息 2021-12-14 15:38:27 +08:00
caoqianming a304818109 testrecord list 增加form 2021-12-14 15:22:51 +08:00
caoqianming 9bf59ee40f 同步数据库 2021-12-14 15:04:56 +08:00
caoqianming e64347c27c 修改testrecorditem 字段及对应的序列化接口去除sort,need_judge 2021-12-14 15:04:01 +08:00
caoqianming 24d2f864af update_wproduct_by_test 修改 2021-12-14 13:32:26 +08:00
caoqianming 1285fdb9a1 检验记录修改与提交 2021-12-14 13:12:05 +08:00
caoqianming 87eb8f1f1c 增加iproduct查询条件/甘特图plan接口 2021-12-13 13:50:14 +08:00
caoqianming 30dbc5a6cd 检测记录保存bug 2021-12-13 10:19:24 +08:00
caoqianming ac135b1386 复检记录 2021-12-13 09:14:56 +08:00
caoqianming a5a11303e0 复检 2021-12-13 09:06:52 +08:00
caoqianming 24307e27f5 复检提供原检测记录ID 2021-12-10 14:16:24 +08:00
caoqianming 30c330eb0c 作业指导书查询去重 2021-12-10 14:00:33 +08:00
caoqianming ccbe2b280f 表单初始化排序 2021-12-10 13:43:10 +08:00
caoqianming ae10c93caf 修改为origin_test 2021-12-10 13:39:36 +08:00
caoqianming 6e492529f7 复检表单初始化接口 2021-12-10 13:18:22 +08:00
caoqianming 65e6ee21fc 子计划增加count_real count_ok字段 2021-12-09 16:39:13 +08:00
caoqianming 590059b23f 输出输出物料批量更新 2021-12-09 16:06:54 +08:00
caoqianming 30fb6749bb 技术文件增加筛选条件operation 2021-12-09 15:30:21 +08:00
caoqianming 9c287399b7 操作增加批量输入输出接口 2021-12-09 13:59:28 +08:00
caoqianming 752a0e9d92 夹层检验之后为合格 2021-12-08 14:48:55 +08:00
caoqianming f27a9e8f92 批量入库bug 2021-12-08 14:45:32 +08:00
caoqianming cd3d7b7d18 批量入库bug 2021-12-08 14:43:22 +08:00
caoqianming 90802f418f 夹层检测和军检数据库更改同步 2021-12-08 14:09:03 +08:00
caoqianming f9784e244d 库存产品进行军检 2021-12-08 14:08:00 +08:00
caoqianming bf3a7080b2 增加夹层检验 2021-12-08 11:31:15 +08:00
caoqianming 306f916f00 salecreate validate product 2021-12-07 16:26:59 +08:00
caoqianming 7a97e5e99b sale audit 变更审核和订单状态 2021-12-07 10:42:17 +08:00
caoqianming b743675190 sale submit bug 2021-12-07 10:36:14 +08:00
caoqianming 6ee7c46d7d sale audit bug 2021-12-07 10:32:48 +08:00
caoqianming 8e3ab103dd sale commit 提交bug 2021-12-07 10:29:34 +08:00
caoqianming 439566b4e5 销售审核bug 2021-12-07 10:24:37 +08:00
caoqianming 03437e1e4d 军检mtest接口bug 2021-12-07 08:47:09 +08:00
caoqianming cf1759c744 is_mtestok 默认为空 2021-12-07 08:43:28 +08:00
caoqianming ac4063d97e sale_product接口 2021-12-06 14:59:34 +08:00
caoqianming 87369611bb 修正部分未使用serializer.vdata的错误 2021-12-06 14:48:00 +08:00
caoqianming c451a53500 sale 创建操作错误 2021-12-06 14:39:03 +08:00
caoqianming 0f65b1ff8a safeproduct 创建删除接口完善 2021-12-06 13:39:40 +08:00
caoqianming 332c4b7729 提交军检接口 2021-12-06 13:26:41 +08:00
caoqianming e83c5ff59f sale 创建bug 2021-12-06 10:21:18 +08:00
caoqianming 4fe19e3a6a sale 事务性创建 2021-12-06 10:20:33 +08:00
caoqianming c2b38f3f1e 销售记录接口 2021-12-06 10:00:04 +08:00
caoqianming 84ba718a98 领半成品 2021-12-03 11:26:13 +08:00
caoqianming 03e0f0d1a2 玻璃批量入库 2021-12-03 10:51:07 +08:00
caoqianming 52be92e98b 半成品批量入库 2021-12-03 10:12:21 +08:00
caoqianming a3ec039c00 半成品批量入库 2021-12-03 10:11:15 +08:00
caoqianming 015491f469 成品检验bug 2021-12-03 09:33:32 +08:00
caoqianming 4c5bbc00b3 wproduct增加material_type筛选条件 2021-12-03 09:15:01 +08:00
caoqianming cc6713da25 成品检验bug 2021-12-03 09:11:19 +08:00
caoqianming fa91eb88f2 待成品检验 2021-12-03 09:02:18 +08:00
caoqianming 1c0f184a37 操作删除 2021-12-03 08:52:28 +08:00
caoqianming 69a54f7f4b 检测状态修改 2021-12-02 16:56:05 +08:00
caoqianming 87ac88a62f wproduct list 去除operation过滤 2021-12-02 16:37:07 +08:00
caoqianming a7f10b2767 更改wproduct act_state字段;复检接口统一 2021-12-02 16:32:32 +08:00
caoqianming 7113f1bed1 增加查询条件 2021-12-02 14:15:04 +08:00
caoqianming e5d45c7577 增加领料记录表 2021-12-02 09:55:08 +08:00
caoqianming 12798d4217 operationlist接口返回设备、记录、玻璃详情 2021-12-01 16:10:49 +08:00
caoqianming bfa2805142 子计划返回列表增加product_ 2021-12-01 11:03:26 +08:00
caoqianming 133e99d556 material增加piece_count字段 2021-12-01 10:37:35 +08:00
caoqianming 20b5cdde67 recordform增加enabled,number字段 2021-12-01 10:19:52 +08:00
caoqianming e92bc40493 修改为PositiveIntegerField 2021-12-01 10:12:09 +08:00
caoqianming a1a3bac26d 增加process type字段 2021-12-01 10:06:47 +08:00
caoqianming bb324727e0 增加待复检 2021-11-29 14:57:11 +08:00
caoqianming e1bc52a89b 包边输出物料bug 2021-11-24 14:30:15 +08:00
caoqianming 7a819b49fb 夹层接口bug修改 2021-11-24 14:02:53 +08:00
caoqianming 0ddb860f20 不检验也可入库 2021-11-24 10:56:42 +08:00
caoqianming 277a1419b6 接口bug 2021-11-24 09:53:04 +08:00
caoqianming eae407c690 materialbatch接口bug 2021-11-24 09:05:35 +08:00
caoqianming 5ad908b742 接口bug 2021-11-24 08:55:32 +08:00
caoqianming 06d0021808 车间物料大于0的 2021-11-24 08:54:27 +08:00
caoqianming eb6a7607f3 operation list 接口bug 2021-11-23 14:58:10 +08:00
caoqianming 32018645ca 车间操作bug 2021-11-23 14:41:25 +08:00
caoqianming fd2141598e 车间操作bug 2021-11-23 14:37:11 +08:00
caoqianming 7dcdcfa797 操作提交bug 2021-11-23 14:26:07 +08:00
caoqianming 048e25311e 填写表单提交bug 2021-11-23 10:56:01 +08:00
caoqianming d44d123d48 自定义表单提交bug 2021-11-23 10:29:33 +08:00
caoqianming a0e56d3666 提交操作 2021-11-23 09:46:25 +08:00
caoqianming 8666c13da8 消耗产出物料接口bug 2021-11-22 16:13:36 +08:00
caoqianming 0238e09d0a wmaterial filterset 2021-11-22 14:59:45 +08:00
caoqianming d58f97c003 车间物料/子计划进度按operation查询 2021-11-22 14:37:31 +08:00
caoqianming 4be1537625 车间操作删除接口 2021-11-22 13:56:24 +08:00
caoqianming d2fb2ffd55 创建operation bug 2021-11-22 12:58:33 +08:00
caoqianming 684f4b997f 更新数据库 2021-11-22 11:11:22 +08:00
caoqianming eba134a2c3 车间操作消耗产出工具工装接口 2021-11-22 11:03:08 +08:00
caoqianming 23b75df2d4 自动gitpull develop 2021-11-20 22:23:27 +08:00
caoqianming 28b44f92a8 增加车间操作设备、自定义表接口 2021-11-19 13:59:27 +08:00
caoqianming dc2468bd71 车间操作列表详情 2021-11-19 13:45:57 +08:00
caoqianming d65f117303 车间操作列表优化 2021-11-19 13:42:24 +08:00
caoqianming f21a599252 车间操作创建 2021-11-19 11:11:51 +08:00
caoqianming 12895757ac 车间操作创建 2021-11-19 11:08:09 +08:00
caoqianming c6cae6e455 车间操作创建 2021-11-19 11:05:23 +08:00
caoqianming 718845b39a 车间操作接口bug 2021-11-19 10:46:16 +08:00
caoqianming bd179c20b1 车间操作重新梳理 2021-11-19 10:40:09 +08:00
caoqianming b8495ee431 从半成品领料bug 2021-11-18 16:49:22 +08:00
caoqianming 8a41c1728e 从半成品领料bug 2021-11-18 16:12:23 +08:00
caoqianming f939b827a8 半成品表直接领 2021-11-18 15:07:54 +08:00
caoqianming 216537c742 获取下一步子工序bug 2021-11-18 09:42:06 +08:00
caoqianming decb1e4aac 半成品领料bug 2021-11-18 09:21:21 +08:00
caoqianming 6482a841d5 半成品领料bug 2021-11-18 09:19:27 +08:00
caoqianming d83aa0d3e8 半成品领料bug 2021-11-18 09:17:54 +08:00
caoqianming c967d63db4 半成品领料bug 2021-11-18 09:14:26 +08:00
caoqianming d129bf878a 半成品领料bug 2021-11-18 09:09:34 +08:00
caoqianming c0d8772a47 领料bug 2021-11-18 09:05:16 +08:00
caoqianming 9bf2e94b53 领料bug 2021-11-18 09:01:30 +08:00
caoqianming 161e6f78ad 领料bug 2021-11-18 08:58:26 +08:00
caoqianming 4db45b6932 领料bug 2021-11-18 08:56:41 +08:00
caoqianming da1237c421 更新子计划进度 2021-11-18 08:52:15 +08:00
caoqianming 3fbede05f7 表字段改动 2021-11-18 08:25:02 +08:00
caoqianming 4d75849405 半成品领料 2021-11-17 17:04:08 +08:00
caoqianming b0e213aae9 表格字段排序 2021-11-17 16:46:12 +08:00
caoqianming 4e5eead1a8 操作时掉出工具工装 2021-11-17 16:38:25 +08:00
caoqianming de94a56416 创建生产计划无需填写编号 2021-11-17 15:45:24 +08:00
caoqianming ace7d222c8 库存半成品列表根据出入库记录变动 2021-11-17 14:39:16 +08:00
caoqianming 5b22d2c993 库存增加半成品列表查询 2021-11-17 10:09:49 +08:00
caoqianming 7e8ce5d60a 单个半成品入库 2021-11-17 09:56:58 +08:00
caoqianming 43d297881e 检测bug 2021-11-16 17:08:32 +08:00
caoqianming 3df4c68f47 检测bug 2021-11-16 16:56:44 +08:00
caoqianming acad79288d 更新自定义表格 2021-11-16 16:22:12 +08:00
caoqianming fd5f2e5eb2 生成半成品编号 2021-11-16 13:30:16 +08:00
caoqianming 12f7a1e2f5 表达式可为空 2021-11-16 10:42:52 +08:00
caoqianming ec64f67041 判定表达式修改 2021-11-16 10:26:03 +08:00
caoqianming 73a475c4ea 领料bug 2021-11-16 09:51:32 +08:00
caoqianming f1102656c7 领料bug 2021-11-16 09:17:13 +08:00
caoqianming fe5108f616 领料bug 2021-11-16 09:10:51 +08:00
caoqianming 5904ab1475 生产入库 2021-11-16 08:42:45 +08:00
caoqianming 25211e9e5a 待检测半成品 2021-11-15 14:06:18 +08:00
caoqianming 5379b84438 半成品入库 2021-11-15 13:52:12 +08:00
caoqianming 6aa30e9c6a 子工序操作bug 2021-11-15 11:32:47 +08:00
caoqianming b09b3996ac 子工序操作 2021-11-15 11:23:01 +08:00
caoqianming a78a10c3fa 领料更新,操作表单更新 2021-11-15 09:16:16 +08:00
caoqianming d28bbc4439 领料bug 2021-11-12 16:43:26 +08:00
caoqianming a1ecad9ffe 领料入库item关联子计划 2021-11-12 13:16:29 +08:00
caoqianming 9236200cf3 修改提交检测记录路由 2021-11-11 14:08:28 +08:00
caoqianming 206df9c85c 出入库记录审核人 2021-11-11 09:44:02 +08:00
caoqianming 487c8fac28 出入库详情带仓库 2021-11-11 09:22:15 +08:00
caoqianming ae44db98bd 批次号可为空 2021-11-10 14:33:52 +08:00
caoqianming 77afc760ae 领料批次默认为空 2021-11-10 10:03:52 +08:00
caoqianming 01eaa2fe9f 领料时批次非必填项 2021-11-10 09:28:36 +08:00
caoqianming 5d5a1e7604 增加事务操作 2021-11-10 09:00:35 +08:00
caoqianming 537fda2e86 wpm post bug 2021-11-09 16:18:34 +08:00
caoqianming 0f229df8f0 wpm post bug 2021-11-09 15:39:42 +08:00
caoqianming 5beb5026ff wpm post bug 2021-11-09 15:37:50 +08:00
caoqianming 48caae5c9a wpm post bug 2021-11-09 13:49:56 +08:00
caoqianming a28282e331 wpm post bug 2021-11-09 13:20:07 +08:00
caoqianming 6a4c99f18c 领料bug 2021-11-09 11:46:27 +08:00
caoqianming 2b3f45eb7f 修改表名 2021-11-09 00:14:30 +08:00
caoqianming b083f1cd8d wpminit serializer 2021-11-08 14:47:06 +08:00
caoqianming 0bdd8a78a1 修改qm表字段 2021-11-08 13:06:01 +08:00
caoqianming 69fe697988 修改qm bug 2021-11-08 11:28:29 +08:00
caoqianming 229ab9b34a 修改qm bug 2021-11-08 11:25:30 +08:00
caoqianming 3664971a17 修改qm bug 2021-11-08 11:12:33 +08:00
caoqianming 2e9924f1d5 修改qm bug 2021-11-08 11:09:17 +08:00
caoqianming 0158998ef9 修改qm 2021-11-08 11:02:54 +08:00
caoqianming 5357a2d82a 修改表名 2021-11-08 09:53:16 +08:00
caoqianming 950418a154 修改表名 2021-11-08 09:35:53 +08:00
caoqianming b966714f7b action form init 组装form 2021-11-08 09:27:10 +08:00
caoqianming c5aafb79e0 bug修复 2021-11-08 09:05:03 +08:00
caoqianming 9588562390 生产操作提交 2021-11-08 09:03:15 +08:00
caoqianming 1b7190a4b6 调用表单操作 2021-11-04 16:14:48 +08:00
caoqianming ba9466a90b 生成子计划bug 2021-11-04 10:07:41 +08:00
caoqianming 29a0a0d33a 车间物料表修改对应子计划 2021-11-04 09:16:12 +08:00
caoqianming b6dca27688 wmateriallist 2021-11-03 08:49:32 +08:00
caoqianming b47b2017de 页面调整 2021-11-03 08:19:51 +08:00