caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6584b867d3
								
							
						 | 
						
							
							
								
								feat: remployee 添加权限标识2
							
							
							
							
							
						 | 
						
							2024-10-17 11:27:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a368dcab24
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-17 10:59:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0b72e2dcc1
								
							
						 | 
						
							
							
								
								feat: remployee 添加权限标识
							
							
							
							
							
						 | 
						
							2024-10-17 10:59:28 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b4bb7b0f9f
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-17 10:37:36 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								84524a8b71
								
							
						 | 
						
							
							
								
								feat:添加cm接口声明
							
							
							
							
							
						 | 
						
							2024-10-17 10:37:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								007d5828b6
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-17 09:55:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4389195791
								
							
						 | 
						
							
							
								
								fix: base 岗位角色权限标识错误
							
							
							
							
							
						 | 
						
							2024-10-17 09:55:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0f7782aa7
								
							
						 | 
						
							
							
								
								feat: enm_kil 修改日月统计表
							
							
							
							
							
						 | 
						
							2024-10-16 16:50:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								38a9d7b4fb
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-15 14:36:51 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								6e4a817324
								
							
						 | 
						
							
							
								
								feat:tkx fix bug
							
							
							
							
							
						 | 
						
							2024-10-15 14:36:31 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								77224cdbd4
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-15 10:49:36 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b9a7cd6b66
								
							
						 | 
						
							
							
								
								fix:入库信息,生产领料、销售发发货打印导出初版测试
							
							
							
							
							
						 | 
						
							2024-10-15 10:49:28 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cb0a492bbc
								
							
						 | 
						
							
							
								
								feat: 修改tkx 日报表
							
							
							
							
							
						 | 
						
							2024-10-14 17:41:33 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4196873dd7
								
							
						 | 
						
							
							
								
								fix:打印模板更新
							
							
							
							
							
						 | 
						
							2024-10-14 09:58:56 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								246bba5f78
								
							
						 | 
						
							
							
								
								fix:打印模板更新
							
							
							
							
							
						 | 
						
							2024-10-14 09:58:34 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								1282d7a1c8
								
							
						 | 
						
							
							
								
								fix:光芯打印初始模板
							
							
							
							
							
						 | 
						
							2024-10-11 14:48:36 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								0735f5dbf7
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-11 10:47:03 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								eb0076444f
								
							
						 | 
						
							
							
								
								fix:coding#501
							
							
							
							
							
						 | 
						
							2024-10-11 10:46:59 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5911d1f13b
								
							
						 | 
						
							
							
								
								feat:修改 能源统计表
							
							
							
							
							
						 | 
						
							2024-10-09 17:08:45 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a831c17838
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
							
							
							feat:修改水平涡流选粉机 
							
						 | 
						
							2024-10-09 09:27:32 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ab6e9ac889
								
							
						 | 
						
							
							
								
								feat:修改水泥磨中水平涡流选粉机
							
							
							
							
							
						 | 
						
							2024-10-09 09:27:18 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								3fbd419ffd
								
							
						 | 
						
							
							
								
								fix:coding500
							
							
							
							
							
						 | 
						
							2024-10-08 14:30:59 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								5ad7678d04
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-10-08 13:52:54 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								12133a3b37
								
							
						 | 
						
							
							
								
								fix:coding497、499
							
							
							
							
							
						 | 
						
							2024-10-08 13:52:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								918d45503e
								
							
						 | 
						
							
							
								
								feat : 修改 报警界面
							
							
							
							
							
						 | 
						
							2024-09-30 17:19:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ef6ad95a0
								
							
						 | 
						
							
							
								
								feat: 计算中心界面
							
							
							
							
							
						 | 
						
							2024-09-30 12:47:00 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								1dc5710f84
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-26 18:13:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c1c1fd39b
								
							
						 | 
						
							
							
								
								fix: tkx bug
							
							
							
							
							
						 | 
						
							2024-09-26 18:12:56 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								e5b163dc59
								
							
						 | 
						
							
							
								
								fix:合格数统计柱状图修正,光芯mtask提交后刷新列表
							
							
							
							
							
						 | 
						
							2024-09-26 15:59:49 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								753063ba47
								
							
						 | 
						
							
							
								
								fix:coding#492
							
							
							
							
							
						 | 
						
							2024-09-25 16:52:03 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4b7664296f
								
							
						 | 
						
							
							
								
								fix:coding#495
							
							
							
							
							
						 | 
						
							2024-09-25 16:51:08 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								fd8e646c10
								
							
						 | 
						
							
							
								
								fix:日期显示更改
							
							
							
							
							
						 | 
						
							2024-09-25 16:04:13 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ba0bfc0ff3
								
							
						 | 
						
							
							
								
								fix:光芯合格数统计查询参数时间规范化
							
							
							
							
							
						 | 
						
							2024-09-25 14:22:20 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								14a079ae0b
								
							
						 | 
						
							
							
								
								fix:日志中实际生产数和领料数以及加工前不良的计算
							
							
							
							
							
						 | 
						
							2024-09-25 14:11:44 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								84581bc32c
								
							
						 | 
						
							
							
								
								fix:外观检验项崩边没有实时计算
							
							
							
							
							
						 | 
						
							2024-09-25 14:10:32 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								25ef072e04
								
							
						 | 
						
							
							
								
								feat:utask大任务手动提交
							
							
							
							
							
						 | 
						
							2024-09-25 14:09:34 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								8118bec402
								
							
						 | 
						
							
							
								
								fix:工段页面添加出入库记录
							
							
							
							
							
						 | 
						
							2024-09-24 16:46:14 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								64016cf2dc
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-24 16:40:27 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4337fb7d1f
								
							
						 | 
						
							
							
								
								fix:光芯车间出入库改正
							
							
							
							
							
						 | 
						
							2024-09-24 16:40:22 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f0aa7a2d2f
								
							
						 | 
						
							
							
								
								fix:enm 修改班组数据
							
							
							
							
							
						 | 
						
							2024-09-24 14:15:33 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								83426cb8cd
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-23 17:37:33 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f53b3ca29f
								
							
						 | 
						
							
							
								
								fix : 测点录入和班组对不上
							
							
							
							
							
						 | 
						
							2024-09-23 17:37:28 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								414fad1602
								
							
						 | 
						
							
							
								
								fix:工段库存领料入库操作抽屉展示
							
							
							
							
							
						 | 
						
							2024-09-23 11:15:55 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								0fc3670bce
								
							
						 | 
						
							
							
								
								fix:任务进度legend颜色异常问题
							
							
							
							
							
						 | 
						
							2024-09-19 17:27:36 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								c92cbbdcec
								
							
						 | 
						
							
							
								
								fix:成品检验切换类型时,清空原有数据
							
							
							
							
							
						 | 
						
							2024-09-19 16:48:20 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ab9b9bc18f
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-19 15:46:48 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ffcbe833cf
								
							
						 | 
						
							
							
								
								fix:交接记录显示问题&检验时物料批次的排序
							
							
							
							
							
						 | 
						
							2024-09-19 15:46:44 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								b5190de25b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-19 15:44:04 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c3992b448
								
							
						 | 
						
							
							
								
								feat: 新增得分功能
							
							
							
							
							
						 | 
						
							2024-09-19 15:43:46 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								45497e82a1
								
							
						 | 
						
							
							
								
								fix:gx成品检验编辑时不合格原因复显问题
							
							
							
							
							
						 | 
						
							2024-09-19 15:07:54 +08:00 |