|  汪云昊 | efea8980e7 | 解除冲突 | 6 years ago | 
				
					
						|  汪云昊 | 5a2a2a5e8d | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev  Conflicts:
	modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 6 years ago | 
				
					
						|  wei.peng | 4b17995206 | LAC 日志记录Cache 完成 | 6 years ago | 
				
					
						|  jokelone | 5e813f30e7 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  jokelone | f632308d0a | 【任务:1193接口数据解析】 | 6 years ago | 
				
					
						|  王杰 | 2a5c32b8ea | 解决冲突 | 6 years ago | 
				
					
						|  陈思洁 | 5050c0c5a1 | 新增实体--安全库存 | 6 years ago | 
				
					
						|  qinjia zou | 2210482918 | 【自动入库】bug6390 | 6 years ago | 
				
					
						|  汪云昊 | 13f77e69c1 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  qinjia zou | a8ebcb669b | 【自动入库】bug6390 | 6 years ago | 
				
					
						|  qinjia zou | 6e8977e5aa | 【自动入库】bug6390 | 6 years ago | 
				
					
						|  钮海涛 | e3ba4f6349 | 新增规则组合执行接口 | 6 years ago | 
				
					
						|  jokelone | e046553788 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  jokelone | 987a502d7e | 【bug:6380 物料字段拼写有误】 | 6 years ago | 
				
					
						|  WYnneaoapc | 12a66262be | 解决冲突 | 6 years ago | 
				
					
						|  WYnneaoapc | fdd051f2dd | 打印修复 | 6 years ago | 
				
					
						|  qianhs | a55795d43f | 【	VDA收货---预收货的单据,要在页面上可以查询】【bug6465】 | 6 years ago | 
				
					
						|  qianhs | f0b35d1d74 | 【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 【VDA收货---选择ASN订单,点击预收货,预收货成功后,按钮还可以点击。导致数据重复】【bug6464】
【	VDA收货---预收货的单据,要在页面上可以查询】【bug6465】 | 6 years ago | 
				
					
						|  许心洁 | 339a12eba3 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 3781713a29 | 实时库存-条码明细优化查询速度 | 6 years ago | 
				
					
						|  于学杰 | 9e625acc0d | 1. MOVE_TO_ERP 增加是否预收货字段 | 6 years ago | 
				
					
						|  曾贞一 | 3ba4e9b4f1 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 28078287af | 【VDA收货】【预收货的单据,要在页面上可以查询-bug6465】 | 6 years ago | 
				
					
						|  王杰 | f6d50bdfb7 | 【需求:1167,产品批量打包】 | 6 years ago | 
				
					
						|  王杰 | 693ac2451e | 【需求:1167,产品批量打包】 | 6 years ago | 
				
					
						|  于学杰 | 71818c4745 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | db9a698c68 | 1. 增加是否寄售的属性 | 6 years ago | 
				
					
						|  jokelone | 4cec8e8ac8 | 【任务:1193接口物料拆解增加工位字段】 | 6 years ago | 
				
					
						|  汪云昊 | b4976be85e | LAC执行流程调试 UA订阅次数问题 | 6 years ago | 
				
					
						|  王杰 | b15c3f4ae7 | 【需求:1101,定时任务优化】 | 6 years ago | 
				
					
						|  jokelone | 9ca2760866 | 【任务:1193接口repository】/s | 6 years ago | 
				
					
						|  jokelone | 9842ed2181 | 【任务:1193接口pojo】 | 6 years ago | 
				
					
						|  王杰 | e60256e291 | 【需求:1167,包装特殊批次工步】 | 6 years ago | 
				
					
						|  qianhs | 48cbf9d471 | 【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】 【	库存报表中无法看到寄售零件】【bug6331】 | 6 years ago | 
				
					
						|  puxiao.liao | 3bda3169f4 | 【超级移库】bug6295 | 6 years ago | 
				
					
						|  钮海涛 | 9597cee596 | 修复删除对象Bug,关联没有删除问题 | 6 years ago | 
				
					
						|  puxiao.liao | a441633326 | 【超级移库】bug6295 | 6 years ago | 
				
					
						|  crish | 70683025db | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  crish | 97958262b6 | 查询条件优化 | 6 years ago | 
				
					
						|  王杰 | 2660e0268e | 【需求:1198,代码优化】 | 6 years ago | 
				
					
						|  汪云昊 | 7cb9ffd37b | Lac细节优化 OPC调整 | 6 years ago | 
				
					
						|  曾贞一 | 0b9587586d | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 7dbb55bcb0 | 【VDA质检】【缺了检验条码数量是否为-bug6402】 | 6 years ago | 
				
					
						|  WYnneaoapc | 7ba63dc9a8 | 6283 打包扫描 | 6 years ago | 
				
					
						|  陈思洁 | c27daae8e4 | 移动单条码表 --供应商编码 | 6 years ago | 
				
					
						|  陈思洁 | 6de87a1581 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 9969916e0a | 开口合同 -关联单据类型 | 6 years ago | 
				
					
						|  许心洁 | 3005beda46 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  wei.peng | 0e1220c329 | Core 服务 用户查询优化 | 6 years ago | 
				
					
						|  许心洁 | 4ad645d34e | 流程管家新增触发源(放大镜80)+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件 | 6 years ago |