weihongyang
							
						 
					 | 
					
						
						
							
						
						1288ed083d
					 | 
					
						
						
							
							生产流程
						
						
						
						
						
						
					 | 
					
						2020-08-24 13:19:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						c56f73ed74
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/hy2250089' into hy2250089
						
						
						
						
						
						
						
						# Conflicts:
#	.idea/workspace.xml 
						
						
					 | 
					
						2020-08-24 08:29:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						f0ca5f979c
					 | 
					
						
						
							
							commit init
						
						
						
						
						
						
					 | 
					
						2020-08-24 08:29:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						45bc22522f
					 | 
					
						
						
							
							commit init
						
						
						
						
						
						
					 | 
					
						2020-08-24 08:28:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						46c208ac4b
					 | 
					
						
						
							
							订单管理
						
						
						
						
						
						
					 | 
					
						2020-08-22 16:08:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						a5f5da8b79
					 | 
					
						
						
							
							Merge branch 'hy2250089' of http://47.96.183.77:3000/wms-parent-manage/mt-pms-api into hy2250089
						
						
						
						
						
						
						
						 Conflicts:
	.idea/workspace.xml
	wms-parent.iml 
						
						
					 | 
					
						2020-08-22 10:20:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						f734f4392c
					 | 
					
						
						
							
							commit init
						
						
						
						
						
						
					 | 
					
						2020-08-22 10:20:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						6b838944ba
					 | 
					
						
						
							
							生产订单
						
						
						
						
						
						
					 | 
					
						2020-08-21 17:01:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						0eec7c0f85
					 | 
					
						
						
							
							Merge branch 'hy2250089' of http://47.96.183.77:3000/wms-parent-manage/mt-pms-api into hy2250089
						
						
						
						
						
						
						
						 Conflicts:
	.idea/workspace.xml 
						
						
					 | 
					
						2020-08-21 08:56:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						909b1906c7
					 | 
					
						
						
							
							commit init
						
						
						
						
						
						
					 | 
					
						2020-08-21 08:55:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						116c981486
					 | 
					
						
						
							
							mark
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:15:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						8d32ee3061
					 | 
					
						
						
							
							代码生成提交
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:47:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						54694d8e85
					 | 
					
						
						
							
							mark
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:38:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						a0d7ec0ed4
					 | 
					
						
						
							
							mark
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:27:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						9ee464c736
					 | 
					
						
						
							
							mark
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:15:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caixiangc
							
						 
					 | 
					
						
						
							
						
						4733ddc226
					 | 
					
						
						
							
							initial
						
						
						
						
						
						
					 | 
					
						2020-08-15 16:59:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						b8bddc66bf
					 | 
					
						
						
							
							明细批量修改接口修改
						
						
						
						
						
						
					 | 
					
						2020-04-09 17:11:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						16f70ba4a4
					 | 
					
						
						
							
							明细批量修改接口,待测试
						
						
						
						
						
						
					 | 
					
						2020-03-26 19:55:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						fb085cdeba
					 | 
					
						
						
							
							明细批量修改更新接口 未完成
						
						
						
						
						
						
					 | 
					
						2020-03-25 22:12:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						51b3204991
					 | 
					
						
						
							
							批次明细关键字模糊查询接口修改
						
						
						
						
						
						
					 | 
					
						2020-03-25 15:10:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						a152f9164d
					 | 
					
						
						
							
							修改根据批次明细查询已检测的工序接口,增加根据批次明细和工序查询检测结果接口
						
						
						
						
						
						
					 | 
					
						2020-03-24 18:43:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						587def8f1f
					 | 
					
						
						
							
							检测等级库表修改,增加检测长度、缩率等信息
						
						
						
						
						
						
					 | 
					
						2020-03-23 19:06:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						6d569bc913
					 | 
					
						
						
							
							增加查询批次明细的扩展信息,查询时将已完成工序数修正为已检测工序数,增加根据批次明细id查询已检测的工序接口
						
						
						
						
						
						
					 | 
					
						2020-03-23 18:46:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						7783a360af
					 | 
					
						
						
							
							保存检测结果接口增加当前用户的参数标注
						
						
						
						
						
						
					 | 
					
						2020-03-21 22:10:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						ee5938e97f
					 | 
					
						
						
							
							检测等级和瑕疵名细保存接口
						
						
						
						
						
						
					 | 
					
						2020-03-20 16:56:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						50f388d9fd
					 | 
					
						
						
							
							打卷系统操作页面批次加工单、工序、批次明细信息查询接口
						
						
						
						
						
						
					 | 
					
						2020-03-16 19:22:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						f520e678f1
					 | 
					
						
						
							
							新增根据批次加工单获取批次明细接口,修改根据批次加工单获取工序和明细的接口
						
						
						
						
						
						
					 | 
					
						2020-03-13 11:08:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						3295968f76
					 | 
					
						
						
							
							根据批次加工单id获取其下的所有工序序号和卷号
						
						
						
						
						
						
					 | 
					
						2020-03-11 22:18:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						21829c4a9c
					 | 
					
						
						
							
							增加批次明细的保存
						
						
						
						
						
						
					 | 
					
						2020-03-11 10:04:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf06d4fd2e
					 | 
					
						
						
							
							Merge branch 'guotuanting' of mengtong/mt-pms-api into master
						
						
						
						
						
						
					 | 
					
						2020-02-27 23:40:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						33badce595
					 | 
					
						
						
							
							修改正式环境配置文件
						
						
						
						
						
						
					 | 
					
						2020-02-27 23:38:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3481ad27d4
					 | 
					
						
						
							
							修改正式环境配置文件
						
						
						
						
						
						
					 | 
					
						2020-02-27 21:40:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						98cb1d78d9
					 | 
					
						
						
							
							Merge branch 'master' of git.picaiba.com:mengtong/mt-pms-api into hy2250089
						
						
						
						
						
						
					 | 
					
						2020-02-25 15:49:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						27f51bf3b0
					 | 
					
						
						
							
							增加测试语句
						
						
						
						
						
						
					 | 
					
						2020-02-25 15:49:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								何勇
							
						 
					 | 
					
						
						
							
						
						bfc8300cbb
					 | 
					
						
						
							
							Merge branch 'weihongyang' of mengtong/mt-pms-api into master
						
						
						
						
						
						
					 | 
					
						2020-02-25 15:46:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						76f4ea9ae9
					 | 
					
						
						
							
							1.工艺管理,创建工艺,工序添加完物料后,再点击工序编辑,里面的物料和之前添加的不一样bug修改
						
						
						
						
						
						
					 | 
					
						2020-02-25 15:27:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						b0685f2565
					 | 
					
						
						
							
							修改生产加工单计划用量和实际用量取数显示
						
						
						
						
						
						
					 | 
					
						2020-02-24 14:47:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						dedc80d719
					 | 
					
						
						
							
							工序进度跟踪
						
						
						
						
						
						
					 | 
					
						2020-01-17 11:16:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						f472e9cdc2
					 | 
					
						
						
							
							工序处理接口修改
						
						
						
						
						
						
					 | 
					
						2020-01-17 08:38:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								何勇
							
						 
					 | 
					
						
						
							
						
						6b15aabe1f
					 | 
					
						
						
							
							Merge branch 'weihongyang' of mengtong/mt-pms-api into master
						
						
						
						
						
						
					 | 
					
						2020-01-16 16:20:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						8fc89909db
					 | 
					
						
						
							
							Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into weihongyang
						
						
						
						
						
						
					 | 
					
						2020-01-16 16:07:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						3d11e761bd
					 | 
					
						
						
							
							工艺管理测试修改
						
						
						
						
						
						
					 | 
					
						2020-01-16 16:07:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								何勇
							
						 
					 | 
					
						
						
							
						
						f158de959a
					 | 
					
						
						
							
							Merge branch 'weihongyang' of mengtong/mt-pms-api into master
						
						
						
						
						
						
					 | 
					
						2020-01-16 10:08:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						ae7bb481cc
					 | 
					
						
						
							
							加工单物料批量更新
						
						
						
						
						
						
					 | 
					
						2020-01-16 09:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						0e1eae73bc
					 | 
					
						
						
							
							Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into weihongyang
						
						
						
						
						
						
					 | 
					
						2020-01-15 14:26:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								weihongyang
							
						 
					 | 
					
						
						
							
						
						7eaa4d08e6
					 | 
					
						
						
							
							commit init
						
						
						
						
						
						
					 | 
					
						2020-01-15 14:24:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hy2250089
							
						 
					 | 
					
						
						
							
						
						297cbaa591
					 | 
					
						
						
							
							工艺管理产品下拉框修改
						
						
						
						
						
						
					 | 
					
						2020-01-13 11:12:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiangs
							
						 
					 | 
					
						
						
							
						
						d7b946365b
					 | 
					
						
						
							
							Merge branch 'caixiang' of mengtong/mt-pms-api into master
						
						
						
						
						
						
					 | 
					
						2020-01-12 14:29:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						73e26d234e
					 | 
					
						
						
							
							Merge branch 'master' of https://git.picaiba.com/mengtong/mt-pms-api into caixiang
						
						
						
						
						
						
					 | 
					
						2020-01-12 14:26:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaiXiang
							
						 
					 | 
					
						
						
							
						
						ee7431504b
					 | 
					
						
						
							
							mark
						
						
						
						
						
						
					 | 
					
						2020-01-12 14:26:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |