Commit Graph

1169 Commits

Author SHA1 Message Date
caoqianming f9e9041289 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 22:06:40 +08:00
caoqianming a350e0085f 自动打包部署 2022-02-28 22:06:31 +08:00
shijing 512549173b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 15:45:04 +08:00
shijing 4c906f37c8 quanxianpeizhi 2022-02-28 15:44:58 +08:00
caoqianming 8e9642ab63 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 14:23:35 +08:00
caoqianming 8b592231c7 backup 接口 fifoitem 增加 过期日期 2022-02-28 14:23:28 +08:00
shilixia 07992d9a14 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-28 09:09:28 +08:00
shilixia d4730020a1 tijiao 2022-02-28 09:09:21 +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 22727d72fe Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 17:00:42 +08:00
caoqianming e44a3d7e4b 权限校验逻辑 2022-02-25 17:00:35 +08:00
shijing b7f0828225 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:51:15 +08:00
shijing 1de3b9d59c urlChange 2022-02-25 16:51:07 +08:00
caoqianming bd904eaa73 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:36:31 +08:00
shilixia 5443938dd7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:21:24 +08:00
shilixia 381ce61e6c tijiao 2022-02-25 16:21:17 +08:00
caoqianming 32da3595dd Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:13:14 +08:00
caoqianming 88019113de update inm 其他入库 2022-02-25 16:13:07 +08:00
shijing dbe37339fb Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:04:34 +08:00
shijing b9f39f4239 firstTestchange 2022-02-25 16:04:28 +08:00
caoqianming ad85757504 采购订单未审核 2022-02-25 16:02:55 +08:00
caoqianming 11e23d38ae Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 16:00:47 +08:00
caoqianming 3412937bcb inm 入库bug 2022-02-25 16:00:38 +08:00
shijing 1ff9dff340 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 15:43:47 +08:00
shijing 131379d676 textAdjust 2022-02-25 15:43:38 +08:00
caoqianming 5548776cde inm 入库bug 2022-02-25 15:36:20 +08:00
caoqianming 82dab392f0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 15:32:07 +08:00
caoqianming 0910825ad5 存在工单不可报废 2022-02-25 15:32:00 +08:00
shilixia 8a83e868b7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 15:31:27 +08:00
shilixia 9344be2c29 xihai 2022-02-25 15:31:21 +08:00
caoqianming 07dc9e3d9e 取消跟踪pro.py 2022-02-25 13:14:04 +08:00
caoqianming 6474a3668d Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 13:05:52 +08:00
caoqianming bb7c587b68 修改celery 和wsgi 2022-02-25 13:05:45 +08:00
shijing fc8c552a56 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 13:04:00 +08:00
shijing 680bf77ac3 logoHidden 2022-02-25 13:03:51 +08:00
caoqianming 429b5fea31 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 10:16:33 +08:00
caoqianming f4f79089cf 重启服务和备份数据库task 2022-02-25 10:16:25 +08:00
shilixia a0595d4c22 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-25 10:12:14 +08:00
shilixia 5bfa72f716 xiaoshou 2022-02-25 10:12:06 +08:00
caoqianming dd51db56f1 上传物流信息校验一下 2022-02-25 10:02:46 +08:00
caoqianming 1d86d9b2a4 上传物流信息bug 2022-02-25 09:51:59 +08:00
caoqianming 830cf6f6a2 修改bash 2022-02-25 09:45:33 +08:00
caoqianming ff58a631c1 reload.sh更新 2022-02-25 09:38:18 +08:00
caoqianming 7c97455335 server reload sh 2022-02-25 09:31:36 +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