caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fcac1d1d78
								
							
						 | 
						
							
							
								
								同步数据库
							
							
							
							
							
						 | 
						
							2022-01-13 09:33:07 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								f02e5504f5
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-12 10:35:19 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								362df53bd4
								
							
						 | 
						
							
							
								
								liuchengka
							
							
							
							
							
						 | 
						
							2022-01-12 10:34:58 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3067a101
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-12 10:33:50 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								46048efa86
								
							
						 | 
						
							
							
								
								punchtheclock
							
							
							
							
							
						 | 
						
							2022-01-12 10:33:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								902dc5bd96
								
							
						 | 
						
							
							
								
								流程卡2
							
							
							
							
							
						 | 
						
							2022-01-11 16:34:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								63ddab4942
								
							
						 | 
						
							
							
								
								流程卡1
							
							
							
							
							
						 | 
						
							2022-01-11 16:17:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2b0bd78686
								
							
						 | 
						
							
							
								
								wproduct 流程卡
							
							
							
							
							
						 | 
						
							2022-01-10 13:05:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73a88e2f86
								
							
						 | 
						
							
							
								
								合同增加筛选条件
							
							
							
							
							
						 | 
						
							2022-01-10 10:06:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bfa8b6857e
								
							
						 | 
						
							
							
								
								plan增加查询条件 在制和已排 bug
							
							
							
							
							
						 | 
						
							2022-01-10 09:17:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b8332f7bb
								
							
						 | 
						
							
							
								
								plan增加查询条件 在制和已排
							
							
							
							
							
						 | 
						
							2022-01-10 09:13:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								99d4a08406
								
							
						 | 
						
							
							
								
								增加plan,order等时间范围筛选条件
							
							
							
							
							
						 | 
						
							2022-01-10 08:48:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ceb818e6c5
								
							
						 | 
						
							
							
								
								wproduct增加children接口
							
							
							
							
							
						 | 
						
							2022-01-07 15:47:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f7369d4347
								
							
						 | 
						
							
							
								
								夹层玻璃增加children
							
							
							
							
							
						 | 
						
							2022-01-07 11:29:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ce3751ce2b
								
							
						 | 
						
							
							
								
								夹层玻璃增加children
							
							
							
							
							
						 | 
						
							2022-01-07 11:27:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1402ffaebc
								
							
						 | 
						
							
							
								
								update_plan_state_by_mtestok bug
							
							
							
							
							
						 | 
						
							2022-01-07 10:01:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef46ddf7ab
								
							
						 | 
						
							
							
								
								update_plan_state_by_mtestok bug
							
							
							
							
							
						 | 
						
							2022-01-07 09:52:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d033ca12c
								
							
						 | 
						
							
							
								
								iproduct 去除军检
							
							
							
							
							
						 | 
						
							2022-01-07 09:43:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e4bce6b453
								
							
						 | 
						
							
							
								
								军检日志
							
							
							
							
							
						 | 
						
							2022-01-07 09:32:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad8420b035
								
							
						 | 
						
							
							
								
								半成品表可进行军检,增加仓库字段
							
							
							
							
							
						 | 
						
							2022-01-07 09:19:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae711f3b3b
								
							
						 | 
						
							
							
								
								增加安全库存数字段
							
							
							
							
							
						 | 
						
							2022-01-06 09:43:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90ddb45efe
								
							
						 | 
						
							
							
								
								wf 自定义deptSelect标签
							
							
							
							
							
						 | 
						
							2022-01-06 09:39:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19c3a9579d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-06 09:34:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab0c9e226f
								
							
						 | 
						
							
							
								
								修改消耗与产出不一致的bug
							
							
							
							
							
						 | 
						
							2022-01-06 09:34:21 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								f0a3427422
								
							
						 | 
						
							
							
								
								ceshi
							
							
							
							
							
						 | 
						
							2022-01-06 08:40:42 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								9fd1e20008
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-06 08:34:53 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								c8589cb158
								
							
						 | 
						
							
							
								
								xialiao
							
							
							
							
							
						 | 
						
							2022-01-06 08:34:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1e1d0b9b4
								
							
						 | 
						
							
							
								
								updatecuttinglist bug
							
							
							
							
							
						 | 
						
							2022-01-05 09:35:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ad37f0cef
								
							
						 | 
						
							
							
								
								下料清单queryset
							
							
							
							
							
						 | 
						
							2022-01-05 09:26:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ccd2d2e375
								
							
						 | 
						
							
							
								
								下料清单完成
							
							
							
							
							
						 | 
						
							2022-01-05 09:20:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd6286931f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-04 17:06:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								262895d6e6
								
							
						 | 
						
							
							
								
								update_cutting_list_with_operation bug
							
							
							
							
							
						 | 
						
							2022-01-04 17:06:12 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								da1bbf36c8
								
							
						 | 
						
							
							
								
								0104
							
							
							
							
							
						 | 
						
							2022-01-04 17:02:55 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								9fa9b34968
								
							
						 | 
						
							
							
								
								0104
							
							
							
							
							
						 | 
						
							2022-01-04 17:01:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf711ec9c2
								
							
						 | 
						
							
							
								
								update_cutting_list_with_operation bug
							
							
							
							
							
						 | 
						
							2022-01-04 16:50:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7370544395
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-04 16:43:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4538c32834
								
							
						 | 
						
							
							
								
								下料清单初步完成
							
							
							
							
							
						 | 
						
							2022-01-04 16:43:32 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								1bc22240b7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2022-01-04 09:44:45 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								3b1fefc696
								
							
						 | 
						
							
							
								
								jianyantianjiaqiyong
							
							
							
							
							
						 | 
						
							2022-01-04 09:44:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8f1746f8a6
								
							
						 | 
						
							
							
								
								techdoc 增加enabled查询条件
							
							
							
							
							
						 | 
						
							2022-01-04 09:22:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b5b5e9911
								
							
						 | 
						
							
							
								
								不合格审理返回decision_2 bug
							
							
							
							
							
						 | 
						
							2021-12-31 16:44:53 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								801b41221e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2021-12-31 13:20:53 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								c47b65a625
								
							
						 | 
						
							
							
								
								dashBoard
							
							
							
							
							
						 | 
						
							2021-12-31 13:20:45 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								ba2b0ad4a6
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2021-12-31 13:19:27 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								a0186dbdbb
								
							
						 | 
						
							
							
								
								guochengjianyan
							
							
							
							
							
						 | 
						
							2021-12-31 13:19:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1c86557f0
								
							
						 | 
						
							
							
								
								下料清单接口
							
							
							
							
							
						 | 
						
							2021-12-31 11:31:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7861b5419e
								
							
						 | 
						
							
							
								
								wproductticket list返回增加order product
							
							
							
							
							
						 | 
						
							2021-12-31 10:45:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								895ffbe394
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
							
							
							
							
							
						 | 
						
							2021-12-31 10:26:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e15ad98c92
								
							
						 | 
						
							
							
								
								操作提交后更新进度
							
							
							
							
							
						 | 
						
							2021-12-31 10:26:07 +08:00 | 
						
					
				
					
						
							
							
								
								 shilixia
							
						 | 
						
							
							
							
							
							
								
							
							
								d031f16be7
								
							
						 | 
						
							
							
								
								ziliangguanli
							
							
							
							
							
						 | 
						
							2021-12-31 09:05:00 +08:00 |