Commit Graph

809 Commits

Author SHA1 Message Date
caoqianming f269b07140 单个入库没有编号的bug 2022-03-01 09:45:52 +08:00
caoqianming 164c1c5847 复检不合格返回到操作准备中 2022-03-01 09:29:36 +08:00
caoqianming 4388459247 创建sh文件夹 2022-03-01 08:53:13 +08:00
caoqianming 49666dcd49 修改reload server 2022-02-28 22:28:26 +08:00
caoqianming a486848639 coding git push自动更新 2022-02-28 22:23:32 +08:00
caoqianming 9f56e30c80 备份数据库 2022-02-28 22:11:42 +08:00
caoqianming a350e0085f 自动打包部署 2022-02-28 22:06:31 +08:00
caoqianming 8b592231c7 backup 接口 fifoitem 增加 过期日期 2022-02-28 14:23:28 +08:00
caoqianming b3f14a8f6f develop reload backup 2022-02-26 12:16:02 +08:00
caoqianming 2fbbe74564 测试log没有问题 2022-02-25 21:01:06 +08:00
caoqianming e38141b866 log 测试 inm 其他入库问题 2022-02-25 20:59:06 +08:00
caoqianming e44a3d7e4b 权限校验逻辑 2022-02-25 17:00:35 +08:00
caoqianming 88019113de update inm 其他入库 2022-02-25 16:13:07 +08:00
caoqianming ad85757504 采购订单未审核 2022-02-25 16:02:55 +08:00
caoqianming 3412937bcb inm 入库bug 2022-02-25 16:00:38 +08:00
caoqianming 5548776cde inm 入库bug 2022-02-25 15:36:20 +08:00
caoqianming 0910825ad5 存在工单不可报废 2022-02-25 15:32:00 +08:00
caoqianming 07dc9e3d9e 取消跟踪pro.py 2022-02-25 13:14:04 +08:00
caoqianming bb7c587b68 修改celery 和wsgi 2022-02-25 13:05:45 +08:00
caoqianming f4f79089cf 重启服务和备份数据库task 2022-02-25 10:16:25 +08:00
caoqianming dd51db56f1 上传物流信息校验一下 2022-02-25 10:02:46 +08:00
caoqianming 1d86d9b2a4 上传物流信息bug 2022-02-25 09:51:59 +08:00
caoqianming 5dd7089dae 尝试自动更新开发服务器 2022-02-25 09:27:22 +08:00
caoqianming e0b14846f0 上传物流信息 2022-02-25 09:10:34 +08:00
caoqianming cee38849dd 调整defaultpermission class 2022-02-25 08:39:48 +08:00
caoqianming 2f5d672736 facelogin 返回name 2022-02-24 23:13:53 +08:00
caoqianming 1be0ec0fd8 face tiaozheng 2022-02-24 23:07:24 +08:00
caoqianming 62ca3cefbd 人脸识别调整 2022-02-24 20:59:40 +08:00
caoqianming b61212980b 调整人脸识别 2022-02-24 20:40:56 +08:00
caoqianming 54d4bca2ea face login 2022-02-24 17:10:11 +08:00
caoqianming 85345f572d face login 2022-02-24 17:00:52 +08:00
caoqianming 3283072137 face login 2022-02-24 16:55:54 +08:00
caoqianming bd2643b1c5 修改face login to 2022-02-24 16:47:45 +08:00
caoqianming bc0d6b47f7 修改face login to 2022-02-24 16:43:38 +08:00
caoqianming c3c4a2e803 celery bash 2022-02-24 15:31:07 +08:00
caoqianming 7ff09d4d65 修改bash命令 2022-02-24 15:25:39 +08:00
caoqianming df917378a3 增加gunicorn sh 2022-02-24 14:42:25 +08:00
caoqianming fe648d6dcf url地址 2022-02-24 10:58:40 +08:00
caoqianming 18fe432ee6 修改数据库连接 2022-02-24 10:22:22 +08:00
caoqianming 493845c1f4 tolerance 调整 2022-02-23 17:15:14 +08:00
caoqianming 4bc4c8bbc1 联系方式 2022-02-23 17:01:19 +08:00
caoqianming 378b98f70b iproduct filter 2022-02-23 16:49:16 +08:00
caoqianming 7d715146a2 销售记录删除bug 2022-02-23 15:30:54 +08:00
caoqianming fbebb176aa inm audit bug 2022-02-23 14:18:18 +08:00
caoqianming 9c0fb20743 引用bug 2022-02-23 14:12:20 +08:00
caoqianming 947f8088fc 销售出库审核 2022-02-23 14:08:47 +08:00
caoqianming 588102a411 不装箱备注 2022-02-23 10:48:14 +08:00
caoqianming 3d01995012 sam pack remark 可为空 2022-02-23 10:35:39 +08:00
caoqianming 3f68f51bc6 sam pack bug 2022-02-23 10:31:06 +08:00
caoqianming dd77d842d9 pack get 返回库存量 2022-02-23 09:36:44 +08:00
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