caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a42cf34f0
								
							
						 | 
						
							
							
								
								feat: wmaterial增加count_xtest/handover增加检验交接
							
							
							
							
							
						 | 
						
							2024-08-09 15:09:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								314b614c53
								
							
						 | 
						
							
							
								
								fix: cal_exp_duration_sec 还需要更新时间为None3
							
							
							
							
							
						 | 
						
							2024-08-06 19:00:38 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								1fe8c7ae76
								
							
						 | 
						
							
							
								
								feat: cal_exp_duration_sec 还需要更新时间为None2
							
							
							
							
							
						 | 
						
							2024-08-06 18:43:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5461fb5f55
								
							
						 | 
						
							
							
								
								feat: cal_exp_duration_sec 还需要更新时间为None的
							
							
							
							
							
						 | 
						
							2024-08-06 18:40:34 +08:00 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5078a516d2
								
							
						 | 
						
							
							
								
								feat: mlog增加退火后碎字段
							
							
							
							
							
						 | 
						
							2024-04-02 15:44:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								779488589a
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug3
							
							
							
							
							
						 | 
						
							2024-03-06 22:24:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2addfc8433
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug2
							
							
							
							
							
						 | 
						
							2024-03-06 21:52:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ddb050330
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug
							
							
							
							
							
						 | 
						
							2024-03-06 21:45:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b429ad9059
								
							
						 | 
						
							
							
								
								fix: 废弃一些接口
							
							
							
							
							
						 | 
						
							2024-03-06 18:01:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8a32690395
								
							
						 | 
						
							
							
								
								feat: handoverserializer返回更多数据
							
							
							
							
							
						 | 
						
							2024-03-06 17:44:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								abdee3d2d5
								
							
						 | 
						
							
							
								
								feat: 增加wmaterial查询条件
							
							
							
							
							
						 | 
						
							2024-03-06 17:21:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4c3610ac25
								
							
						 | 
						
							
							
								
								feat: 混料支持车间库存
							
							
							
							
							
						 | 
						
							2024-03-06 17:07:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f6db92f815
								
							
						 | 
						
							
							
								
								feat: 增加wmaterial查询条件
							
							
							
							
							
						 | 
						
							2024-03-06 15:50:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0de0489272
								
							
						 | 
						
							
							
								
								feat: 增加箱中破不合格字段
							
							
							
							
							
						 | 
						
							2024-03-05 10:11:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5c0c016872
								
							
						 | 
						
							
							
								
								fix: correct_tuihuo_log矫正退火日志2
							
							
							
							
							
						 | 
						
							2024-03-04 15:50:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d5ef86f1
								
							
						 | 
						
							
							
								
								fix: correct_tuihuo_log矫正退火日志
							
							
							
							
							
						 | 
						
							2024-03-04 14:58:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e99854b56f
								
							
						 | 
						
							
							
								
								fix: mlog填写时进行更进一步校验
							
							
							
							
							
						 | 
						
							2024-03-04 13:54:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eef99ed624
								
							
						 | 
						
							
							
								
								feat: 出入库操作支持提交后可撤销功能
							
							
							
							
							
						 | 
						
							2024-02-29 17:10:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d483bb6b61
								
							
						 | 
						
							
							
								
								fix: mlog update时mlogb不更新
							
							
							
							
							
						 | 
						
							2024-01-28 00:18:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d0b13ac215
								
							
						 | 
						
							
							
								
								feat: do_in时增加更完整的提示信息
							
							
							
							
							
						 | 
						
							2024-01-25 09:49:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6f8c7c0567
								
							
						 | 
						
							
							
								
								feat: mlog validate时计算count_notok
							
							
							
							
							
						 | 
						
							2024-01-20 23:30:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								78fd0c9721
								
							
						 | 
						
							
							
								
								feat: 日志撤回后修改任务状态
							
							
							
							
							
						 | 
						
							2024-01-18 10:55:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a4d23f534a
								
							
						 | 
						
							
							
								
								fix: mlog validate bug
							
							
							
							
							
						 | 
						
							2024-01-18 10:27:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a6aabd860
								
							
						 | 
						
							
							
								
								fix: do_in new_count为0时wm.delete
							
							
							
							
							
						 | 
						
							2024-01-12 16:45:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7ca12228e2
								
							
						 | 
						
							
							
								
								feat: 库存减到0时删除该记录
							
							
							
							
							
						 | 
						
							2024-01-11 17:56:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								89215d4752
								
							
						 | 
						
							
							
								
								feat: 任务停止后日志不可再提交
							
							
							
							
							
						 | 
						
							2024-01-04 09:11:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6165af7c47
								
							
						 | 
						
							
							
								
								feat: mlog_submit返回更详细的报错
							
							
							
							
							
						 | 
						
							2023-12-28 17:28:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c91533a328
								
							
						 | 
						
							
							
								
								feat: mlog增加equipments字段
							
							
							
							
							
						 | 
						
							2023-12-27 09:51:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								03d6a6c99f
								
							
						 | 
						
							
							
								
								fix: mtask_submit时导致重复计算
							
							
							
							
							
						 | 
						
							2023-12-27 09:03:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d131741f4b
								
							
						 | 
						
							
							
								
								feat: handover返回material_name
							
							
							
							
							
						 | 
						
							2023-12-25 13:04:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93de5ea879
								
							
						 | 
						
							
							
								
								feat: wmaterialserializer返回全名
							
							
							
							
							
						 | 
						
							2023-12-22 13:47:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c80b486a00
								
							
						 | 
						
							
							
								
								feat: equipment_name 返回—的为__str__数据
							
							
							
							
							
						 | 
						
							2023-12-22 10:19:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								00c860b001
								
							
						 | 
						
							
							
								
								fix: mlog update时mtask, mgroup不可变
							
							
							
							
							
						 | 
						
							2023-12-21 08:49:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2975d05d
								
							
						 | 
						
							
							
								
								feat: wmaterial增加筛选条件
							
							
							
							
							
						 | 
						
							2023-12-21 00:14:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec3014d5ee
								
							
						 | 
						
							
							
								
								feat: mlog增加返回数据
							
							
							
							
							
						 | 
						
							2023-12-20 23:30:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0f2d2dbee9
								
							
						 | 
						
							
							
								
								feat: 其他生产记录增加查询handle_date
							
							
							
							
							
						 | 
						
							2023-12-20 15:17:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								043869e828
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格原因字段
							
							
							
							
							
						 | 
						
							2023-12-18 14:21:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf5d62e99d
								
							
						 | 
						
							
							
								
								fix: mlog提交时如有mtask则handle_date为mtask日期2
							
							
							
							
							
						 | 
						
							2023-12-18 12:25:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6182ef3c58
								
							
						 | 
						
							
							
								
								feat: mlog提交时如有mtask则handle_date为mtask日期
							
							
							
							
							
						 | 
						
							2023-12-18 11:20:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a9c16c4a9d
								
							
						 | 
						
							
							
								
								feat: 日志提交和撤回返回序列化信息
							
							
							
							
							
						 | 
						
							2023-12-18 11:12:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								625074049e
								
							
						 | 
						
							
							
								
								feat: mlog日志撤回
							
							
							
							
							
						 | 
						
							2023-12-18 09:18:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								845a510068
								
							
						 | 
						
							
							
								
								fix: mlog撤回1未完成
							
							
							
							
							
						 | 
						
							2023-12-18 08:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c43f8ec62
								
							
						 | 
						
							
							
								
								fix: handover update validate更严谨一些
							
							
							
							
							
						 | 
						
							2023-12-17 19:55:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1b5c910cf8
								
							
						 | 
						
							
							
								
								fix: 交接记录的提交bug
							
							
							
							
							
						 | 
						
							2023-12-16 13:00:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f1ae6ddc6
								
							
						 | 
						
							
							
								
								fix: mlogsubmit bug
							
							
							
							
							
						 | 
						
							2023-12-16 11:46:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd6b4a5f82
								
							
						 | 
						
							
							
								
								fix: gen_by_wm需提供send_mgroup
							
							
							
							
							
						 | 
						
							2023-12-16 11:42:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								128dc2a7e3
								
							
						 | 
						
							
							
								
								feat: utask mtask状态submit调整
							
							
							
							
							
						 | 
						
							2023-12-15 09:05:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b6ff7cd3c
								
							
						 | 
						
							
							
								
								feat: mlog更新时更新日志
							
							
							
							
							
						 | 
						
							2023-12-14 10:36:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ea63c29a69
								
							
						 | 
						
							
							
								
								feat: mlog有mtask时固定handle_date
							
							
							
							
							
						 | 
						
							2023-12-07 10:55:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d8169849f
								
							
						 | 
						
							
							
								
								feat: 将mlog添加审计日志
							
							
							
							
							
						 | 
						
							2023-12-07 09:39:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95f67b6543
								
							
						 | 
						
							
							
								
								feat: is_hidden的物料也需要进行车间库存管理
							
							
							
							
							
						 | 
						
							2023-12-05 13:02:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac323781eb
								
							
						 | 
						
							
							
								
								feat 增加wm查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 15:51:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3d37c6dfa
								
							
						 | 
						
							
							
								
								feat: wm增加查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 14:16:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dc47570a5b
								
							
						 | 
						
							
							
								
								feat: wm增加查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 11:33:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e8d78a5e9
								
							
						 | 
						
							
							
								
								doc: 增加注释
							
							
							
							
							
						 | 
						
							2023-11-30 17:10:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cc0a2719de
								
							
						 | 
						
							
							
								
								feat: mtask增加submit_time
							
							
							
							
							
						 | 
						
							2023-11-30 16:30:07 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								e24a16b692
								
							
						 | 
						
							
							
								
								fix: mlog设置必填项目
							
							
							
							
							
						 | 
						
							2023-11-28 00:23:48 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								555700793f
								
							
						 | 
						
							
							
								
								feat: otherlog路由注册
							
							
							
							
							
						 | 
						
							2023-11-27 13:21:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec5c246bdc
								
							
						 | 
						
							
							
								
								feat: 其他生产日志
							
							
							
							
							
						 | 
						
							2023-11-27 11:33:15 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								fddadfe30c
								
							
						 | 
						
							
							
								
								feat: wpm中增加到岗记录
							
							
							
							
							
						 | 
						
							2023-11-20 16:26:14 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								1b85a7f88a
								
							
						 | 
						
							
							
								
								fix: 可不用隐式物料
							
							
							
							
							
						 | 
						
							2023-11-03 18:33:12 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								ebb35740fd
								
							
						 | 
						
							
							
								
								feat: handover添加进路由
							
							
							
							
							
						 | 
						
							2023-10-31 11:01:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d20825716
								
							
						 | 
						
							
							
								
								feat: 增加交接记录表及相应接口
							
							
							
							
							
						 | 
						
							2023-10-31 10:50:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8bc753418
								
							
						 | 
						
							
							
								
								feat: mlog增加部分字段以便单独创建日志
							
							
							
							
							
						 | 
						
							2023-10-30 16:47:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6c14e8c8fd
								
							
						 | 
						
							
							
								
								feat: 日志添加不合格原因数字段
							
							
							
							
							
						 | 
						
							2023-10-30 12:44:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cbc43fdb65
								
							
						 | 
						
							
							
								
								feat: 增加is_count_utask字段以确认同步utask
							
							
							
							
							
						 | 
						
							2023-10-26 18:20:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cea056955
								
							
						 | 
						
							
							
								
								feat: utask mtask增加状态以及相关逻辑
							
							
							
							
							
						 | 
						
							2023-10-26 16:25:04 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								3cbc6e3fef
								
							
						 | 
						
							
							
								
								feat: 增加mlog查询条件
							
							
							
							
							
						 | 
						
							2023-10-25 10:42:29 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								a69fa79de8
								
							
						 | 
						
							
							
								
								feat:  获取指定车间指定日期的最后工序生产任务
							
							
							
							
							
						 | 
						
							2023-10-20 16:55:20 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								5e34558c02
								
							
						 | 
						
							
							
								
								feat: route增加主要输入和输出以及自动排产逻辑修改
							
							
							
							
							
						 | 
						
							2023-10-16 16:50:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f3b43ab0ce
								
							
						 | 
						
							
							
								
								fix: mgroup 增加need_enm字段
							
							
							
							
							
						 | 
						
							2023-10-13 13:13:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c6f9b749c7
								
							
						 | 
						
							
							
								
								feat: mlog增加handle_user
							
							
							
							
							
						 | 
						
							2023-10-10 16:43:05 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								2597617a94
								
							
						 | 
						
							
							
								
								refector: 优化了do_in报错
							
							
							
							
							
						 | 
						
							2023-09-28 10:18:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ebf15b04f
								
							
						 | 
						
							
							
								
								feat: 生产入库后变更车间物料
							
							
							
							
							
						 | 
						
							2023-09-28 09:22:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9504b527cb
								
							
						 | 
						
							
							
								
								feat: 增加车间库存并完成生产领料
							
							
							
							
							
						 | 
						
							2023-09-27 15:41:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7de606b496
								
							
						 | 
						
							
							
								
								fix: mtask级联下达任务
							
							
							
							
							
						 | 
						
							2023-09-27 09:43:10 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								ad30803836
								
							
						 | 
						
							
							
								
								feat: sflogExp增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-24 10:52:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cd2c0f85b
								
							
						 | 
						
							
							
								
								feat: enstat2增加day_s统计及相应的tasks改动
							
							
							
							
							
						 | 
						
							2023-08-23 08:33:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad9027d888
								
							
						 | 
						
							
							
								
								fix: 煤粉热值取白班值
							
							
							
							
							
						 | 
						
							2023-08-17 15:05:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ccfeb9d901
								
							
						 | 
						
							
							
								
								feat: sflogexp合并stlog
							
							
							
							
							
						 | 
						
							2023-08-08 14:41:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebe6ab9f3b
								
							
						 | 
						
							
							
								
								feat: 增加生产异常动态记录表
							
							
							
							
							
						 | 
						
							2023-08-04 14:26:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c7b7d9cec4
								
							
						 | 
						
							
							
								
								fix: cal_enstat_when_pcoal_heat_change的qs获取bug
							
							
							
							
							
						 | 
						
							2023-08-03 14:09:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a609b1db94
								
							
						 | 
						
							
							
								
								feat: cal_enstat_when_team_change
							
							
							
							
							
						 | 
						
							2023-08-03 10:31:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67d04a9a41
								
							
						 | 
						
							
							
								
								feat: 可以不用间隔运行get_total_hour_now
							
							
							
							
							
						 | 
						
							2023-08-02 17:25:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								40ecd52fee
								
							
						 | 
						
							
							
								
								feat: 可根据时间段生成排版记录
							
							
							
							
							
						 | 
						
							2023-08-02 15:54:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7619e5156c
								
							
						 | 
						
							
							
								
								feat: cal_mpointstats分组执行
							
							
							
							
							
						 | 
						
							2023-08-02 14:12:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad2f903c89
								
							
						 | 
						
							
							
								
								fix: init_test bug
							
							
							
							
							
						 | 
						
							2023-08-02 10:51:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3dc647272a
								
							
						 | 
						
							
							
								
								feat: cal_enstat_when_pcoal_val_change 未完成
							
							
							
							
							
						 | 
						
							2023-08-02 10:22:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								251e373d5b
								
							
						 | 
						
							
							
								
								feat: get_total_hour_now 修改
							
							
							
							
							
						 | 
						
							2023-08-01 16:41:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								80b61c9f8b
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now bug
							
							
							
							
							
						 | 
						
							2023-08-01 08:54:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d2e4439b73
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now bug
							
							
							
							
							
						 | 
						
							2023-08-01 08:50:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a29ed1edc8
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now sql查询bug
							
							
							
							
							
						 | 
						
							2023-07-31 17:46:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5d2f84d4
								
							
						 | 
						
							
							
								
								feat: 停机记录分配到每一个班
							
							
							
							
							
						 | 
						
							2023-07-28 17:36:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d487f0889f
								
							
						 | 
						
							
							
								
								feat: 获取煤粉热值
							
							
							
							
							
						 | 
						
							2023-07-28 17:20:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1d0b43d75f
								
							
						 | 
						
							
							
								
								feat: sflog增加total_hour_now以及pcoal_val
							
							
							
							
							
						 | 
						
							2023-07-28 17:18:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								437d4c923e
								
							
						 | 
						
							
							
								
								fix: init_test 报错
							
							
							
							
							
						 | 
						
							2023-07-25 13:25:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b634bac616
								
							
						 | 
						
							
							
								
								feat: sflog获取年月日优化
							
							
							
							
							
						 | 
						
							2023-07-25 11:23:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								13382171de
								
							
						 | 
						
							
							
								
								refector: 初始化检测录入优化
							
							
							
							
							
						 | 
						
							2023-07-25 11:20:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								be9011f8f5
								
							
						 | 
						
							
							
								
								feat: sflog增加property以获取年月日
							
							
							
							
							
						 | 
						
							2023-07-25 11:19:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								27a2a20cbe
								
							
						 | 
						
							
							
								
								feat: 值班记录增加运转时间和停机时间
							
							
							
							
							
						 | 
						
							2023-07-24 11:19:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f02135dc10
								
							
						 | 
						
							
							
								
								fix: init_test 排序错误
							
							
							
							
							
						 | 
						
							2023-07-10 16:26:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								377817f04c
								
							
						 | 
						
							
							
								
								feat: sflog增加查询参数已获取当前值班记录
							
							
							
							
							
						 | 
						
							2023-07-07 15:36:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e51d19fac0
								
							
						 | 
						
							
							
								
								fix: 初始化检测录入排序及取消质检任务执行
							
							
							
							
							
						 | 
						
							2023-07-06 14:48:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dab2d164b1
								
							
						 | 
						
							
							
								
								feat: 值班记录增加最后质检时间
							
							
							
							
							
						 | 
						
							2023-07-06 08:39:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e0fcb2e22b
								
							
						 | 
						
							
							
								
								fix: 初始化检测bug
							
							
							
							
							
						 | 
						
							2023-07-05 16:39:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								edd2dc5600
								
							
						 | 
						
							
							
								
								fix: 初始化检测录入rate_pass, create_by, belong_dept需要有
							
							
							
							
							
						 | 
						
							2023-07-05 16:17:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eef4beebb4
								
							
						 | 
						
							
							
								
								fix: 修复quastat task
							
							
							
							
							
						 | 
						
							2023-07-05 16:02:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								965e3169ba
								
							
						 | 
						
							
							
								
								feat: 初始化检测录入bug
							
							
							
							
							
						 | 
						
							2023-07-05 14:35:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								066217d6c1
								
							
						 | 
						
							
							
								
								fix: 初始化检测录入bug
							
							
							
							
							
						 | 
						
							2023-07-05 14:06:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93881852d0
								
							
						 | 
						
							
							
								
								feat: sflog init_test接口
							
							
							
							
							
						 | 
						
							2023-07-05 13:44:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f620dc0bcb
								
							
						 | 
						
							
							
								
								refector: 生成排班记录
							
							
							
							
							
						 | 
						
							2023-06-30 10:24:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a6167294f7
								
							
						 | 
						
							
							
								
								feat: sflog filter
							
							
							
							
							
						 | 
						
							2023-06-30 10:22:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6bbbf16049
								
							
						 | 
						
							
							
								
								feat: 值班记录排序
							
							
							
							
							
						 | 
						
							2023-06-28 09:13:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								49fa109233
								
							
						 | 
						
							
							
								
								feat: 自动创建值班记录
							
							
							
							
							
						 | 
						
							2023-06-28 09:00:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								51737bcdd8
								
							
						 | 
						
							
							
								
								fix: 权限代号调整
							
							
							
							
							
						 | 
						
							2023-06-26 16:45:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0145beb63f
								
							
						 | 
						
							
							
								
								feat: 值班记录质量分析数据录入
							
							
							
							
							
						 | 
						
							2023-06-26 16:00:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07a8e5977f
								
							
						 | 
						
							
							
								
								feat: 值班记录增加电耗统计
							
							
							
							
							
						 | 
						
							2023-06-25 17:10:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1d16949d8a
								
							
						 | 
						
							
							
								
								feat: 增加wpm,qm,mtm三个app
							
							
							
							
							
						 | 
						
							2023-06-20 17:05:50 +08:00 |