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 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								86b3e4e2f3
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-19 14:55:13 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								97e59c2c40
								
							
						 | 
						
							
							
								
								fix:库存统计的查询条件
							
							
							
							
							
						 | 
						
							2024-09-19 14:55:09 +08:00 | 
						
					
				
					
						
							
							
								
								 Li xia
							
						 | 
						
							
							
							
							
							
								
							
							
								89018c5e59
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-19 09:34:56 +08:00 | 
						
					
				
					
						
							
							
								
								 Li xia
							
						 | 
						
							
							
							
							
							
								
							
							
								f91ed595f2
								
							
						 | 
						
							
							
								
								fix:"摄像头"
							
							
							
							
							
						 | 
						
							2024-09-19 09:34:46 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								17c50f7b27
								
							
						 | 
						
							
							
								
								fix:车间物料检验时数量显示为count_cando
							
							
							
							
							
						 | 
						
							2024-09-18 14:50:28 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								747c22fc02
								
							
						 | 
						
							
							
								
								fix:调整库存管理目录
							
							
							
							
							
						 | 
						
							2024-09-18 13:40:33 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								5487e1f74d
								
							
						 | 
						
							
							
								
								fix:任务统计页面的请求报错
							
							
							
							
							
						 | 
						
							2024-09-18 13:31:33 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								12abe192ad
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-13 15:43:20 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4b9b768647
								
							
						 | 
						
							
							
								
								fix:coding#481统计中心优化
							
							
							
							
							
						 | 
						
							2024-09-13 15:43:16 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								659226e6ad
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-12 15:59:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ba5c1b2129
								
							
						 | 
						
							
							
								
								fix  bug
							
							
							
							
							
						 | 
						
							2024-09-12 15:58:20 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								58bf615de3
								
							
						 | 
						
							
							
								
								fix:交接物料/按钮显示问题
							
							
							
							
							
						 | 
						
							2024-09-12 15:28:29 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								a0013e00cc
								
							
						 | 
						
							
							
								
								fix:coding#481:合格数统计
							
							
							
							
							
						 | 
						
							2024-09-12 11:25:58 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								ff9f751fef
								
							
						 | 
						
							
							
								
								fix:coding#481:合格数统计
							
							
							
							
							
						 | 
						
							2024-09-12 11:23:14 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								7316da4504
								
							
						 | 
						
							
							
								
								fix:coding#4811.2任务进度
							
							
							
							
							
						 | 
						
							2024-09-12 10:44:54 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								714e18e168
								
							
						 | 
						
							
							
								
								fix:检验部交接物料查询
							
							
							
							
							
						 | 
						
							2024-09-12 10:43:46 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4382057684
								
							
						 | 
						
							
							
								
								fix:统计分析—任务进度
							
							
							
							
							
						 | 
						
							2024-09-12 10:03:05 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								1cb2c30d3e
								
							
						 | 
						
							
							
								
								fix:合格数统计每个模块添加工段名称
							
							
							
							
							
						 | 
						
							2024-09-11 16:56:19 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								8a1cf4a25b
								
							
						 | 
						
							
							
								
								fix:成品检验中交接记录的筛选
							
							
							
							
							
						 | 
						
							2024-09-11 16:47:01 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								2d5bbca578
								
							
						 | 
						
							
							
								
								fix:成品检验添加班次
							
							
							
							
							
						 | 
						
							2024-09-11 15:46:40 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								744f78b621
								
							
						 | 
						
							
							
								
								fix:工段交接记录和库存修正
							
							
							
							
							
						 | 
						
							2024-09-11 15:28:35 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								98b54e50d5
								
							
						 | 
						
							
							
								
								fix:黑化车间展示数据修正
							
							
							
							
							
						 | 
						
							2024-09-11 15:27:06 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								6764381bad
								
							
						 | 
						
							
							
								
								fix:接收部门placeholder提示文案修正
							
							
							
							
							
						 | 
						
							2024-09-10 17:30:55 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								654a7a3e86
								
							
						 | 
						
							
							
								
								fix:黑化车间看板调整
							
							
							
							
							
						 | 
						
							2024-09-10 17:30:00 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								9a41a29f49
								
							
						 | 
						
							
							
								
								fix:coding#493保温时间和冷却时间可编辑
							
							
							
							
							
						 | 
						
							2024-09-10 16:59:39 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								7f3c2f00f6
								
							
						 | 
						
							
							
								
								fix:其他出入库加编辑
							
							
							
							
							
						 | 
						
							2024-09-10 15:50:44 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d6c27697c4
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-10 15:06:37 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								54678f9ffc
								
							
						 | 
						
							
							
								
								fix:添加wpm接口声明(车间看板用到)
							
							
							
							
							
						 | 
						
							2024-09-10 15:06:33 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								70b7427044
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
							
							
							
							
							
						 | 
						
							2024-09-09 10:51:46 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9eb6ffeff5
								
							
						 | 
						
							
							
								
								fix tkx
							
							
							
							
							
						 | 
						
							2024-09-09 10:51:19 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								709bd6d11b
								
							
						 | 
						
							
							
								
								fix:水泥院动态图标改动
							
							
							
							
							
						 | 
						
							2024-09-09 08:47:07 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								1510aee343
								
							
						 | 
						
							
							
								
								fix:交接页面添加打印机名称修改
							
							
							
							
							
						 | 
						
							2024-09-06 12:46:24 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								408f83436c
								
							
						 | 
						
							
							
								
								fix:车间库存报废,在库存管理里查看
							
							
							
							
							
						 | 
						
							2024-09-06 11:00:53 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								2eca64bf93
								
							
						 | 
						
							
							
								
								fix:日志添加时,设备显示设别编号
							
							
							
							
							
						 | 
						
							2024-09-05 19:27:50 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d17f336a89
								
							
						 | 
						
							
							
								
								fix:批量交接,并可查询
							
							
							
							
							
						 | 
						
							2024-09-05 19:26:26 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								9d7dca9096
								
							
						 | 
						
							
							
								
								fix:mlog二级可编辑,并且展示batch
							
							
							
							
							
						 | 
						
							2024-09-05 19:25:48 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								4ae990fbdb
								
							
						 | 
						
							
							
								
								fix:各类设备表单字段补全
							
							
							
							
							
						 | 
						
							2024-09-05 19:24:43 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								8eaf952916
								
							
						 | 
						
							
							
								
								fix:fmlog工艺路线显示routepack_name
							
							
							
							
							
						 | 
						
							2024-09-05 17:17:13 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								997a1e71ef
								
							
						 | 
						
							
							
								
								fix:退火审批问题修改
							
							
							
							
							
						 | 
						
							2024-09-05 17:02:28 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								5cd34dd627
								
							
						 | 
						
							
							
								
								fix:mlog提交状态
							
							
							
							
							
						 | 
						
							2024-09-05 14:53:08 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								a57b58c29c
								
							
						 | 
						
							
							
								
								fix:外协添加单位编号
							
							
							
							
							
						 | 
						
							2024-09-05 14:51:25 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								eac434c0ea
								
							
						 | 
						
							
							
								
								fix:
							
							
							
							
							
						 | 
						
							2024-09-05 14:40:49 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								04fd2c4899
								
							
						 | 
						
							
							
								
								fix:生产设备以mgroup筛选,添加设备工作进度条
							
							
							
							
							
						 | 
						
							2024-09-05 14:04:58 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								baaa9f9e2e
								
							
						 | 
						
							
							
								
								fix:分配
							
							
							
							
							
						 | 
						
							2024-09-05 13:45:22 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								f93cfa8000
								
							
						 | 
						
							
							
								
								fix:黑化日志添加检验附件excel
							
							
							
							
							
						 | 
						
							2024-09-05 12:12:58 +08:00 |