Commit Graph

809 Commits

Author SHA1 Message Date
caoqianming 164a6f43e5 pack get bug 2022-02-23 09:19:58 +08:00
caoqianming cf78837fb2 pack get bug 2022-02-23 09:11:18 +08:00
caoqianming a13f1cc950 testrecord detail 增加create_by update_by字段 2022-02-23 08:49:25 +08:00
caoqianming 38d6b95999 装箱接口 2022-02-22 16:38:21 +08:00
caoqianming a1df3434d7 打包装箱接口 2022-02-22 16:28:39 +08:00
caoqianming 3528e18192 首件审核暂去权限 2022-02-22 15:20:19 +08:00
caoqianming bbebc6900d 消除错误 2022-02-22 15:02:54 +08:00
caoqianming c89da89ea2 firstaudit 审核 2022-02-22 14:58:29 +08:00
caoqianming 183b5796df first_test_audit审核 2022-02-22 14:51:13 +08:00
caoqianming 511b5c5ce3 填写离岗说明bug 2022-02-22 11:29:50 +08:00
caoqianming a0d87b6c8b not work remark filter 2022-02-22 11:28:22 +08:00
caoqianming 074a53f45f 日历数据 2022-02-22 11:23:57 +08:00
caoqianming 847986027a 首件检验bug 2022-02-22 10:46:44 +08:00
caoqianming 7355253ff8 first_test_init 2022-02-22 09:55:27 +08:00
caoqianming 56e549ea78 packitem create bug 2022-02-22 09:48:26 +08:00
caoqianming 1d7aa9c279 销售发货涉及 2022-02-22 09:45:10 +08:00
caoqianming 8894754245 step 去除need_test字段 2022-02-21 14:00:55 +08:00
caoqianming 678cf5ffa9 splan 增加first_test_ list 2022-02-21 11:11:25 +08:00
caoqianming 65a4ab8934 首件检查 2022-02-21 10:40:58 +08:00
caoqianming 7a1df98575 同步错误 2022-02-18 17:02:11 +08:00
caoqianming ff386204b5 获取首件检查表first_test_init part1 2022-02-18 16:57:09 +08:00
caoqianming f34d77e8ef packitem bug 2022-02-18 16:16:32 +08:00
caoqianming 6f97cb9900 装箱项目表增删改查 2022-02-18 15:21:15 +08:00
caoqianming 82ada27c91 复制检查表bug 2022-02-18 14:09:08 +08:00
caoqianming fcad2a0675 复制表ID非必填项 2022-02-18 13:20:54 +08:00
caoqianming 1b09d39b8f 填写离岗说明 2022-02-18 13:01:57 +08:00
caoqianming 3d90952cba 离岗说明表 2022-02-18 08:45:58 +08:00
caoqianming 7bfe483c90 is_atwork调整位置 2022-02-17 21:58:23 +08:00
caoqianming 985935641e 车间生产计划过滤条件bug 2022-02-17 16:53:47 +08:00
caoqianming c6f30f7810 车间生产计划增加过滤条件 2022-02-17 15:33:38 +08:00
caoqianming 59339a31fa 计划暂停和终止 2022-02-17 15:24:47 +08:00
caoqianming a708f261af 记录表格分类2 2022-02-16 17:09:47 +08:00
caoqianming bfc4634281 记录表格分类 2022-02-16 15:21:11 +08:00
caoqianming e93f6b6e36 大屏用户登录header 2022-02-15 15:04:32 +08:00
caoqianming 42cbd43117 物料计算结果按物料类型和编号排序 2022-02-15 11:12:40 +08:00
caoqianming c9ad35b4b5 半成品折合计算 2022-02-15 10:52:10 +08:00
caoqianming 39704bade9 wproduct_ticket list 增加workflow字段 2022-02-14 10:48:28 +08:00
caoqianming 264da03d4e 修改为count_workday 2022-02-14 10:12:00 +08:00
caoqianming 070d2b558a 到岗统计增加应到工作日 2022-02-14 10:09:48 +08:00
caoqianming da9bb2b79d settings同源策略配置 2022-02-11 11:20:44 +08:00
caoqianming 0d8fe4d7eb 删除material check 只要经过操作就变更物料状态 2022-02-11 08:39:27 +08:00
caoqianming 71bd7dfb0d update inm bug 2022-02-10 16:26:26 +08:00
caoqianming 3744f417f7 fifo item create bug 2022-02-10 15:25:09 +08:00
caoqianming ea5a7509e7 update_wproduct_by_test is_midtesting 2022-02-10 15:00:26 +08:00
caoqianming 6eeb6c906b test record update item 2022-02-10 14:41:32 +08:00
caoqianming 5ad5d9ad4b test record update item 2022-02-10 14:40:21 +08:00
caoqianming 41ba0ce532 puorder item detail 2022-02-10 14:33:14 +08:00
caoqianming 74fb464d5d 存在未填写项目 2022-02-10 14:00:25 +08:00
caoqianming 173d9f8987 未填写项目更准确提示 2022-02-10 13:58:47 +08:00
caoqianming 6728ef10c4 后端权限代码完善 2022-02-10 13:53:03 +08:00
caoqianming 035982a3d1 usedstep need test serializer 2022-02-10 10:33:35 +08:00
caoqianming 28814649f6 其他入库serializer bug 2022-02-10 09:41:57 +08:00
caoqianming e086bcda58 出入库记录表增加其他入库 2022-02-10 09:18:25 +08:00
caoqianming 7528f49709 采购订单入库 2022-02-10 09:16:09 +08:00
caoqianming fadd16eb1f 工序中检验最后一步时设为未提交 2022-01-29 15:53:24 +08:00
caoqianming 8c35630840 工序中检验基本完成 2022-01-29 15:25:17 +08:00
caoqianming 41bcda4f5c 检验记录每一项目都有update_by 2022-01-29 09:34:25 +08:00
caoqianming a0de3ed58f puorderitem create接口 2022-01-28 16:07:08 +08:00
caoqianming 0322301d96 puorderitem增加list接口 2022-01-28 15:39:38 +08:00
caoqianming 3bdbbf1b52 同步数据库 2022-01-28 14:33:10 +08:00
caoqianming ea587a3ddc 采购入库基本完成 2022-01-28 13:39:52 +08:00
caoqianming 2d260e694d inm 原入库改为其他入库 2022-01-27 17:05:10 +08:00
caoqianming 7271c78cd6 采购订单的审核 2022-01-27 16:08:20 +08:00
caoqianming c8c6945a38 增加采购订单part1 2022-01-27 15:48:03 +08:00
caoqianming c82ef89054 到岗天数统计增加工号 2022-01-27 15:38:00 +08:00
caoqianming ddbd70d172 employee list增加last_check_time 2022-01-27 14:57:19 +08:00
caoqianming c2919b9673 employee list 增加 is_atwork 2022-01-27 14:41:28 +08:00
caoqianming 152996430a 签名图片优化 2022-01-27 13:41:55 +08:00
caoqianming 850817c04e 签名图片优化 2022-01-27 13:38:07 +08:00
caoqianming 64b2cf06e3 生成签名图片优化 2022-01-27 13:21:12 +08:00
caoqianming 81de7a5349 账户详情接口 2022-01-27 10:57:14 +08:00
caoqianming ec0bcb2fd0 employee list dept_字段错误 2022-01-27 10:17:24 +08:00
caoqianming f8bfee6f89 employee 增加list 接口 2022-01-27 09:56:11 +08:00
caoqianming 8cb4f244d1 上传证件照bug 2022-01-27 09:33:34 +08:00
caoqianming d54ea2c2dc 上传照片bug 2022-01-27 09:28:34 +08:00
caoqianming cb2986ca91 上传照片bug 2022-01-26 17:03:24 +08:00
caoqianming f0fd992f18 考勤天数统计 2022-01-26 16:42:18 +08:00
caoqianming e3e623c5e1 超过订单数量统计 2022-01-26 16:41:52 +08:00
caoqianming fa4706207b order tag not_done 2022-01-26 15:27:54 +08:00
caoqianming 492b8d547f order tag not_done 2022-01-26 15:25:41 +08:00
caoqianming b3a399d8aa little fix 2022-01-26 15:08:17 +08:00
caoqianming 1b5b0a5032 wpm mtest bug 2022-01-26 13:57:48 +08:00
caoqianming 16fb06f646 wpm mtest bug 2022-01-26 13:55:55 +08:00
caoqianming a5494e8509 employee字段修改 2022-01-26 13:52:14 +08:00
caoqianming 4139ef91c3 need_to_order 接口serializer错误 2022-01-26 11:11:56 +08:00
caoqianming 0955a208cf 在需要的list接口增加动态字段 2022-01-26 11:06:23 +08:00
caoqianming a2c025cdf2 人脸识别bug 2022-01-26 10:37:00 +08:00
caoqianming f075b119ee iproduct need_to_order筛选bug 2022-01-26 10:32:32 +08:00
caoqianming c6080849d7 iproduct增加need_to_order筛选;pm增加near_done筛选 2022-01-26 10:27:22 +08:00
caoqianming 850c18ba5f fit json render bug 2022-01-26 09:55:42 +08:00
caoqianming 9eab3aa592 iproduct list增加order to_order 字段 2022-01-26 09:21:23 +08:00
caoqianming 04b864e72f 上一提交的bug 2022-01-26 08:44:39 +08:00
caoqianming 47804a0835 资源计算返回增加count_safe字段 2022-01-26 08:41:03 +08:00
caoqianming 9d3cbbd151 system增加last_check_time 2022-01-25 17:04:24 +08:00
caoqianming c98613785b bug 2022-01-25 13:13:11 +08:00
caoqianming e90213d6ce wproduct 增加need_to_order字段 2022-01-25 11:16:43 +08:00
caoqianming 4ba365b243 order create update need_mtest 2022-01-25 10:57:25 +08:00
caoqianming 0d021f1887 equipsimple 增加type 2022-01-25 10:43:37 +08:00
caoqianming a5984ee239 修改登录地址 2022-01-25 09:46:35 +08:00
caoqianming c4c6b48164 更新em tasks update_equip_state_by_next_check_date 2022-01-25 08:55:14 +08:00
caoqianming efc101d2a1 drf 动态字段 mixins 2022-01-24 16:21:00 +08:00
caoqianming f6a7ada99f drf 动态字段omit 2022-01-24 15:48:25 +08:00
caoqianming ceb0fe2354 drf动态字段mixins 2022-01-24 15:38:52 +08:00
caoqianming eaa6da6a4f sam order simple bug 2022-01-24 15:21:07 +08:00
caoqianming c39d62c9a5 去除is_mtested字段 2022-01-24 14:31:07 +08:00
caoqianming 444914fde9 wproduct list 增加order 2022-01-24 13:55:28 +08:00
caoqianming aec8841ba6 sam order增加过期提醒 2022-01-24 13:47:08 +08:00
caoqianming 65fe7f060b equip simple增加type 2022-01-21 16:35:37 +08:00
caoqianming 743d7ce862 employee list 去除face_data 2022-01-21 16:21:21 +08:00
caoqianming e53024c9bc 人脸识别数据用缓存处理 2022-01-21 16:13:32 +08:00
caoqianming db87609ad6 同步数据库 2022-01-21 14:46:02 +08:00
caoqianming f30c2b9741 打卡记录 timzone localtime 2022-01-21 14:43:09 +08:00
caoqianming 832f58d35f clock record bug 2022-01-21 14:16:31 +08:00
caoqianming 7b81a34d89 face cinoare from base64 bug 2022-01-21 14:04:39 +08:00
caoqianming 988dc29ef6 clock record post perm 2022-01-21 13:59:38 +08:00
caoqianming 2261cf1627 user list 增加is_atwork字段 2022-01-21 13:49:18 +08:00
caoqianming ad0599ec66 打卡时间范围设置宽,以供测试 2022-01-21 13:45:57 +08:00
caoqianming 509404994a 打卡接口 2022-01-21 13:41:54 +08:00
caoqianming 50ed7ea9ec order create 订单编号不必输入 2022-01-21 10:34:42 +08:00
caoqianming cb595711fe wpm wproduct list bug 2022-01-21 08:59:06 +08:00
caoqianming 3023929d66 iproduct增加to_order筛选条件 2022-01-20 15:47:05 +08:00
caoqianming 28882ae074 wproductserializer 增加to_order字段 2022-01-20 15:44:27 +08:00
caoqianming b8346d90b9 wproduct 指派订单 2022-01-20 15:41:47 +08:00
caoqianming 7f4da0221c 冷加工的合格率单独处理 2022-01-20 13:50:30 +08:00
caoqianming 0c5601f53a update check date bug 2022-01-20 13:23:04 +08:00
caoqianming b9a9aa2091 update check date bug 2022-01-20 13:21:59 +08:00
caoqianming ddc54a8c76 设备列表请求bug 2022-01-20 11:01:18 +08:00
caoqianming accfedb1d7 根据校准记录变更下次校准日期 2022-01-20 10:57:32 +08:00
caoqianming e4c7f4856c 同步数据库 2022-01-20 10:49:05 +08:00
caoqianming cf19c022fa em 更新检测日期 未完成 2022-01-20 10:47:31 +08:00
caoqianming 8e8f231f72 设备状态字段修改 2022-01-20 09:58:32 +08:00
caoqianming d01ca7df0f 冷加工产品合格率为1 2022-01-20 09:13:59 +08:00
caoqianming db270f7914 update_wproduct_by_test 根据配置是否需要质检决定 2022-01-20 08:42:40 +08:00
caoqianming 65f0d9f1ee 产品分解增加need_combtest字段 2022-01-19 15:17:19 +08:00
caoqianming 5c2751baa9 首页合格率计算 2022-01-19 15:06:51 +08:00
caoqianming f29a5ee5e4 首页合格率统计 2022-01-19 15:04:03 +08:00
caoqianming aa10f7cee1 wpm filter notok 2022-01-19 14:41:00 +08:00
caoqianming 8dcabaf8dc wproduct notok筛选 2022-01-19 14:37:13 +08:00
caoqianming b8824e94ac 创建操作时同步设备状态 2022-01-18 08:42:26 +08:00
caoqianming 0a83b8c2c2 首页交付产品数查询 2022-01-17 14:39:37 +08:00
caoqianming ce62354c8f plan增加material查询条件 2022-01-17 14:12:26 +08:00
caoqianming 9b8518118a order plan filter增加material查询条件 2022-01-17 13:59:42 +08:00
caoqianming 2bdc68f923 fifo 删除 bug 2022-01-17 13:32:34 +08:00
caoqianming e2a9d3b048 fifoitem serializer 增加files_字段 2022-01-17 10:12:59 +08:00
caoqianming b373262d40 testrecord serializer 增加draw_template字段 2022-01-17 10:06:25 +08:00
caoqianming 4257741c2d 采购记录need_test接口 2022-01-14 16:34:20 +08:00
caoqianming 75ff28535a 出入库增加need_test字段 2022-01-14 15:51:35 +08:00
caoqianming 490440cad3 同步数据库 2022-01-14 15:32:41 +08:00
caoqianming 62bd7423db 采购入库不需要填写入库时间 2022-01-14 15:28:04 +08:00
caoqianming 783a778d71 操作时设备状态返回 2022-01-14 15:19:22 +08:00
caoqianming 09a3581dca 批量入库remark非必填 2022-01-14 15:15:40 +08:00
caoqianming ef007e728a 批量入库remark非必填 2022-01-14 15:12:48 +08:00
caoqianming 3d0a0a5c2f 增加夹层检验 2022-01-13 17:03:02 +08:00
caoqianming 39986927d4 入库备注可不要 2022-01-13 16:57:18 +08:00
caoqianming eb4cdf5d2b 修改bug 2022-01-13 16:21:27 +08:00
caoqianming 6ff8b117c0 更新bug 2022-01-13 16:15:30 +08:00
caoqianming a52d9e2b9c 判断消耗产出不一致 2022-01-13 16:12:07 +08:00
caoqianming a6591c341c operation list count_work 字段 2022-01-13 16:08:11 +08:00
caoqianming 8a162fbe58 消耗产出校验bug 2022-01-13 16:06:22 +08:00
caoqianming 95f444ce83 count_work bug 2022-01-13 16:03:32 +08:00
caoqianming b4e5937b28 消耗与产出校验 主要是冷加工 2022-01-13 16:00:20 +08:00
caoqianming bae9d3be2f 同步数据库 2022-01-13 15:35:41 +08:00
caoqianming eac13fec8f 操作半成品增加摆放位置字段 2022-01-13 15:33:28 +08:00
caoqianming 45808debfe record form field sort 2022-01-13 14:54:29 +08:00
caoqianming 2c852c3598 contract amount invoice创建修改 2022-01-13 14:07:04 +08:00
caoqianming 002bd82e1a 查询条件bug 2022-01-13 13:49:06 +08:00
caoqianming c29eb242ae 物料批次增加tag expired查询条件 2022-01-13 13:30:17 +08:00
caoqianming 5efd8fe32a operationrecord增加wproduct筛选条件 2022-01-13 13:18:12 +08:00
caoqianming 630edfc785 last_test_result 2022-01-13 09:37:01 +08:00
caoqianming fcac1d1d78 同步数据库 2022-01-13 09:33:07 +08:00
caoqianming 902dc5bd96 流程卡2 2022-01-11 16:34:04 +08:00
caoqianming 63ddab4942 流程卡1 2022-01-11 16:17:34 +08:00
caoqianming 2b0bd78686 wproduct 流程卡 2022-01-10 13:05:30 +08:00
caoqianming 73a88e2f86 合同增加筛选条件 2022-01-10 10:06:12 +08:00
caoqianming bfa8b6857e plan增加查询条件 在制和已排 bug 2022-01-10 09:17:47 +08:00
caoqianming 6b8332f7bb plan增加查询条件 在制和已排 2022-01-10 09:13:35 +08:00
caoqianming 99d4a08406 增加plan,order等时间范围筛选条件 2022-01-10 08:48:20 +08:00
caoqianming ceb818e6c5 wproduct增加children接口 2022-01-07 15:47:00 +08:00
caoqianming f7369d4347 夹层玻璃增加children 2022-01-07 11:29:55 +08:00
caoqianming ce3751ce2b 夹层玻璃增加children 2022-01-07 11:27:21 +08:00
caoqianming 1402ffaebc update_plan_state_by_mtestok bug 2022-01-07 10:01:36 +08:00
caoqianming ef46ddf7ab update_plan_state_by_mtestok bug 2022-01-07 09:52:56 +08:00
caoqianming 7d033ca12c iproduct 去除军检 2022-01-07 09:43:32 +08:00
caoqianming e4bce6b453 军检日志 2022-01-07 09:32:59 +08:00
caoqianming ad8420b035 半成品表可进行军检,增加仓库字段 2022-01-07 09:19:47 +08:00
caoqianming ae711f3b3b 增加安全库存数字段 2022-01-06 09:43:01 +08:00
caoqianming 90ddb45efe wf 自定义deptSelect标签 2022-01-06 09:39:30 +08:00
caoqianming ab0c9e226f 修改消耗与产出不一致的bug 2022-01-06 09:34:21 +08:00
caoqianming a1e1d0b9b4 updatecuttinglist bug 2022-01-05 09:35:51 +08:00
caoqianming 9ad37f0cef 下料清单queryset 2022-01-05 09:26:50 +08:00
caoqianming ccd2d2e375 下料清单完成 2022-01-05 09:20:45 +08:00
caoqianming 262895d6e6 update_cutting_list_with_operation bug 2022-01-04 17:06:12 +08:00
caoqianming bf711ec9c2 update_cutting_list_with_operation bug 2022-01-04 16:50:37 +08:00
caoqianming 4538c32834 下料清单初步完成 2022-01-04 16:43:32 +08:00
caoqianming 8f1746f8a6 techdoc 增加enabled查询条件 2022-01-04 09:22:54 +08:00
caoqianming 6b5b5e9911 不合格审理返回decision_2 bug 2021-12-31 16:44:53 +08:00
caoqianming a1c86557f0 下料清单接口 2021-12-31 11:31:01 +08:00
caoqianming 7861b5419e wproductticket list返回增加order product 2021-12-31 10:45:21 +08:00
caoqianming e15ad98c92 操作提交后更新进度 2021-12-31 10:26:07 +08:00
caoqianming 2ad60626e5 不合格品审理工单列表接口 2021-12-30 16:35:19 +08:00