Commit Graph

809 Commits

Author SHA1 Message Date
caoqianming c70702bec8 record form create update 增加 export template字段 2022-04-21 13:27:52 +08:00
caoqianming f92af5df27 增加检验记录导出功能 2022-04-21 11:32:12 +08:00
caoqianming e82e903448 hasattr(obj, employee_user) 2022-04-19 13:32:50 +08:00
caoqianming 50344dfca2 增加userstandardserializer 2022-04-19 13:27:48 +08:00
caoqianming bcf99f1515 增加自定义表模板以及表单项span字段 2022-04-19 11:10:34 +08:00
caoqianming 707ed88b4a wproduct detail增加create_by update_by 2022-03-30 13:51:06 +08:00
caoqianming c652182358 wproduct list 增加create_by, update_by 2022-03-30 13:49:52 +08:00
caoqianming 7de173b131 操作创建人最后编辑人 2022-03-30 09:53:56 +08:00
caoqianming ac7b305d9d 生产操作取消权限过滤 2022-03-30 09:30:46 +08:00
caoqianming cfc1aaab40 process steps get * 2022-03-30 09:29:22 +08:00
caoqianming ce6af8fab4 testrecord_update put接口 2022-03-29 16:53:33 +08:00
caoqianming ab42ef0f83 srm bug 2022-03-29 11:43:27 +08:00
caoqianming 8b56148949 develop增加同步数据库并重启服务 2022-03-29 08:53:19 +08:00
caoqianming 16e84bf4d0 fifoitem list 传入test [] 2022-03-25 09:11:43 +08:00
caoqianming d1fe27db0e 其他出库 fifoitemcreate bug 2022-03-23 14:33:23 +08:00
caoqianming 31d6cbf3a9 修改用户表假删除 2022-03-18 17:07:49 +08:00
caoqianming d64f51e631 plan near_done out_done查询bug 2022-03-18 16:50:29 +08:00
caoqianming a8d97f9fc0 修改develop命令 2022-03-18 08:26:12 +08:00
caoqianming 0aa096af8c 到岗天数统计加入show_atwork筛选 2022-03-17 12:00:30 +08:00
caoqianming 371c3996a4 增加监管协议号以及不展示到岗 2022-03-17 11:57:58 +08:00
caoqianming 35bac2297c 文章排序 2022-03-17 10:43:34 +08:00
caoqianming b0ea55121b wproductflow child字段修改 2022-03-17 08:31:38 +08:00
caoqianming feebb616a9 创建产品变动日志bug 2022-03-17 07:17:43 +08:00
caoqianming 178898a919 批量创建日志bug 2022-03-16 16:52:27 +08:00
caoqianming 8859c13edf 增加to_order_need_mtest字段查询 2022-03-16 16:34:59 +08:00
caoqianming d3f999d2c8 其他出库不可操作成品或半成品 2022-03-16 16:11:45 +08:00
caoqianming b4795ab9f2 增加cms article 2022-03-16 10:28:39 +08:00
caoqianming e7fdc7984a 增加count_doing 2022-03-15 16:50:37 +08:00
caoqianming 1d0de666b8 订单数量统计,生产进度统计 2022-03-15 15:03:24 +08:00
caoqianming 80956f41c2 统计产品数量bug 2022-03-15 11:13:17 +08:00
caoqianming 4cadeac2d4 统计产品生产数量 2022-03-15 10:45:20 +08:00
caoqianming 5327828ae0 其他出库bug 2022-03-15 09:19:12 +08:00
caoqianming bae1c166a0 采购出入库 2022-03-15 09:06:34 +08:00
caoqianming cf83b9e8f9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-14 11:11:53 +08:00
caoqianming 0bae0d4c53 其他出库 2022-03-14 11:11:46 +08:00
shilixia 96b404ebf3 tijiao 2022-03-11 13:19:51 +08:00
caoqianming 13f29342c6 增加其他出库 2022-03-03 23:51:23 +08:00
caoqianming 99e49c6eb3 wf日志提交完整 2022-03-02 09:35:41 +08:00
caoqianming 9d721c51b7 销售记录出库就不可装箱 2022-03-01 15:42:46 +08:00
caoqianming c3a6fa7441 未审核不可装箱 2022-03-01 15:26:03 +08:00
caoqianming 8eea8e956e 夹层后检验bug 2022-03-01 14:21:42 +08:00
caoqianming efd5c82853 车间操作移除半成品bug 2022-03-01 14:01:57 +08:00
caoqianming 6f6707c024 领料更新车间物料时只处理物料 2022-03-01 13:21:01 +08:00
caoqianming 20c70b3d11 如果有正在进行的工序中检验 bug 2022-03-01 11:37:14 +08:00
caoqianming 242c311490 如果有正在进行的工序中检验 bug 2022-03-01 11:35:58 +08:00
caoqianming 5771e6d555 去除ng_sign 的bug 2022-03-01 11:26:34 +08:00
caoqianming 5861ed4745 半成品检索以及权限排序 2022-03-01 10:43:21 +08:00
caoqianming 4c6b0c36bf 半成品检索以及权限排序 2022-03-01 10:42:55 +08:00
caoqianming bf1f2ab4e9 去除消耗物料限制 2022-03-01 10:34:39 +08:00
caoqianming 2d834246fa 一些bug修复 2022-03-01 10:27:45 +08:00
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