 caoqianming
|
5dab6b0815
|
feat: base 增加了get_model_info
|
2023-12-07 09:37:12 +08:00 |
|
caoqianming
|
33ea769ad4
|
feat: 增加任务类型 mass
|
2023-12-05 17:25:09 +08:00 |
|
caoqianming
|
95f67b6543
|
feat: is_hidden的物料也需要进行车间库存管理
|
2023-12-05 13:02:14 +08:00 |
|
caoqianming
|
7bd8d0dd1f
|
fix: base permission去除数据库约束
|
2023-12-04 08:37:35 +08:00 |
|
caoqianming
|
ac323781eb
|
feat 增加wm查询条件
|
2023-12-01 15:51:32 +08:00 |
|
caoqianming
|
e3c0273e0d
|
feat: 增加material查询条件
|
2023-12-01 15:25:39 +08:00 |
|
caoqianming
|
e3d37c6dfa
|
feat: wm增加查询条件
|
2023-12-01 14:16:06 +08:00 |
|
caoqianming
|
9d847c8d87
|
feat: 采购计划和订单都增加提交人
|
2023-12-01 13:51:40 +08:00 |
|
caoqianming
|
dc8bab86cf
|
feat: puorder增加materials字段
|
2023-12-01 13:40:46 +08:00 |
|
caoqianming
|
dc47570a5b
|
feat: wm增加查询条件
|
2023-12-01 11:33:23 +08:00 |
|
caoqianming
|
c827c7d55d
|
fix: route创建时的校验
|
2023-12-01 10:28:34 +08:00 |
|
caoqianming
|
68c2891839
|
fix: route创建时的校验
|
2023-12-01 09:53:11 +08:00 |
|
caoqianming
|
6dfa2b1696
|
fix: route创建时的校验
|
2023-12-01 09:50:40 +08:00 |
|
caoqianming
|
6e8d78a5e9
|
doc: 增加注释
|
2023-11-30 17:10:42 +08:00 |
|
caoqianming
|
d94424131f
|
feat: materialbatch增加查询条件
|
2023-11-30 17:05:34 +08:00 |
|
caoqianming
|
cc0a2719de
|
feat: mtask增加submit_time
|
2023-11-30 16:30:07 +08:00 |
|
caoqianming
|
3e041ec93b
|
fix: 任务提交接口改为单个提交
|
2023-11-30 16:00:38 +08:00 |
|
caoqianming
|
81e97c4789
|
feat: 日志提交时间校验
|
2023-11-30 14:48:47 +08:00 |
|
caoqianming
|
9dc31b366b
|
fix: handover submit bug
|
2023-11-30 14:14:52 +08:00 |
|
caoqianming
|
73a463dd2f
|
feat: 增加mtask查询条件
|
2023-11-30 13:38:20 +08:00 |
|
caoqianming
|
abb3fef89f
|
feat: 交接记录修改
|
2023-11-30 10:47:38 +08:00 |
|
caoqianming
|
a7ff21bb80
|
fix: handover增加送料工段
|
2023-11-30 10:15:31 +08:00 |
|
caoqianming
|
3a24e6f858
|
feat: handover增加送料工段
|
2023-11-29 16:52:00 +08:00 |
|
caoqianming
|
eb665c7943
|
feat: mlog增加查询条件
|
2023-11-29 16:23:07 +08:00 |
|
caoqianming
|
e07034919d
|
feat: mgroup增加查询条件
|
2023-11-29 16:12:21 +08:00 |
|
caoqianming
|
ab0bc60c23
|
feat: utask增加返回数据
|
2023-11-29 10:57:28 +08:00 |
|
caoqianming
|
d9dcaf0d18
|
feat: 增加查询条件
|
2023-11-29 10:29:02 +08:00 |
|
caoqianming
|
429c0b6d5b
|
feat: 增加route查询条件
|
2023-11-29 09:47:25 +08:00 |
|
caoqianming
|
3ca0a3b533
|
feat: equipment description字段可不填
|
2023-11-28 15:32:10 +08:00 |
|
caoqianming
|
c8beedbcee
|
feat: 订单非创建中不可删除
|
2023-11-28 14:57:19 +08:00 |
|
caoqianming
|
e24a16b692
|
fix: mlog设置必填项目
|
2023-11-28 00:23:48 +08:00 |
|
caoqianming
|
ccc87a5a5c
|
fix: mioitem select_related bug
|
2023-11-27 23:29:24 +08:00 |
|
caoqianming
|
9ba83cc1fe
|
feat: 交接记录增加查询条件
|
2023-11-27 23:19:35 +08:00 |
|
caoqianming
|
64ac57d217
|
feat: handover material必填
|
2023-11-27 23:15:19 +08:00 |
|
caoqianming
|
d6e241fc49
|
feat: base 部门查询增加contains
|
2023-11-27 22:55:32 +08:00 |
|
caoqianming
|
014b21ba2b
|
feat: mlog增加筛选条件
|
2023-11-27 22:45:13 +08:00 |
|
caoqianming
|
4e3f6686c2
|
feat: 增加mlog返回数据
|
2023-11-27 17:39:59 +08:00 |
|
caoqianming
|
697daadb8a
|
feat: 增加mlog返回数据
|
2023-11-27 17:33:51 +08:00 |
|
caoqianming
|
ee3841cd52
|
feat: 去除mlog重复校验
|
2023-11-27 17:25:11 +08:00 |
|
caoqianming
|
741032f4e8
|
feat: 增加日均计划数
|
2023-11-27 15:38:38 +08:00 |
|
caoqianming
|
98c3584710
|
feat: mgroup增加筛选条件
|
2023-11-27 15:14:54 +08:00 |
|
caoqianming
|
555700793f
|
feat: otherlog路由注册
|
2023-11-27 13:21:14 +08:00 |
|
caoqianming
|
ec5c246bdc
|
feat: 其他生产日志
|
2023-11-27 11:33:15 +08:00 |
|
caoqianming
|
54afd73c8d
|
feat: em增加返回数据
|
2023-11-27 10:22:23 +08:00 |
|
caoqianming
|
eef925dc62
|
feat: 生产任务增加查询条件
|
2023-11-24 11:17:47 +08:00 |
|
caoqianming
|
9b3a983c27
|
feat: 到岗记录增加查询条件
|
2023-11-23 16:28:06 +08:00 |
|
caoqianming
|
e78f864666
|
feat: stlogserializer增加校验
|
2023-11-22 16:33:41 +08:00 |
|
caoqianming
|
2030812c18
|
fix: 能管的工段异常修改
|
2023-11-22 16:07:00 +08:00 |
|
caoqianming
|
6f058dc757
|
feat: equipment增加精度等级字段
|
2023-11-22 09:55:46 +08:00 |
|
caoqianming
|
6263960a7c
|
feat: em增加einspect, equipment增加mgroup字段
|
2023-11-21 18:55:49 +08:00 |
|
caoqianming
|
784d1a79dc
|
feat: 出入库明细筛选条件
|
2023-11-21 16:53:17 +08:00 |
|
caoqianming
|
fe032c8e1d
|
feat: attendance增加筛选日期
|
2023-11-21 09:08:59 +08:00 |
|
caoqianming
|
92c9a51967
|
feat: Attendance中team和post设置为必填
|
2023-11-21 08:45:25 +08:00 |
|
caoqianming
|
dd2189900f
|
feat: sflog增加total_hour字段
|
2023-11-20 19:09:40 +08:00 |
|
caoqianming
|
a7204ec897
|
doc: 添加注释
|
2023-11-20 19:08:10 +08:00 |
|
caoqianming
|
c20c0e5ae7
|
fix: 先注释掉
|
2023-11-20 19:07:30 +08:00 |
|
caoqianming
|
b90ea74e4b
|
fix: 创建mtask时先不make_sflogs
|
2023-11-20 18:48:26 +08:00 |
|
caoqianming
|
6b81f2a394
|
feat: hrm中的attendance
|
2023-11-20 18:47:36 +08:00 |
|
caoqianming
|
fddadfe30c
|
feat: wpm中增加到岗记录
|
2023-11-20 16:26:14 +08:00 |
|
caoqianming
|
cbce572350
|
fix: teammemberserializer 错误
|
2023-11-20 13:36:14 +08:00 |
|
caoqianming
|
5e3d88b84a
|
feat: 增加teammember字段
|
2023-11-20 11:40:58 +08:00 |
|
caoqianming
|
058e9ce5c3
|
feat: attendance增加返回字段
|
2023-11-17 19:11:42 +08:00 |
|
caoqianming
|
d1f183237d
|
feat: Attendance批量创建时执行覆盖操作
|
2023-11-17 17:25:46 +08:00 |
|
caoqianming
|
31814f2495
|
feat: 增加到岗记录表
|
2023-11-17 17:03:04 +08:00 |
|
caoqianming
|
f334618701
|
feat: 增加clock_time
|
2023-11-17 15:36:57 +08:00 |
|
caoqianming
|
bc8b6d8a7b
|
fix: 回退最后一次更新
|
2023-11-17 15:34:57 +08:00 |
|
caoqianming
|
58d5b06858
|
feat: 可手动创建打卡记录
|
2023-11-17 14:55:03 +08:00 |
|
caoqianming
|
286571d302
|
feat: 出入库明细增加筛选条件
|
2023-11-17 14:05:13 +08:00 |
|
caoqianming
|
cd40d7f899
|
feat: mio增加mio_user
|
2023-11-17 08:29:09 +08:00 |
|
caoqianming
|
3caf59f33d
|
feat: 增加规格型号字段
|
2023-11-16 14:17:18 +08:00 |
|
caoqianming
|
74ae25faf6
|
fix: sql查询可指定默认参数
|
2023-11-16 09:42:08 +08:00 |
|
caoqianming
|
272f2db00a
|
fix: materialsimple 缺少返回数据
|
2023-11-14 14:19:26 +08:00 |
|
caoqianming
|
2ae8913b25
|
feat: 一些统计分析接口可用bi替代
|
2023-11-14 13:48:07 +08:00 |
|
caoqianming
|
a591abab8a
|
feat: mtask serializer增加mlogs
|
2023-11-14 13:47:49 +08:00 |
|
caoqianming
|
53ca8f1742
|
feat: bidataset增加字段
|
2023-11-14 10:23:44 +08:00 |
|
caoqianming
|
f8c67d8759
|
feat: rcertificate增加筛选条件
|
2023-11-10 09:02:28 +08:00 |
|
caoqianming
|
f747cc817b
|
fix: testitem支持tag查询
|
2023-11-03 19:13:36 +08:00 |
|
caoqianming
|
1c94c4c5af
|
feat: testitem增加标签字段
|
2023-11-03 19:03:14 +08:00 |
|
caoqianming
|
ff94b3f7f4
|
feat: ftestitemserializer bug
|
2023-11-03 18:49:38 +08:00 |
|
caoqianming
|
ae62cff401
|
fix: ftest权限控制写错标识
|
2023-11-03 18:47:01 +08:00 |
|
caoqianming
|
1b85a7f88a
|
fix: 可不用隐式物料
|
2023-11-03 18:33:12 +08:00 |
|
caoqianming
|
a39e87c8f3
|
fix: MIOItemACreateSerializer bug
|
2023-11-03 18:25:22 +08:00 |
|
caoqianming
|
5f9c810502
|
feat: 棒管检验明细
|
2023-11-03 18:15:32 +08:00 |
|
caoqianming
|
297adfa3cd
|
feat: 增加性能测试接口
|
2023-11-03 16:21:56 +08:00 |
|
caoqianming
|
39fbf6d0f3
|
feat: mioitem增加查询条件
|
2023-11-03 14:06:33 +08:00 |
|
caoqianming
|
d9ef7548e4
|
feat: 出入库明细检验
|
2023-11-03 14:01:03 +08:00 |
|
caoqianming
|
9315efe6f4
|
perf: 一些调整
|
2023-11-03 09:07:33 +08:00 |
|
caoqianming
|
07c0bd93f4
|
feat: base select_rel和prefetch_rel放于filter之后
|
2023-11-03 09:07:10 +08:00 |
|
caoqianming
|
7def29d173
|
feat: 增加首件检验
|
2023-11-02 18:50:26 +08:00 |
|
caoqianming
|
b2c201877f
|
fix: receive user 返回错误
|
2023-11-02 18:50:02 +08:00 |
|
caoqianming
|
fd13551150
|
fix: mlogb update 只更新存在的
|
2023-11-02 17:42:19 +08:00 |
|
caoqianming
|
9c30d43dd0
|
feat: 增加碎料数字段
|
2023-11-02 16:20:09 +08:00 |
|
caoqianming
|
3b3434fcf1
|
feat: mlog增加material_in字段
|
2023-11-02 16:13:10 +08:00 |
|
caoqianming
|
4460d4af61
|
fix: mlogserializer material_outs_ bug修复
|
2023-11-02 15:20:14 +08:00 |
|
caoqianming
|
2cd4a68e23
|
fix: mlogserializer material_outs_ bug修复
|
2023-11-02 14:38:59 +08:00 |
|
caoqianming
|
6accd25620
|
feat: 增加route表字段以支持产出绑定功能
|
2023-11-02 11:29:05 +08:00 |
|
caoqianming
|
03f80ed99d
|
fix: mlog create bug
|
2023-11-02 09:05:55 +08:00 |
|
caoqianming
|
b742fecf50
|
fix: datetime引用出错2
|
2023-11-02 08:44:07 +08:00 |
|
caoqianming
|
1ae6c3fde7
|
fix: datetime引用出错
|
2023-11-02 08:42:46 +08:00 |
|
caoqianming
|
e544c1112d
|
feat: wmaterial 创建联合主键
|
2023-11-01 18:15:52 +08:00 |
|
caoqianming
|
03ae93f7e9
|
feat: 车间库存形成交接记录以及交接记录的提交
|
2023-11-01 18:11:26 +08:00 |
|
caoqianming
|
9f3300c04c
|
fix: get_total_hour_now bug
|
2023-11-01 17:57:06 +08:00 |
|
caoqianming
|
f8b3868467
|
fix: mlog增加handle_users的返回
|
2023-11-01 14:41:08 +08:00 |
|
caoqianming
|
ae629846ab
|
feat: 增加配粉料数字段
|
2023-11-01 14:37:14 +08:00 |
|
caoqianming
|
5b0fcd31c2
|
feat: 增加mlog查询条件
|
2023-11-01 14:18:14 +08:00 |
|
caoqianming
|
73186929a6
|
fix: mlogserializer bug
|
2023-11-01 14:10:02 +08:00 |
|
caoqianming
|
8abc008ddf
|
feat: 单个mlog submit
|
2023-11-01 13:59:51 +08:00 |
|
caoqianming
|
1a640d9a70
|
feat: mlog增加submit_time/submit_user及相应逻辑
|
2023-11-01 13:28:07 +08:00 |
|
caoqianming
|
03d7fbece8
|
fix: mtm cate默认为空字符串
|
2023-11-01 10:55:29 +08:00 |
|
caoqianming
|
3750ea0f2a
|
fix: mlogserializer bug
|
2023-11-01 09:35:09 +08:00 |
|
caoqianming
|
d65b88157c
|
fix: mlogbserializer bug修改
|
2023-11-01 09:17:14 +08:00 |
|
caoqianming
|
6f825546ac
|
feat: 有mloga之后的对应mlog_confirm修改
|
2023-11-01 09:14:12 +08:00 |
|
caoqianming
|
732a33f1f2
|
feat: 增加mlogb表以记录多个产出
|
2023-11-01 08:42:10 +08:00 |
|
caoqianming
|
c2a33de7f7
|
feat: material增加brothers字段
|
2023-11-01 08:39:36 +08:00 |
|
caoqianming
|
bd16bef47a
|
feat: 直接下任务时需设置is_count_utask
|
2023-10-31 16:59:30 +08:00 |
|
caoqianming
|
b67cdde9d3
|
feat: mlog增加班次及序列化
|
2023-10-31 15:47:13 +08:00 |
|
caoqianming
|
9427544cca
|
feat: mlog添加字段
|
2023-10-31 15:06:10 +08:00 |
|
caoqianming
|
da43690836
|
feat:mlog 备注修改
|
2023-10-31 14:19:29 +08:00 |
|
caoqianming
|
cb1f6444d9
|
feat: mlogserializer增加material_out_
|
2023-10-31 14:03:58 +08:00 |
|
caoqianming
|
78db88f368
|
fix: mlog create取消批次号校验
|
2023-10-31 13:54:11 +08:00 |
|
caoqianming
|
d072a01bf8
|
fix: mlog create 不带mtask时报错2
|
2023-10-31 13:39:17 +08:00 |
|
caoqianming
|
27e4022d9a
|
fix: mlog create 不带mtask时报错
|
2023-10-31 13:33:40 +08:00 |
|
caoqianming
|
c376cfb24a
|
fix: 设备出厂编号可为空
|
2023-10-31 11:16:50 +08:00 |
|
caoqianming
|
ebb35740fd
|
feat: handover添加进路由
|
2023-10-31 11:01:44 +08:00 |
|
caoqianming
|
2d20825716
|
feat: 增加交接记录表及相应接口
|
2023-10-31 10:50:36 +08:00 |
|
caoqianming
|
cdfe023172
|
feat: 增加materialsimpleserializer
|
2023-10-31 10:50:15 +08:00 |
|
caoqianming
|
a8020f7fad
|
feat: 增加dept筛选条件
|
2023-10-31 10:39:47 +08:00 |
|
caoqianming
|
b3cbdeaa70
|
feat: 获取指定车间指定日期的代表工序生产任务
|
2023-10-30 17:47:48 +08:00 |
|
caoqianming
|
b8bc753418
|
feat: mlog增加部分字段以便单独创建日志
|
2023-10-30 16:47:10 +08:00 |
|
caoqianming
|
9e3e6bd1c6
|
feat: material添加大类字段及相应过滤条件
|
2023-10-30 16:46:23 +08:00 |
|
caoqianming
|
6c14e8c8fd
|
feat: 日志添加不合格原因数字段
|
2023-10-30 12:44:28 +08:00 |
|
caoqianming
|
0017d8b729
|
feat: base 增加docxtpl导出函数
|
2023-10-30 09:50:02 +08:00 |
|
caoqianming
|
388ddd96ba
|
feat: 修改导出的文件夹地址
|
2023-10-30 08:36:00 +08:00 |
|
caoqianming
|
35052699da
|
feat: miodetail
|
2023-10-27 16:19:11 +08:00 |
|
caoqianming
|
cbc43fdb65
|
feat: 增加is_count_utask字段以确认同步utask
|
2023-10-26 18:20:04 +08:00 |
|
caoqianming
|
5ba3b4e07a
|
feat: 增加utask查询条件
|
2023-10-26 16:40:34 +08:00 |
|
caoqianming
|
4cea056955
|
feat: utask mtask增加状态以及相关逻辑
|
2023-10-26 16:25:04 +08:00 |
|
caoqianming
|
6b53b68e0c
|
fix: mtaskserializer material_out_ 错误
|
2023-10-26 13:35:30 +08:00 |
|
caoqianming
|
c459960128
|
fix: mtask day 逻辑不严谨
|
2023-10-26 11:34:31 +08:00 |
|
caoqianming
|
ef971c6501
|
fix: schedue_mtasks 修改utask状态
|
2023-10-26 10:12:53 +08:00 |
|
caoqianming
|
5eb4eaaaec
|
feat: utask指定mgroup也可以直接分解
|
2023-10-26 10:01:53 +08:00 |
|
caoqianming
|
add92c8daa
|
feat: schedue_mtasks 校验一下
|
2023-10-26 09:56:46 +08:00 |
|
caoqianming
|
5c5c3510aa
|
feat: 增加utask的状态已分解
|
2023-10-26 09:41:26 +08:00 |
|
caoqianming
|
6ec3530862
|
feat: utask增加查询条件
|
2023-10-26 09:07:39 +08:00 |
|
caoqianming
|
4869a2cb8a
|
fix: typing 取消
|
2023-10-26 08:59:00 +08:00 |
|
caoqianming
|
0aea02ffc9
|
feat: 订单排产时增加belong_dept参数
|
2023-10-26 08:57:26 +08:00 |
|
caoqianming
|
b1339f6d6b
|
feat: utask增加belong_dept字段及相应逻辑
|
2023-10-26 08:48:10 +08:00 |
|
caoqianming
|
bc57f49e6a
|
feat: 增加utask mgroup和material_in 字段
|
2023-10-25 18:49:53 +08:00 |
|
caoqianming
|
6f7f9d29e9
|
feat: 取消一个不必要的校验
|
2023-10-25 18:30:00 +08:00 |
|
caoqianming
|
e106bc1109
|
feat: material增加need_route字段
|
2023-10-25 17:49:54 +08:00 |
|
caoqianming
|
31f515a966
|
feat: user增加belong_dept_name查询条件
|
2023-10-25 17:23:16 +08:00 |
|
caoqianming
|
d76b0ca0e4
|
feat: 增加校验
|
2023-10-25 17:02:41 +08:00 |
|
caoqianming
|
143f045f11
|
fix: 字段名错误
|
2023-10-25 17:02:26 +08:00 |
|
caoqianming
|
b872726885
|
feat: 出入库编号唯一
|
2023-10-25 16:51:12 +08:00 |
|
caoqianming
|
b3a23ce9be
|
fix: mio_saleout bug
|
2023-10-25 16:50:40 +08:00 |
|
caoqianming
|
3f544ada2f
|
feat: 增加material 反向查询条件
|
2023-10-25 16:04:44 +08:00 |
|
caoqianming
|
e9845a246e
|
fix: 组合件出入库bug
|
2023-10-25 15:51:25 +08:00 |
|
caoqianming
|
3e77468ea5
|
fix: update_mtask bug
|
2023-10-25 13:48:58 +08:00 |
|
caoqianming
|
5649decd77
|
fix: 提交任务时的bug
|
2023-10-25 13:46:55 +08:00 |
|
caoqianming
|
2a384ea654
|
fix: mioitem返回warehouse name错误
|
2023-10-25 13:43:05 +08:00 |
|
caoqianming
|
3cbc6e3fef
|
feat: 增加mlog查询条件
|
2023-10-25 10:42:29 +08:00 |
|
caoqianming
|
c88575a617
|
feat: 增加puorder filter
|
2023-10-25 08:42:51 +08:00 |
|
caoqianming
|
4894f134c5
|
feat: mio权限控制
|
2023-10-25 08:41:25 +08:00 |
|
caoqianming
|
1f4107407b
|
feat: 增加返回数据
|
2023-10-24 11:11:00 +08:00 |
|
caoqianming
|
bc2a16a9a4
|
feat: 增加组合件出入库
|
2023-10-24 10:26:13 +08:00 |
|
caoqianming
|
fd4ccae448
|
feat: 返回可用的批次号
|
2023-10-23 15:03:09 +08:00 |
|
caoqianming
|
53b38d7cc4
|
feat: 获取相关任务的第一道工序日志
|
2023-10-23 10:30:49 +08:00 |
|
caoqianming
|
2725a97213
|
feat: handle_user也作为约束条件
|
2023-10-23 09:02:57 +08:00 |
|
caoqianming
|
a1c74a0fa6
|
feat: 增加多个友好接口
|
2023-10-23 09:02:37 +08:00 |
|
caoqianming
|
a69fa79de8
|
feat: 获取指定车间指定日期的最后工序生产任务
|
2023-10-20 16:55:20 +08:00 |
|
caoqianming
|
0843cf6ce3
|
fix: mtasks_submit 时未填写日志校验
|
2023-10-20 15:36:14 +08:00 |
|
caoqianming
|
d8be8665eb
|
fix: 提交任务submit_related_same_day
|
2023-10-20 14:51:31 +08:00 |
|
caoqianming
|
c142f00bf3
|
feat: 增加handle_date及相应的校验
|
2023-10-20 14:50:56 +08:00 |
|
caoqianming
|
f9b3a69552
|
fix: update_mtask bug
|
2023-10-20 14:49:54 +08:00 |
|
caoqianming
|
47895ac109
|
fix: 修改订单状态显示
|
2023-10-20 09:25:15 +08:00 |
|
caoqianming
|
3fd0347837
|
feat: 增加utask过滤条件
|
2023-10-20 09:24:56 +08:00 |
|
caoqianming
|
3d407795a9
|
feat: 增加utask
|
2023-10-20 09:08:14 +08:00 |
|
caoqianming
|
53d2276998
|
fix: mlog confirm bug
|
2023-10-19 14:07:09 +08:00 |
|
caoqianming
|
21f53dd3ef
|
fix: 采购入库创建与提交
|
2023-10-19 14:06:27 +08:00 |
|
caoqianming
|
4a1996c4e9
|
fix: 生产日志提交时逻辑bug
|
2023-10-19 14:05:16 +08:00 |
|
caoqianming
|
80b2685417
|
fix: 采购入库逻辑的bug
|
2023-10-19 14:04:41 +08:00 |
|
caoqianming
|
0965e6c68e
|
fix: 任务创建只是用create
|
2023-10-19 14:03:49 +08:00 |
|
caoqianming
|
c3afc248ab
|
feat: 增加sam返回字段
|
2023-10-18 16:29:06 +08:00 |
|
caoqianming
|
93d0c43b05
|
feat: 优化mtask创建
|
2023-10-18 16:28:47 +08:00 |
|
caoqianming
|
e8a8c1d078
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:54 +08:00 |
|
caoqianming
|
8b7f6395d4
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:44 +08:00 |
|
caoqianming
|
8fd6f82bc2
|
feat: 增加字段和material查询条件
|
2023-10-18 16:27:34 +08:00 |
|
caoqianming
|
84db42e7c4
|
refector: 更新物料总量用update
|
2023-10-18 16:26:45 +08:00 |
|
caoqianming
|
5e34558c02
|
feat: route增加主要输入和输出以及自动排产逻辑修改
|
2023-10-16 16:50:46 +08:00 |
|
caoqianming
|
ad84876712
|
feat: order, pu_order 返回更多信息
|
2023-10-16 10:43:41 +08:00 |
|
caoqianming
|
f3b43ab0ce
|
fix: mgroup 增加need_enm字段
|
2023-10-13 13:13:31 +08:00 |
|
caoqianming
|
ff58685cbc
|
fix: 订单明细添加权限
|
2023-10-12 10:49:00 +08:00 |
|
caoqianming
|
177aeb4bed
|
fix: update order submit_time ignore
|
2023-10-12 10:08:12 +08:00 |
|
caoqianming
|
450381d7fb
|
fix: puorder puplan submit_time不可更改
|
2023-10-12 08:39:18 +08:00 |
|
caoqianming
|
af920a66f7
|
fix: add_from_planitems bug
|
2023-10-12 08:34:07 +08:00 |
|
caoqianming
|
3a224eafec
|
feat: 增加filter_custom必要时可复写
|
2023-10-11 16:38:33 +08:00 |
|
caoqianming
|
56ed286eaf
|
feat: mio和mioitem的权限控制
|
2023-10-11 16:27:44 +08:00 |
|
caoqianming
|
1cc632b35b
|
feat: 添加has_perm方法typing
|
2023-10-11 15:35:15 +08:00 |
|
caoqianming
|
e41710e438
|
feat: 添加has_perm方法
|
2023-10-11 15:30:38 +08:00 |
|
caoqianming
|
65c6dab239
|
feat: 优化mio list请求
|
2023-10-11 15:23:50 +08:00 |
|
caoqianming
|
ae43296ab5
|
fix: puorderitem create bug
|
2023-10-11 15:19:26 +08:00 |
|
caoqianming
|
9461d57159
|
feat: 出入库记录新增分多个接口
|
2023-10-11 15:16:58 +08:00 |
|
caoqianming
|
aff046db88
|
fix: add_from_planitems bug
|
2023-10-11 10:29:01 +08:00 |
|
caoqianming
|
c6f9b749c7
|
feat: mlog增加handle_user
|
2023-10-10 16:43:05 +08:00 |
|
caoqianming
|
604b4abe21
|
feat: 增加mtask查询条件
|
2023-10-10 15:54:09 +08:00 |
|
caoqianming
|
f5067e3163
|
fix: clear_bgl_r 跳出循环
|
2023-10-10 12:08:01 +08:00 |
|
caoqianming
|
5d405dbe8d
|
fix: clear_bgl_r
|
2023-10-10 12:05:21 +08:00 |
|
caoqianming
|
702fe8f87e
|
fix: clear_bgl_r
|
2023-10-10 12:04:55 +08:00 |
|
caoqianming
|
3a07c2b47c
|
feat: 直接使用大华的门禁权限接口吧
|
2023-10-10 09:34:47 +08:00 |
|
caoqianming
|
9c0423d0dc
|
feat: 批量清空办公室打卡门禁的相关方权限
|
2023-10-09 17:29:28 +08:00 |
|
caoqianming
|
29e94f8546
|
fix: 删除门禁权限的bug
|
2023-10-09 17:22:13 +08:00 |
|
caoqianming
|
7f1f3df956
|
feat: 煤粉热值系数修改
|
2023-10-09 16:52:16 +08:00 |
|
caoqianming
|
4ca344a86a
|
feat: doorauth增加查询条件
|
2023-10-09 15:34:35 +08:00 |
|
caoqianming
|
3b0710626a
|
feat: employeeshort增加type
|
2023-10-09 14:20:52 +08:00 |
|
caoqianming
|
6b6175803c
|
fix: door_auth bulk_create id bug
|
2023-10-09 12:36:42 +08:00 |
|
caoqianming
|
af105384fe
|
feat: init_doorauth
|
2023-10-09 11:24:14 +08:00 |
|
caoqianming
|
b479db9f89
|
feat: 查看门禁权限并支持删除
|
2023-10-09 11:09:31 +08:00 |
|
caoqianming
|
b4cc887f79
|
feat: mtask增加已提交状态并在提交后不允许日志变动
|
2023-10-08 16:38:55 +08:00 |
|
caoqianming
|
b7ba095de7
|
feat: 增加生产日志表及创建逻辑
|
2023-10-08 11:27:41 +08:00 |
|
caoqianming
|
8a3c6150a0
|
fix: get_routes bug
|
2023-10-08 10:00:45 +08:00 |
|
caoqianming
|
c785409e37
|
feat: viewset中默认perms_map为{'get': '*'}
|
2023-09-28 11:57:01 +08:00 |
|
caoqianming
|
2597617a94
|
refector: 优化了do_in报错
|
2023-09-28 10:18:44 +08:00 |
|
caoqianming
|
8f90df0f32
|
perf: 优化了数据库查询
|
2023-09-28 10:18:14 +08:00 |
|
caoqianming
|
9ebf15b04f
|
feat: 生产入库后变更车间物料
|
2023-09-28 09:22:37 +08:00 |
|
caoqianming
|
f13de6b2c5
|
refector: 生产领料接口同时支持生产入库
|
2023-09-27 17:02:00 +08:00 |
|
caoqianming
|
9504b527cb
|
feat: 增加车间库存并完成生产领料
|
2023-09-27 15:41:36 +08:00 |
|
caoqianming
|
8934186460
|
feat: 排产后更新订单状态
|
2023-09-27 12:46:19 +08:00 |
|
caoqianming
|
611aa28eee
|
style: 格式调整
|
2023-09-27 09:54:15 +08:00 |
|
caoqianming
|
7ba27142e8
|
feat: process加入django admin
|
2023-09-27 09:49:11 +08:00 |
|
caoqianming
|
7de606b496
|
fix: mtask级联下达任务
|
2023-09-27 09:43:10 +08:00 |
|
caoqianming
|
0f6a7289b8
|
feat: mtask 工序更改为关联mgroup
|
2023-09-27 09:38:30 +08:00 |
|
caoqianming
|
0ac87f5c09
|
feat: mgroup 关联process
|
2023-09-27 09:37:57 +08:00 |
|
caoqianming
|
515d0b5c17
|
feat: 出入库明细接口
|
2023-09-26 11:24:52 +08:00 |
|
caoqianming
|
10aab0226d
|
feat: 从多个订单明细自动排产
|
2023-09-26 11:00:31 +08:00 |
|
caoqianming
|
aa79df55b5
|
feat: material增加是否隐藏字段
|
2023-09-26 10:59:57 +08:00 |
|
caoqianming
|
de749d4ee3
|
feat: 订单明细关联生产任务
|
2023-09-26 10:58:35 +08:00 |
|
caoqianming
|
312bf47b7b
|
refector: 添加api说明
|
2023-09-22 18:06:54 +08:00 |
|
caoqianming
|
5af44ee0de
|
feat: 增加pm app
|
2023-09-22 16:53:52 +08:00 |
|
caoqianming
|
37d3c29ab2
|
feat: material增加字段
|
2023-09-22 16:01:31 +08:00 |
|
caoqianming
|
0cd2802b04
|
feat: 更新material的count
|
2023-09-21 16:27:22 +08:00 |
|
caoqianming
|
095eaabbb9
|
feat: 添加process和route表
|
2023-09-21 16:26:58 +08:00 |
|
caoqianming
|
c89d787690
|
feat: puplanitem添加查询条件
|
2023-09-21 16:23:31 +08:00 |
|
caoqianming
|
14832a64a7
|
feat: mio_saleout
|
2023-09-21 10:46:12 +08:00 |
|
caoqianming
|
d39aa87dd5
|
feat: 修改sam部分字段
|
2023-09-21 10:23:09 +08:00 |
|
caoqianming
|
a4a96ce59e
|
feat: mio_purin
|
2023-09-21 10:20:47 +08:00 |
|
caoqianming
|
c6af3f7f62
|
feat: 增加出入库记录
|
2023-09-21 10:20:19 +08:00 |
|
caoqianming
|
85ac0d077f
|
fix: swagger bug
|
2023-09-19 15:35:06 +08:00 |
|
caoqianming
|
16e4d85f5d
|
feat: 添加sam模块
|
2023-09-18 14:06:39 +08:00 |
|
caoqianming
|
58aab32859
|
feat: 添加pum模块
|
2023-09-18 13:45:56 +08:00 |
|
caoqianming
|
5317c2c715
|
feat: 寻找距离最近的face index
|
2023-09-17 01:08:37 +08:00 |
|
caoqianming
|
8c58d3990e
|
feat: event_push 超过48h未处理也不再推送
|
2023-09-16 23:38:53 +08:00 |
|
caoqianming
|
0c2589c151
|
fix: 解决face缓存时的bug
|
2023-09-16 23:27:07 +08:00 |
|
caoqianming
|
72372c3215
|
feat: face_data中字典形式存储json数据
|
2023-09-16 22:52:44 +08:00 |
|
caoqianming
|
973c48bd7d
|
fix: update_all_facedata bug
|
2023-09-16 22:45:55 +08:00 |
|
caoqianming
|
e32933faa9
|
fix:get_facedata_from_img_x bug
|
2023-09-16 22:26:09 +08:00 |
|
caoqianming
|
beea6f3f54
|
fix: 还是使用face_recongnition2
|
2023-09-16 17:55:24 +08:00 |
|
caoqianming
|
96d83e0b49
|
fix: 还是使用face_recongnition
|
2023-09-16 17:49:35 +08:00 |
|
caoqianming
|
4d80d58554
|
feat: 打卡增加备注字段
|
2023-09-15 10:51:22 +08:00 |
|
caoqianming
|
225dcfddd6
|
fix: em filter_tag
|
2023-09-15 10:26:22 +08:00 |
|
caoqianming
|
6a369883d6
|
fix: 检定记录校验bug
|
2023-09-15 10:12:12 +08:00 |
|
caoqianming
|
c9d8a1e22f
|
fix: 人脸识别时捕获错误
|
2023-09-13 17:34:33 +08:00 |
|
caoqianming
|
a763cc00e6
|
feat: 更改为facenet模型
|
2023-09-12 09:20:04 +08:00 |
|
caoqianming
|
2d59864f65
|
feat: 清除不需要的数据
|
2023-09-12 08:49:37 +08:00 |
|
caoqianming
|
6e06a9ea1d
|
fix: 去除启动时cache_areas_info
|
2023-09-12 08:08:40 +08:00 |
|
caoqianming
|
42760f1501
|
feat: 尝试优化人脸识别速度
|
2023-09-12 07:42:18 +08:00 |
|
caoqianming
|
4448eb2a68
|
fix: 默认使用vgg face
|
2023-09-11 18:02:06 +08:00 |
|
caoqianming
|
741269be87
|
fix: hrm face_data 字段
|
2023-09-11 17:48:37 +08:00 |
|
caoqianming
|
6c10cb647f
|
fix: hrm face_data 字段
|
2023-09-11 17:41:30 +08:00 |
|
caoqianming
|
8fd85bed02
|
fix: hrm face_data 字段
|
2023-09-11 17:31:52 +08:00 |
|
caoqianming
|
81d53ce6b1
|
fix: update_global_face_pd bug
|
2023-09-11 17:28:48 +08:00 |
|
caoqianming
|
300433547e
|
fix: update_global_face_pd bug
|
2023-09-11 17:25:58 +08:00 |
|
caoqianming
|
c8a0bd06af
|
fix: face_find bug
|
2023-09-11 17:24:38 +08:00 |
|
caoqianming
|
1416b83b4e
|
feat: 改用vggface
|
2023-09-11 17:21:43 +08:00 |
|
caoqianming
|
a9cfeeb48e
|
feat: vgg识别成功
|
2023-09-11 17:08:51 +08:00 |
|
caoqianming
|
51f55258d6
|
fix: 人脸识别先这样
|
2023-09-11 16:40:54 +08:00 |
|
caoqianming
|
bfdc5d66ca
|
fix: 代码bug
|
2023-09-11 15:54:54 +08:00 |
|
caoqianming
|
e27f6631a0
|
fix: 用类代替全局变量
|
2023-09-11 15:52:31 +08:00 |
|
caoqianming
|
e97879811f
|
fix: 需要修改全局变量
|
2023-09-11 15:45:31 +08:00 |
|
caoqianming
|
3cc0134c5d
|
fix: django value_list用错了
|
2023-09-11 15:30:04 +08:00 |
|
caoqianming
|
96ac80361e
|
feat: 人脸数据保存在数据库中
|
2023-09-11 15:21:45 +08:00 |
|
caoqianming
|
5dded4d235
|
fix: face_find_from_base64 bug
|
2023-09-11 14:13:17 +08:00 |
|
caoqianming
|
19239c6b42
|
fix: 临时文件默认temp
|
2023-09-11 10:52:09 +08:00 |
|
caoqianming
|
e71d5af84a
|
feat: 增加人脸识别相关功能
|
2023-09-11 10:42:34 +08:00 |
|
caoqianming
|
addf8e771a
|
feat: 添加EXCLUDE_FIELDS_DEPT方便使用
|
2023-09-08 15:16:54 +08:00 |
|
caoqianming
|
d52a47839d
|
feat: 添加库存模块
|
2023-09-08 15:16:22 +08:00 |
|
caoqianming
|
b0455d9e13
|
refector: 优化event_push
|
2023-09-07 12:17:07 +08:00 |
|
caoqianming
|
fd6b5b5db7
|
feat: 完善enm_alarm保存的enm_data信息
|
2023-09-07 10:28:17 +08:00 |
|
caoqianming
|
72d5ae143f
|
fix: event_push后续接着推送的bug
|
2023-09-07 08:48:33 +08:00 |
|
caoqianming
|
95380fa826
|
fix: enm_alarm bug
|
2023-09-06 22:40:42 +08:00 |
|
caoqianming
|
e3449b9b89
|
fix: event_push bug
|
2023-09-06 18:16:50 +08:00 |
|
caoqianming
|
e4ff355853
|
fix: 权限代号单词拼写错误
|
2023-09-06 14:57:25 +08:00 |
|
caoqianming
|
94f87c9a34
|
feat: em增加字段
|
2023-09-06 14:31:46 +08:00 |
|
caoqianming
|
8a96755c22
|
refector: 优化echeckrecordserializer
|
2023-09-06 13:21:12 +08:00 |
|
caoqianming
|
700dbe5f1f
|
feat: 增加校准/检定记录接口描述
|
2023-09-06 12:59:48 +08:00 |
|
caoqianming
|
014b861ae2
|
feat: 校准检定记录表及接口
|
2023-09-06 11:19:30 +08:00 |
|
caoqianming
|
aed110afe9
|
feat: 未处理的event可持续ws推送
|
2023-09-06 09:23:42 +08:00 |
|
caoqianming
|
5835e2f6a0
|
feat: enm_alarm任务函数
|
2023-09-06 08:43:31 +08:00 |
|
caoqianming
|
ec8d416e80
|
feat: notify_event增加wspush以及一些优化
|
2023-09-06 08:42:46 +08:00 |
|
caoqianming
|
1048fb8d5c
|
feat: event_push更新last_ws_pushtime
|
2023-09-06 08:41:12 +08:00 |
|
caoqianming
|
4e06efdc78
|
refector: hrm serializer去除未使用的导入
|
2023-09-06 08:38:59 +08:00 |
|
caoqianming
|
9458276ad1
|
feat: 短信功能的全局开关
|
2023-09-06 08:30:53 +08:00 |
|
caoqianming
|
d6a9a683f1
|
feat: equipment增加启用日期
|
2023-09-06 08:29:43 +08:00 |
|
caoqianming
|
9ad37f41fd
|
feat: 增加last_ws_pushtime, enm_data字段
|
2023-09-05 17:43:49 +08:00 |
|
caoqianming
|
28313b0c33
|
feat: 优化ws event ticket remind三种方法
|
2023-09-05 11:12:13 +08:00 |
|
caoqianming
|
77e92062fb
|
feat: event 支持批量删除
|
2023-09-04 16:59:21 +08:00 |
|
caoqianming
|
75533d41ed
|
feat: sflogexp增加stlog_返回字段
|
2023-09-04 15:50:14 +08:00 |
|
caoqianming
|
f719702432
|
fix: shutdown_or_startup 优化
|
2023-09-04 15:36:16 +08:00 |
|
caoqianming
|
1ed7c846a3
|
fix:cal_shut_hour 的时区问题
|
2023-09-04 14:41:38 +08:00 |
|
caoqianming
|
e59bed611b
|
fix: get_tag_val bug
|
2023-09-04 14:17:03 +08:00 |
|
caoqianming
|
e6127864e7
|
fix: 执行测点函数的bug
|
2023-09-04 14:10:21 +08:00 |
|
caoqianming
|
a0955c401f
|
feat: shutdown_or_startup 优化
|
2023-09-01 17:32:24 +08:00 |
|
caoqianming
|
4fa33a7252
|
fix: cal_shut_hour bug
|
2023-09-01 16:58:58 +08:00 |
|
caoqianming
|
e4c49918ae
|
fix: shutdown_or_startup bug
|
2023-09-01 16:48:03 +08:00 |
|
caoqianming
|
a7b53bce2e
|
feat: shutdown_or_startup bug
|
2023-09-01 15:48:19 +08:00 |
|
caoqianming
|
b8fadbda35
|
feat: 工单ws推送
|
2023-09-01 11:24:47 +08:00 |
|
caoqianming
|
46d127758a
|
fix: roomconsumer bug修改
|
2023-09-01 10:16:36 +08:00 |
|
caoqianming
|
df6fbf500e
|
feat: 增加async def ticket
|
2023-09-01 09:39:03 +08:00 |
|
caoqianming
|
efa6651748
|
feat: remind_push
|
2023-09-01 09:38:07 +08:00 |
|
caoqianming
|
83957c8e9c
|
feat: 增加事件等级等字段并进行相应处理
|
2023-09-01 09:37:38 +08:00 |
|
caoqianming
|
8e0724bbec
|
feat: 添加websocket模块
|
2023-09-01 09:12:18 +08:00 |
|
caoqianming
|
d5386ccd84
|
feat: 优化ws 认证
|
2023-09-01 09:11:43 +08:00 |
|
caoqianming
|
16490c5907
|
feat: 增加serverservice
|
2023-09-01 09:11:18 +08:00 |
|
caoqianming
|
35d001e4e5
|
feat: 任务派发测试
|
2023-09-01 09:08:49 +08:00 |
|
caoqianming
|
64c2d86cd7
|
feat: enstat2增加查询条件
|
2023-08-31 14:14:00 +08:00 |
|
caoqianming
|
c71557b82b
|
feat: 允许修改身份证号
|
2023-08-30 16:16:24 +08:00 |
|
caoqianming
|
ed936082c7
|
feat: mpoint增加func_on_change以完成开停机处理需求
|
2023-08-30 15:19:28 +08:00 |
|
caoqianming
|
8b0733f1fc
|
feat: mgroup增加is_runing字段
|
2023-08-30 15:18:20 +08:00 |
|
caoqianming
|
13d9d6a752
|
feat: 短信服务连接不上时raise exception
|
2023-08-29 10:48:47 +08:00 |
|
caoqianming
|
c9fc726139
|
fix: recal bug修复
|
2023-08-28 10:22:20 +08:00 |
|
caoqianming
|
5ff0cf43a8
|
fix: send_mail_task 未获取config
|
2023-08-28 09:50:17 +08:00 |
|
caoqianming
|
f5f0675f91
|
feat: 增加recal接口
|
2023-08-28 09:42:27 +08:00 |
|
caoqianming
|
c0dd70982a
|
feat: enm增加重跑某一段时间的任务
|
2023-08-28 09:18:32 +08:00 |
|
caoqianming
|
620351c8bf
|
feat: send_mail_task优化
|
2023-08-28 09:18:09 +08:00 |
|
caoqianming
|
f89f56f02d
|
feat: mpoint增加查询条件
|
2023-08-25 17:02:32 +08:00 |
|
caoqianming
|
7bfea08a7d
|
feat: mpointstat增加elec_consume_unit及相应逻辑
|
2023-08-25 17:01:22 +08:00 |
|
caoqianming
|
ad30803836
|
feat: sflogExp增加查询条件
|
2023-08-24 10:52:06 +08:00 |
|
caoqianming
|
6e1ab8a967
|
feat: enstat2 返回时保留2位小数
|
2023-08-24 10:28:07 +08:00 |
|
caoqianming
|
909499fc44
|
feat: 默认密码设置复杂
|
2023-08-24 10:11:11 +08:00 |
|
caoqianming
|
4f6838423b
|
feat: 密码登录复杂度校验可选择
|
2023-08-24 09:14:39 +08:00 |
|
caoqianming
|
c424254670
|
feat: 增加get_day_s方法
|
2023-08-23 13:50:43 +08:00 |
|
caoqianming
|
e907b152f3
|
feat: enstat2增加筛选条件
|
2023-08-23 12:58:26 +08:00 |
|
caoqianming
|
beb9624548
|
feat: price change 时计算加锁
|
2023-08-23 12:45:14 +08:00 |
|
caoqianming
|
4fdddec6d6
|
fix: 先去除加锁功能
|
2023-08-23 08:52:55 +08:00 |
|
caoqianming
|
18942d57c9
|
fix: cal_enstat2 bug
|
2023-08-23 08:48:37 +08:00 |
|
caoqianming
|
50714225e5
|
fix: cal_enstat2 bug
|
2023-08-23 08:45:09 +08:00 |
|
caoqianming
|
cd5cf00fad
|
fix: cal_enstat bug
|
2023-08-23 08:39:49 +08:00 |
|
caoqianming
|
4cd2c0f85b
|
feat: enstat2增加day_s统计及相应的tasks改动
|
2023-08-23 08:33:45 +08:00 |
|
caoqianming
|
11ced96400
|
feat: ecm filter 查询
|
2023-08-22 14:28:00 +08:00 |
|
caoqianming
|
315f832ff2
|
fix: 先调整回来再处理
|
2023-08-22 14:10:00 +08:00 |
|
caoqianming
|
74e81e1a7c
|
feat: ecm filter 查询
|
2023-08-22 14:06:31 +08:00 |