Commit Graph

964 Commits

Author SHA1 Message Date
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 2b5e54ed03 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 16:08:27 +08:00
caoqianming 7271c78cd6 采购订单的审核 2022-01-27 16:08:20 +08:00
shilixia 290efe48ce Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 15:53:40 +08:00
shilixia 30c36786f7 renyuantijiao 2022-01-27 15:53:32 +08:00
shilixia c831b41b61 renyuan 2022-01-27 15:51:02 +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 503fa805a7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 13:21:19 +08:00
caoqianming 64b2cf06e3 生成签名图片优化 2022-01-27 13:21:12 +08:00
shijing e6ac8cb90f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 11:28:53 +08:00
shijing 868a96e591 bigScreenModel 2022-01-27 11:28:19 +08:00
caoqianming 81de7a5349 账户详情接口 2022-01-27 10:57:14 +08:00
shilixia 9e91c90213 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 10:31:01 +08:00
shilixia d551af491a renyuan 2022-01-27 10:30:48 +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 b88ad25749 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-26 16:42:25 +08:00
caoqianming f0fd992f18 考勤天数统计 2022-01-26 16:42:18 +08:00
caoqianming e3e623c5e1 超过订单数量统计 2022-01-26 16:41:52 +08:00
shilixia 2c937c983f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-26 15:59:59 +08:00
shilixia 6de8c40d60 xiuagi 2022-01-26 15:59:51 +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 dfdc035089 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-26 15:08:34 +08:00
caoqianming b3a399d8aa little fix 2022-01-26 15:08:17 +08:00
shijing e7d335b83b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-26 14:00:23 +08:00
shijing 09f1937474 searchshiftandaddtwowarnings 2022-01-26 14:00:12 +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