| 
						
					 | 
					
						
						
							
						
						835b98e486
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
						
						 Conflicts:
	6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java 
						
						
					 | 
					
						2022-07-08 19:56:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0fcdcd462c
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2022-07-08 19:55:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lgh
							
						 
					 | 
					
						
						
							
						
						936dc5b71a
					 | 
					
						
						
							
							返回值加上code
						
						
						
						
						
						
						
						创建多步骤的currTask只上报一次apms创建生产单
多步骤任务全部删除后自动删除autoTask
数据采集bug修改 
						
						
					 | 
					
						2022-07-08 18:23:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lgh
							
						 
					 | 
					
						
						
							
						
						722ecf61c0
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2022-07-08 15:58:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lgh
							
						 
					 | 
					
						
						
							
						
						b12bd2294f
					 | 
					
						
						
							
							细节修改
						
						
						
						
						
						
					 | 
					
						2022-07-08 15:58:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c324aa524f
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
						
						 Conflicts:
	6.program/wms-gateway/src/main/resources/config/application.yml 
						
						
					 | 
					
						2022-07-08 15:44:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						81b9f5c45e
					 | 
					
						
						
							
							残留数据提交
						
						
						
						
						
						
					 | 
					
						2022-07-08 15:43:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lgh
							
						 
					 | 
					
						
						
							
						
						9cc6ef98f9
					 | 
					
						
						
							
							apms的ip端口号修改
						
						
						
						
						
						
						
						能源消耗统计优化
新增生产单用临时工艺号(前端修改后要改回)
多步骤任务执行bug修改 
						
						
					 | 
					
						2022-07-07 23:50:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4133285cdd
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2022-07-07 16:11:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f260cffd56
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2022-07-07 16:11:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lgh
							
						 
					 | 
					
						
						
							
						
						0c67641710
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-07-07 15:22:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2319f2a51
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2022-07-06 22:44:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf1c8eeb5e
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2022-07-06 22:07:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b107cd2446
					 | 
					
						
						
							
							上报apms生产单进度
						
						
						
						
						
						
					 | 
					
						2022-07-06 18:35:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						14b05bae7e
					 | 
					
						
						
							
							生产看板
						
						
						
						
						
						
					 | 
					
						2022-07-06 10:12:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0dd56c1e8b
					 | 
					
						
						
							
							生产看板
						
						
						
						
						
						
					 | 
					
						2022-06-17 08:48:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4531db10da
					 | 
					
						
						
							
							2.23
						
						
						
						
						
						
					 | 
					
						2022-03-23 09:36:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						186a28bffc
					 | 
					
						
						
							
							bug修改,日志文件配置
						
						
						
						
						
						
					 | 
					
						2022-03-20 21:41:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c8119c5bd0
					 | 
					
						
						
							
							车辆重置
						
						
						
						
						
						
					 | 
					
						2022-03-20 00:12:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c1ce765634
					 | 
					
						
						
							
							websocket测试
						
						
						
						
						
						
					 | 
					
						2022-03-19 22:40:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2104ddc7fc
					 | 
					
						
						
							
							todo完善
						
						
						
						
						
						
					 | 
					
						2022-03-19 11:24:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de098ec968
					 | 
					
						
						
							
							todo完善
						
						
						
						
						
						
					 | 
					
						2022-03-18 11:14:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edd0f8c77b
					 | 
					
						
						
							
							查询能源消耗
						
						
						
						
						
						
					 | 
					
						2022-03-05 18:21:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb957ab4ea
					 | 
					
						
						
							
							查询能源消耗
						
						
						
						
						
						
					 | 
					
						2022-03-05 16:09:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						211c017278
					 | 
					
						
						
							
							自动任务
						
						
						
						
						
						
					 | 
					
						2022-03-05 14:53:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						274fdd6a35
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2022-03-04 17:08:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee05bbf7bb
					 | 
					
						
						
							
							能源消耗
						
						
						
						
						
						
					 | 
					
						2022-03-04 17:08:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2f279d9a6
					 | 
					
						
						
							
							lgh
						
						
						
						
						
						
					 | 
					
						2022-03-03 23:51:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b4795e92c
					 | 
					
						
						
							
							为apms检验的结果添加字段
						
						
						
						
						
						
					 | 
					
						2022-01-05 09:49:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						962d47b308
					 | 
					
						
						
							
							优化apms对接时发现的问题。
						
						
						
						
						
						
					 | 
					
						2022-01-05 08:36:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10821861aa
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2022-01-01 23:16:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0a61480eb
					 | 
					
						
						
							
							出库相关接口
						
						
						
						
						
						
					 | 
					
						2022-01-01 23:15:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aac7b8c080
					 | 
					
						
						
							
							优化apms对接时发现的问题。
						
						
						
						
						
						
					 | 
					
						2021-12-30 10:13:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ce5380397
					 | 
					
						
						
							
							优化apms对接时发现的问题。
						
						
						
						
						
						
					 | 
					
						2021-12-30 10:13:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a34af7c00
					 | 
					
						
						
							
							优化apms对接时发现的问题。
						
						
						
						
						
						
					 | 
					
						2021-12-29 08:53:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59e480ad6a
					 | 
					
						
						
							
							修复apms新增订单bug,优化apms接口描述
						
						
						
						
						
						
					 | 
					
						2021-12-28 16:07:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3b97b9559
					 | 
					
						
						
							
							出库相关接口
						
						
						
						
						
						
					 | 
					
						2021-12-17 14:40:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd11d890ec
					 | 
					
						
						
							
							出库相关接口
						
						
						
						
						
						
					 | 
					
						2021-12-17 11:12:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e49c0be65
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2021-12-17 08:46:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31acfeea76
					 | 
					
						
						
							
							报警信息接口
						
						
						
						
						
						
					 | 
					
						2021-12-17 08:46:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						135d64b078
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2021-12-15 11:05:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f105cb3e5d
					 | 
					
						
						
							
							为订单信息和订单历史信息添加作废字段
						
						
						
						
						
						
						
						优化apms接口注解
优化订单作废等相关操作数据逻辑 
						
						
					 | 
					
						2021-12-15 11:05:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be40d7ede1
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2021-12-14 18:42:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ad3c5cfd8
					 | 
					
						
						
							
							code生成修改
						
						
						
						
						
						
					 | 
					
						2021-12-14 18:41:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						336bc29ddc
					 | 
					
						
						
							
							修正数据库字段错误。
						
						
						
						
						
						
					 | 
					
						2021-12-14 16:05:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						169e442af0
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2021-12-14 15:50:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b0801fb55e
					 | 
					
						
						
							
							优化内部订单code生成
						
						
						
						
						
						
						
						优化注释 
						
						
					 | 
					
						2021-12-14 15:50:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25178732f8
					 | 
					
						
						
							
							表修改代码生成
						
						
						
						
						
						
					 | 
					
						2021-12-14 12:03:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ec2a6554b
					 | 
					
						
						
							
							code生成修改
						
						
						
						
						
						
					 | 
					
						2021-12-13 16:42:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71687b6bcd
					 | 
					
						
						
							
							Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
						
						
						
						
						
						
					 | 
					
						2021-12-10 10:57:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |