 zty
|
341a681d00
|
fix: get_sflog 提前起始时间
|
2024-08-06 09:54:34 +08:00 |
|
zty
|
f1a76cba74
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 09:45:10 +08:00 |
|
zty
|
73176847e0
|
feat: make_sflogs_simple 扩大范围
|
2024-08-06 09:44:24 +08:00 |
 caoqianming
|
42c1386efd
|
feat: sflogexp增加返回信息
|
2024-08-06 08:29:21 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
aa42ba6e3f
|
feat: submit时校验消耗和产出是否已经填写
|
2024-08-01 18:12:30 +08:00 |
|
caoqianming
|
071558af8d
|
feat: mlogbin 校验记录已存在
|
2024-08-01 17:32:48 +08:00 |
|
caoqianming
|
cbedb81b0e
|
fix: mlogbin 不合格物料校验去除
|
2024-08-01 16:54:09 +08:00 |
|
caoqianming
|
cbe516ccf5
|
fix: handover submit时更新bug
|
2024-08-01 15:25:16 +08:00 |
|
caoqianming
|
6efcf19716
|
fix: mlog_revert bug
|
2024-08-01 15:15:00 +08:00 |
|
caoqianming
|
f3f0ea132c
|
fix: find_material_can_change 只可返工到半成品
|
2024-08-01 10:30:55 +08:00 |
|
caoqianming
|
9ff4f21f9a
|
fix: mlogbin create时生成编号变更3
|
2024-08-01 09:59:39 +08:00 |
|
caoqianming
|
99ab4e1957
|
feat: mlogbin create时生成编号变更2
|
2024-08-01 09:20:15 +08:00 |
|
caoqianming
|
0813a3b568
|
feat: mlogbin create时生成编号变更
|
2024-07-31 16:33:32 +08:00 |
|
caoqianming
|
821d7613d1
|
fix: get_sflog 增加 sflog创建范围
|
2024-07-31 15:55:34 +08:00 |
|
caoqianming
|
bea83f93d5
|
fix: 批次号追加设备编号
|
2024-07-31 14:30:53 +08:00 |
|
caoqianming
|
9ad0cf6498
|
feat: 批次号追加number
|
2024-07-31 14:27:15 +08:00 |
|
zty
|
181a4e3a5f
|
fix: HandoverSerializer recive_mgroup 校验bug
|
2024-07-30 15:11:23 +08:00 |
|
zty
|
ebf6f739ca
|
feat: 出入库添加工段逻辑
|
2024-07-30 13:24:21 +08:00 |
|
caoqianming
|
6759ea76bf
|
feat: material增加into_wm字段控制与车间库存交互
|
2024-07-25 13:27:44 +08:00 |
|
caoqianming
|
71dbd6c572
|
feat: handover 添加返回信息
|
2024-07-25 11:31:39 +08:00 |
|
caoqianming
|
391d9b137d
|
feat: handover filter增加筛选条件
|
2024-07-25 08:34:50 +08:00 |
|
caoqianming
|
47f4222f03
|
fix: mlog submit wm belong_dept 缺失
|
2024-07-24 16:43:30 +08:00 |
|
caoqianming
|
c068c47bc7
|
feat: 增加外协生产日志功能
|
2024-07-23 10:11:31 +08:00 |
|
caoqianming
|
0ab6e0bc72
|
feat: 增加不合格项接口
|
2024-07-22 17:58:21 +08:00 |
|
caoqianming
|
ec0df66542
|
feat: 完成返工交接2
|
2024-07-22 15:32:23 +08:00 |
|
caoqianming
|
9c67675ca7
|
feat: 完成返工交接
|
2024-07-22 15:26:45 +08:00 |
|
caoqianming
|
19cac7729a
|
feat: handoverserializer type设置为非必填
|
2024-07-19 10:24:13 +08:00 |
|
caoqianming
|
92fc1e9e0a
|
feat: 添加返修交接支持
|
2024-07-19 10:04:02 +08:00 |
|
caoqianming
|
a3e51a84db
|
refector: HandoverSerializer validate 优化
|
2024-07-18 16:32:31 +08:00 |
|
caoqianming
|
30be6dc291
|
fix: mlogchange 改 mlogupdate
|
2024-07-18 15:58:53 +08:00 |
|
caoqianming
|
6fd2f2a009
|
fix: MyThread 调用错误
|
2024-07-18 15:36:23 +08:00 |
|
caoqianming
|
950b017073
|
feat: mlog_submit 时校验handle_date
|
2024-07-18 14:48:55 +08:00 |
|
caoqianming
|
9b3cbe75ae
|
feat: submit时校验mlogbout
|
2024-07-18 14:48:36 +08:00 |
|
caoqianming
|
6778af3f07
|
fix: 增加mlogb.update权限标识
|
2024-07-18 14:31:34 +08:00 |
|
caoqianming
|
8d75f3f251
|
feat: 增加mlogb.update权限标识
|
2024-07-18 14:26:39 +08:00 |
|
caoqianming
|
6a51fd1177
|
feat: 添加筛选条件和mlogbin 校验
|
2024-07-18 13:46:16 +08:00 |
|
caoqianming
|
d561a0d24b
|
feat: 日志提交时不合格品存储到车间库存
|
2024-07-18 11:30:10 +08:00 |
|
caoqianming
|
ee65658145
|
fix: MlogbInSerializer bug
|
2024-07-17 17:08:42 +08:00 |
|
caoqianming
|
c058fe9338
|
feat: 支持不合格品处理/添加不合格品存储字段
|
2024-07-17 16:58:28 +08:00 |
|
caoqianming
|
ab413eed81
|
feat: 停机记录在小于60s可删除
|
2024-07-16 10:58:33 +08:00 |
|
caoqianming
|
061a291889
|
feat: 增加handover和mio的查询条件
|
2024-07-15 17:57:39 +08:00 |
|
caoqianming
|
79900462ff
|
feat: 交接记录receive_dept非必填
|
2024-07-15 17:05:13 +08:00 |
|
caoqianming
|
07680704ec
|
feat: cal_mtask_progress_from_mlog
|
2024-07-15 16:57:09 +08:00 |
|
caoqianming
|
af80e3ce5b
|
fix: mlogb type filter bug
|
2024-07-12 10:50:41 +08:00 |
|
caoqianming
|
4934327808
|
feat: mlogbout url register
|
2024-07-11 17:44:18 +08:00 |
|
caoqianming
|
d38e91667e
|
fix: mlogb init serializer bug
|
2024-07-11 17:04:01 +08:00 |
|
caoqianming
|
b33c86fd6e
|
feat: mlogb in update 接口
|
2024-07-11 15:58:08 +08:00 |
|
caoqianming
|
ac1b4b6c3e
|
feat: mlogb增加筛选条件
|
2024-07-11 15:57:49 +08:00 |
|
caoqianming
|
debc268c88
|
feat: mlog增加不合格项目字段=
|
2024-07-11 15:57:18 +08:00 |
|
caoqianming
|
deeda736b9
|
feat: mlog增加不合格项目字段
|
2024-07-11 15:55:44 +08:00 |
|
caoqianming
|
4177ba93f8
|
feat: wmaterial增加mgroupx 查询条件
|
2024-07-11 13:13:39 +08:00 |
|
caoqianming
|
5ad15c0a9e
|
feat: MlogbIn create时同步创建out
|
2024-07-11 13:06:48 +08:00 |
|
caoqianming
|
2d522a1fd4
|
feat: route增加batch_bind字段/mlogbin接口
|
2024-07-11 11:26:18 +08:00 |
|
caoqianming
|
2e60cb7eaf
|
feat: mlog change接口
|
2024-07-11 08:44:40 +08:00 |
|
caoqianming
|
2f5edc041c
|
feat: mlog init
|
2024-07-10 15:32:33 +08:00 |
|
caoqianming
|
6754b668bc
|
fix: handover serializer validate bug
|
2024-07-09 14:03:44 +08:00 |
|
caoqianming
|
24b2a98440
|
refecor: 一些处理
|
2024-07-05 08:49:36 +08:00 |
|
caoqianming
|
a0dae66cf7
|
feat: 根据光芯需求对wpm做兼容性处理2
|
2024-07-03 13:19:21 +08:00 |
|
caoqianming
|
59b8634d3e
|
fix: handover serializer bug2
|
2024-07-02 23:25:14 +08:00 |
|
caoqianming
|
67ca07bb35
|
fix: handover serializer bug
|
2024-07-02 23:04:16 +08:00 |
|
caoqianming
|
427bf31d50
|
fix: mlogb 取material bug
|
2024-07-02 12:09:08 +08:00 |
|
caoqianming
|
a6a3dcf33c
|
fix: handover validate bug
|
2024-07-01 16:21:52 +08:00 |
|
caoqianming
|
d579a7358d
|
feat: 根据光芯需求对wpm做兼容性处理
|
2024-07-01 10:07:57 +08:00 |
|
caoqianming
|
3c52125440
|
feat: wm,handover,mlog增加检索条件
|
2024-06-28 15:29:39 +08:00 |
|
caoqianming
|
5efd9888dd
|
feat: 交接记录提交只要是同部门的就可以2
|
2024-06-21 13:27:47 +08:00 |
|
caoqianming
|
966821fad6
|
feat: 交接记录提交只要是同部门的就可以
|
2024-06-21 10:40:07 +08:00 |
|
caoqianming
|
8548004690
|
fix: 用于混料的原料不与车间库存交互
|
2024-06-04 09:11:06 +08:00 |
|
caoqianming
|
bf5df19a59
|
feat: mlog添加两个不合格项目
|
2024-05-22 14:53:46 +08:00 |
|
caoqianming
|
7819aa5b5e
|
feat: stlog的sflog的cascad改一下
|
2024-05-21 18:18:13 +08:00 |
|
caoqianming
|
617013f299
|
fix: sflog展示run_hour
|
2024-05-17 09:16:45 +08:00 |
|
caoqianming
|
32c1647b9b
|
feat: sflog展示run_hour
|
2024-05-17 09:13:10 +08:00 |
|
caoqianming
|
bd33a33ed6
|
fix: get_pcoal_heat 逻辑严谨
|
2024-05-16 17:18:17 +08:00 |
|
caoqianming
|
a90396099b
|
fix: 更新煤粉热值触发计算的bug3
|
2024-05-16 16:57:00 +08:00 |
|
caoqianming
|
9a1074caf8
|
fix: 更新煤粉热值触发计算的bug
|
2024-05-16 16:48:42 +08:00 |
|
caoqianming
|
5093eb7b29
|
feat: 更新煤粉热值触发计算的bug
|
2024-05-16 16:26:33 +08:00 |
|
caoqianming
|
e1172c2fcf
|
feat: SfLogExp添加约束及cal_exp_duration_sec优化
|
2024-05-15 12:59:12 +08:00 |
|
caoqianming
|
3d6adedb8c
|
feat: hour计数改为sec计数 步骤3移除字段
|
2024-05-15 10:40:46 +08:00 |
|
caoqianming
|
b4b3d6eadc
|
feat: hour计数改为sec计数 步骤2
|
2024-05-15 10:31:17 +08:00 |
|
caoqianming
|
8753994468
|
fix: hour计数改为sec计数 make_sflogs 的bug
|
2024-05-15 10:14:57 +08:00 |
|
caoqianming
|
a3f5e48b8c
|
feat: hour计数改为sec计数
|
2024-05-15 10:06:49 +08:00 |
|
caoqianming
|
3fc8e17266
|
feat: stlog添加约束
|
2024-05-13 23:06:47 +08:00 |
|
caoqianming
|
2e67f7c468
|
fix: cal_exp_duration_hour 默认一个参数值
|
2024-05-08 16:32:00 +08:00 |
|
caoqianming
|
b22058d0bb
|
feat: cal_exp_duration_hour 添加参数以做测试
|
2024-05-08 16:07:03 +08:00 |
|
caoqianming
|
035b9b392a
|
fix: get_pcoal_heat 时以work_date为准
|
2024-05-08 16:06:08 +08:00 |
|
caoqianming
|
ce38c3e338
|
fix: get_total_hour_now exclude 错误
|
2024-05-07 10:16:22 +08:00 |
|
caoqianming
|
6ee42a6993
|
fix: get_total_hour_now默认参数为空
|
2024-05-07 10:00:24 +08:00 |
|
caoqianming
|
634884f336
|
doc: 增加注释
|
2024-05-02 00:02:41 +08:00 |
|
caoqianming
|
6ea5e0b5d7
|
fix: make_sflogs当天班生成缺少的bug
|
2024-05-02 00:01:47 +08:00 |
|
caoqianming
|
2263c0decb
|
fix: 如果结束时间为0点则取开始时间来返回年月日2
|
2024-04-30 19:00:19 +08:00 |
|
caoqianming
|
a6914413f7
|
fix: 如果结束时间为0点则取开始时间来返回年月日
|
2024-04-30 18:20:31 +08:00 |
|
caoqianming
|
dddab37c63
|
fix: get_sflog 取的时候与happen_time对比错误
|
2024-04-30 12:59:38 +08:00 |
|
caoqianming
|
df5a6d5d96
|
feat: 生成值班记录只对工段
|
2024-04-28 17:50:44 +08:00 |
|
caoqianming
|
ece11699f8
|
feat: sflogexp返回更多信息
|
2024-04-28 13:32:53 +08:00 |
|
caoqianming
|
acad9c6acf
|
fix: stlog create时validate3
|
2024-04-28 13:10:01 +08:00 |
|
caoqianming
|
8375345e56
|
fix: stlog create时validate2
|
2024-04-28 11:30:05 +08:00 |
|
caoqianming
|
05f675f610
|
fix: stlog create时validate
|
2024-04-28 11:26:55 +08:00 |
|
caoqianming
|
6f98d9dfb3
|
fix: stlog validate total_secondsbug
|
2024-04-28 10:04:30 +08:00 |
|
caoqianming
|
d01bb012b9
|
fix: 异常值班处理的权限
|
2024-04-28 09:35:16 +08:00 |
|
caoqianming
|
1139bb6119
|
feat: 优化make_sflog/get_sflog
|
2024-04-11 10:56:32 +08:00 |