2448 Commits (d18beff50cf8b17aa24bd23b4f1b933d9c52e44e)

Author	SHA1	Message	Date
曾贞一	47ccfcc9e3	【EU成品发运-检查数量组件】【bug1177】 ... 【EU成品发运-检查单据是否操作完成组件】【bug1176】 【EU成品发运-成品发运FIFO推荐组件】【bug1174】	6 years ago
jenkins	2f6400dc78	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	7452d49930	【采购收货】	6 years ago
jenkins	ddee8a5215	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	314aa78336	【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】	6 years ago
crish	4d3adf5daf	Merge branch 'dev' into test	6 years ago
1111	f0290a758d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
1111	e349ab3e9b	【采购收货】	6 years ago
qinjia zou	c051b6024b	【VDA物流路线-路线新增-字段赋值】bug6515	6 years ago
jenkins	04ae04246e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	549f63aa0d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	07bda76d4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	b181cf2ac3	【安全库存拉动】	6 years ago
许心洁	77b921ef38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b0c4d11000	流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）	6 years ago
jenkins	edc281dffe	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qinjia zou	51d70654ef	【欧洲-生产快速入库】bug6389	6 years ago
王杰	ac5432bebb	解决冲突	6 years ago
jenkins	8eb8c2f97e	Merge branch 'master' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	9f9c095846	Merge branch 'dev' into test	6 years ago
1111	d35c6e97cd	【采购收货】	6 years ago
王杰	a595fed4fe	Merge branch 'test'	6 years ago
jenkins	e7bad502c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	96ea008725	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c0d8375d0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
1111	41a48b4b59	【采购收货】 采购收货	6 years ago
许心洁	8d6a2b53b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b7c6189308	生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）	6 years ago
汪云昊	68f31721f0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qianhs	d4422bee15	【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】	6 years ago
王杰	7f08847c50	Merge branch 'test'	6 years ago
王杰	6297ccc4d7	Merge branch 'dev' into test	6 years ago
陈思洁	5050c0c5a1	新增实体--安全库存	6 years ago
qinjia zou	2210482918	【自动入库】bug6390	6 years ago
wei.peng	02a9c64a42	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qinjia zou	a8ebcb669b	【自动入库】bug6390	6 years ago
qinjia zou	6e8977e5aa	【自动入库】bug6390	6 years ago
陆卫豪	4a76c480ac	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	6 years ago
jenkins	f76aaddbd5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	a55795d43f	【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
qianhs	f0b35d1d74	【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 ... 【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】 【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
jenkins	4d2a2a35b0	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	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
于学杰	71818c4745	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	db9a698c68	1. 增加是否寄售的属性	6 years ago
王杰	1a7164c474	Merge branch 'dev' into test	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
王杰	57253ea87b	Merge branch 'dev' into test	6 years ago
puxiao.liao	a441633326	【超级移库】bug6295	6 years ago
crish	5b6b303722	Merge branch 'test'	6 years ago
crish	17d5f1e512	Merge branch 'dev' into test	6 years ago
crish	410558d43c	Merge branch 'test'	6 years ago
曾贞一	7dbb55bcb0	【VDA质检】【缺了检验条码数量是否为-bug6402】	6 years ago
jenkins	b5685a7874	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	c27daae8e4	移动单条码表 --供应商编码	6 years ago
王杰	9137555226	Merge branch 'dev' into test	6 years ago
puxiao.liao	21375ed6f4	【超级移库】bug6295	6 years ago
jenkins	c1b50db526	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
puxiao.liao	1f85c75f6c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	9b8d4c900b	【事物查询】bug6294	6 years ago
1111	2077c651e7	【采购收货】	6 years ago
许心洁	60c25d7a71	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	ccb29c5903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
1111	2f2c843006	【坤泰-采购收货】包装关系	6 years ago
许心洁	208410340e	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
王杰	ab34ebb769	Merge branch 'dev' into test	6 years ago
qianhs	62bb71f4b0	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
许心洁	6d9787dc65	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lpx	94dc90172d	【扫描查询】bug6246	6 years ago
张哲铭	578be0650a	Merge branch 'dev' into test	6 years ago
1111	7378df1b9e	【宁德问题清单】	6 years ago
张哲铭	6871e96496	Merge branch 'dev' into test	6 years ago
1111	88a69ac7f8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	71c867dd8c	【包装规格】	6 years ago
许心洁	ac43296df3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5dc8ffb394	日志处理队列V1.0	6 years ago
crish	c4d7a2380c	Merge branch 'test'	6 years ago
张哲铭	efbe0dfce9	Merge remote-tracking branch 'origin/dev' into test	6 years ago
lpx	fc49ddeea5	【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】	6 years ago
许心洁	e433915759	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	be75c4ec42	【VDA质检--物料信息维护】任务号1135 ... 【VDA质检--检查数量组件--修改】任务号1134 【VDA质检--检查质检箱数组件】任务号1133	6 years ago
许心洁	017cd18950	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	d428aa302d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b7071bd0db	供应商字段 添加	6 years ago
王杰	d2c7a81893	Merge branch 'dev' into test	6 years ago
陈思洁	3ef115bbe2	新增冗余字段	6 years ago
许心洁	219bf6db9a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	457e10bc75	1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】	6 years ago
许心洁	04453aa706	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gaochangjiang	d0165fd342	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	2414993cf9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	777060450e	新增字段--目标库位	6 years ago
gaochangjiang	047b9d5e35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gaochangjiang	02e3ac4960	【库存预警】bug 修复库存预警	6 years ago
王杰	2417b40635	Merge branch 'dev' into test	6 years ago
于学杰	80c340308a	1. 修改通用接口POJO中的字段长度	6 years ago
许心洁	c9f26c22c1	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	bbec6a1002	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b112bdb5e8	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
王杰	9446a76159	Merge branch 'dev' into test	6 years ago
曾贞一	1357dfad30	【VDA收货-- 前端PC端POsn页】任务号1102 ... 【VDA收货-- 问题清单中加密库位】任务号1104 【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112 【VDA收货-- 对于分组数据如何查看分组信息】任务号1111	6 years ago
许心洁	c79786a677	合并开发分支的代码POM文件被改成DEV修改回TEST	6 years ago
许心洁	dd86ce354a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b8842edbb1	无条码打印：新功能开发完成	6 years ago
crish	88af19f8e9	修改开发环境pom文件test为dev	6 years ago
changjiang.gao	13066bd4d1	【库存预警】bug 243	6 years ago
crish	18161e8191	Merge branch 'test'	6 years ago
许心洁	3bc277178e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	a90aa8498f	实体修改字段类型【int】改成【Integer】	6 years ago
许心洁	0c20a2b655	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	e5b5891d23	bom信息中新增冗余字符	6 years ago
许心洁	f5a8e9f130	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	610a96d2ee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6b9c7b3ced	【VDA库存调整盘点】 添加供应商字段	6 years ago
许心洁	77fefbcf74	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	04df70114d	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e593cc875d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
changjiang.gao	2ba7596a57	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	25f11781c1	盘点差异增加字段	6 years ago
许心洁	ba7fe81978	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5956d5a08e	冲销：需求变更优化	6 years ago
曾贞一	26b4a5c52c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	a9045ed403	bug 5953	6 years ago
陈思洁	a54d711d95	#1085 BOM导入接口新增	6 years ago
crish	15e812c7a6	Merge branch 'test'	6 years ago
许心洁	02055a8b7e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	18789939b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	0526da8ee3	Merge branch 'test'	6 years ago
crish	cd74f5336f	Merge branch 'dev' into test	6 years ago
于学杰	dbc69e957a	1. 供应商物料实体增加字段	6 years ago
刘辉	e89df89f9a	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	3ab8cf112d	盘点条码差异	6 years ago
刘辉	febbea09c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	8808a77de6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	69e8357c69	条码数量编辑	6 years ago
于学杰	63e225026c	1. 扩展通用接口功能，支持与软适配的对接	6 years ago
刘辉	4ffc63ce83	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	f6be80db01	增加groupby 构造函数	6 years ago
许心洁	a1597c089c	成品冲销+导入转换格式（就一个不知道是什么单导入）	6 years ago
crish	1de89d732b	本地误拉了test代码，解决pom	6 years ago
crish	9f9874902d	冲突解决	6 years ago
曾贞一	e603ac66a7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	16839f6911	成品冲销+抛异常方法封装优化	6 years ago
许心洁	2f843a8f5a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	88754f9a71	收货看板重写	6 years ago
于学杰	68a6c85068	Merge branch 'dev' into test	6 years ago
陈思洁	cd8bd3a68b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3828b4863c	添加保质期字段	6 years ago
曾贞一	dfdb6be4bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6a9924eda6	【VDA生产领料】 FIFO推荐组件	6 years ago
wei.peng	e7e4a8587f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	fcefe8de38	1. 通用接口增加调用软适配的功能（使用脚本引擎实现）	6 years ago
许心洁	7863325afd	本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原	6 years ago
许心洁	b7b78b85ac	误拉了test分支的代码：还原	6 years ago
刘辉	83a7a9e988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	9e1b86eb2b	导出显示bug修改	6 years ago
许心洁	8deff73454	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	647508d92c	导出显示bug修改	6 years ago
刘辉	722146acd8	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	29fee6b028	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	746a04f96d	代码格式优化	6 years ago
许心洁	6fc4474699	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	a4d873f36f	添加过滤条件	6 years ago
crish	672438f2c0	Merge branch 'test'	6 years ago
许心洁	04cdf58aef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	abd2321850	格式化代码	6 years ago
crish	0924810e64	Merge branch 'test'	6 years ago
许心洁	89ab1816e3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	71a68e8cf6	枚举	6 years ago
王杰	18bc35f60d	Merge branch 'dev' into test	6 years ago
lbwgithub	473e2caea0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	2cf4759c21	枚举	6 years ago
刘辉	60d1798b9c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	0bdc3592e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f67e7df17f	新增冗余字段	6 years ago
曾贞一	320c7f6b1f	【生产快速入库】生产快速入库导入接口	6 years ago
许心洁	1e41ab2e39	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
曾贞一	9d3b45d2e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ddd91f51b5	【生产快速入库】组件选择，任务编号1051	6 years ago
许心洁	232c675444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	84a96a22fa	新加NotNumBiggerPackContainsZero方法	6 years ago
许心洁	1b5df102e7	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	95f156adf4	所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double	6 years ago
许心洁	1a7b4e3438	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘辉	1defd0d8be	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	113bb8755d	解决冲突	6 years ago
陈思洁	4ac7bae38b	新增hql	6 years ago
bleakney.liu	0fa1ffa23b	[物流线路修改]修改数据类型	6 years ago
bleakney.liu	f682d056be	[物流线路管理]修改查询条件	6 years ago
许心洁	653c8dca1f	直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误	6 years ago
曾贞一	2b62357ab5	VDA收货【生产快速入库】组件，任务编号1051	6 years ago
许心洁	10fcc569bd	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e90c59ccf2	生产报工当查询到多条子物料时查询的SQL没有返回itemQty	6 years ago
许心洁	e35cf183da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	4fc72ca358	条码模型	6 years ago
lbwgithub	81d86d1bd2	条码模型	6 years ago
许心洁	7a403a37da	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
jenkins	99382a8fca	Merge branch 'dev' into test	6 years ago
曾贞一	c509f3c707	VDA 生产快速入库	6 years ago
jenkins	0982f01eb2	Merge branch 'dev' into test	6 years ago
陈思洁	26684524f1	生产报工组件和生产报工标签组件提交	6 years ago
jenkins	7e3edd06a0	Merge branch 'dev' into test	6 years ago
陈思洁	3ba6508b0c	新增打印机配置表	6 years ago
陈思洁	22fbbe2a91	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	edfc78995b	新增打印机配置表	6 years ago
刘敏	8a94b054d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	c2a75d96da	实体字段get方法修改	6 years ago
jenkins	607d8202ae	Merge branch 'dev' into test	6 years ago
许心洁	f1f712c997	流程管家关联查询流程明细BUG：导致流程错乱	6 years ago
crish	9ae6ee5016	Merge branch 'test'	6 years ago
jenkins	d5349806c9	Merge branch 'dev' into test	6 years ago
许心洁	dcf326366e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	8f7d3b371b	流程管家：回显给前端当前步骤参数类型	6 years ago
jenkins	829171f8a4	Merge branch 'dev' into test	6 years ago
刘敏	e42cd80b8b	条码打印枚举添加待退料状态	6 years ago
jenkins	38f2716a76	Merge branch 'dev' into test	6 years ago
刘敏	bc1dea29ad	po、asn查询条件添加	6 years ago
jenkins	7ce12a9c85	Merge branch 'dev' into test	6 years ago
刘敏	522efe67b6	excel导出优化--单据状态显示枚举描述	6 years ago
jenkins	cbc5882bd5	Merge branch 'dev' into test	6 years ago
刘敏	0f82f3fbe5	导出状态添加	6 years ago
jenkins	c29c350ef8	Merge branch 'dev' into test	6 years ago
许心洁	e5591eafc5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	4b17c6ca69	Merge branch 'dev' into test	6 years ago
刘敏	e02f2bfeee	单据条码实体临时字段增加	6 years ago
许心洁	ec3ef597e8	根据工厂代码调整库存	6 years ago
crish	f3f77e63b3	Merge branch 'test'	6 years ago
crish	4d5497929a	Merge branch 'dev' into test	6 years ago
刘敏	ed29263655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	adf699f618	移动单表是否快照临时字段新增	6 years ago
bleakney.liu	53dd9cface	add 物流路线pojo	6 years ago
刘敏	f6e9dd03b4	库存快照job开发【任务1011】	6 years ago
刘敏	4e46760fb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	f57dd8e999	库存信息表、库存条码、移动单三张表快照时间新增	6 years ago
曾贞一	6c8cfd8678	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	a4262c5e1e	pom文件修改 dev改成test	6 years ago
crish	b473fd1b46	pojo开发环境 pom文件修改为dev	6 years ago
crish	87f8dc38a6	测试环境	6 years ago
crish	96fd66456e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	d82e025eb9	dev环境pom文件修改为dev	6 years ago
于学杰	c974cf1450	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	d273159e3e	1. 增加目的质量状态（规则表）	6 years ago
wei.peng	61b0dfdc3b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	cb5eb56fe4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	5d1e6e8474	VDA收货 库位推荐入库规则	6 years ago
刘敏	baf39dc0ce	生产退料导入实体新增	6 years ago
刘敏	809478be44	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d8bc8d713d	条码打印model字段添加	6 years ago
wei.peng	41588f37d7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
bleakney.liu	2c146d39bf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	e52c310d38	add 入库pojo 和response	6 years ago
jimmy.zeng	4bfa05698f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	9e2169fa87	推荐入库 组件开发	6 years ago
曾贞一	512ebb495c	VDA收货 提交组件	6 years ago
于学杰	f6bb2ee21f	Merge branch 'dev' into test	6 years ago
曾贞一	f17c1d3d25	推荐入库 组件开发	6 years ago
jenkins	26179650f0	Merge branch 'dev' into test	6 years ago
许心洁	787f12387d	流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理	6 years ago
jenkins	bca4f7745f	Merge branch 'dev' into test	6 years ago
许心洁	de6792426e	流程管家：单据完成提交所有待提交移动单；只推送当前移动单 ... PDA收货组件：改数后删除历史记录BUG修复	6 years ago
wei.peng	4ca0851386	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d509e5755a	vda 收货超收处理	6 years ago
jenkins	603647bc82	Merge branch 'dev' into test	6 years ago
曾贞一	c5f43236a3	开口合同与po关系	6 years ago
汪云昊	f978ee39c8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	05dc432c57	1. 增加关联单位和关联数量字段	6 years ago
jimmy.zeng	bd466610d5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	72fec8146d	修改	6 years ago
jimmy.zeng	d23045a667	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5b6477bba6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	510485d2f0	excel导出优化--单据状态显示枚举描述	6 years ago
许心洁	59569cef66	移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+ ... 交易处理组件（出入移库）：待入库的可能是不合格的+ 公共PDA组件抛异常获取值为空	6 years ago
crish	35beb0c60e	Merge branch 'dev' into test	6 years ago
陈思洁	02270ea6e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f5d2398e0e	VDA收货--开口合同增加字段 ... 供应商增加字段	6 years ago
于学杰	01c58e8653	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	3454712bd2	1. 增加库存快照的类文件	6 years ago
刘敏	5b7ac2c344	ASN字段修改	6 years ago
刘敏	c7734b7e26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5144d15ac4	采购单报表开发	6 years ago
crish	bbfc9b320f	Merge branch 'test'	6 years ago
crish	4a1ad40dfa	Merge branch 'dev' into test	6 years ago
许心洁	03ef38f853	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	315787197a	交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性	6 years ago
曾贞一	b5dfa7dbd2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8d6e4fdfa5	盘点实盘导入功能	6 years ago
陈思洁	677632748d	VDA收货逻辑组件修改--修改sql中增加库存地字段显示	6 years ago
刘敏	4c39e84094	asn主表添加	6 years ago
陈思洁	3b174fc782	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f63cd5071b	新增开口合同实体	6 years ago
许心洁	a959964950	移动单三张表加上乐观锁	6 years ago
jimmy.zeng	ccffe9b7bd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	229587fcf3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ceced4c4b6	欧洲项目 检查数量 批次格式组件编写	6 years ago
刘敏	241a478f65	excel导出优化--单据状态显示枚举描述	6 years ago
刘敏	f0fba5e23a	盘点枚举添加--excel导出	6 years ago
刘敏	8ac4f214b3	#5596	6 years ago
jimmy.zeng	836b0e933e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	09aab6d87a	盘点添加 存储区多个查询	6 years ago
jimmy.zeng	a4725e20c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	a12a008713	盘点库位添加查询条件	6 years ago
jimmy.zeng	fd76f08af4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	8b9a4fb109	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	575aa6ea2f	库存移动单报表 添加修改人，修改时间的查询条件和列表	6 years ago
刘敏	e4cf678000	构造新增字段	6 years ago
jimmy.zeng	8f1ac3fdae	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	c05b22668f	字段修改	6 years ago
jimmy.zeng	835245f8f4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	2108a7f8e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	4852a4754c	字段枚举值添加	6 years ago
许心洁	7da95b1ad2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	876571e877	任务：994；BUG：5498	6 years ago
jimmy.zeng	6e48f0a677	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d8568e6d22	盘点优化代码。	6 years ago
曾贞一	5290ba6f63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	01cb76da6d	指令移库 根据目标存储区扫描库位	6 years ago
刘敏	836f1bf870	字段修改	6 years ago
陈思洁	2af903f029	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	254f08da32	物料描述修改	6 years ago
jimmy.zeng	2e8a70d8b4	pom版本还原--pojo	6 years ago
刘敏	0faeaa6047	导出枚举添加	6 years ago
刘敏	193eba75d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5b735fe3a2	移动单枚举导出	6 years ago
许心洁	71b6c64ed0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	5f539afd6d	移动单明细注解添加	6 years ago
许心洁	84ace781a3	流程添加默认值方式错误	6 years ago
许心洁	503b68a0a5	拉了测试的代码POM文件错乱	6 years ago
许心洁	6068ca9fd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	cafd923d3a	流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）	6 years ago
许心洁	706ddcbba7	流程新增初始化组件明细组件赋默认值0	6 years ago
jimmy.zeng	4f58949e2d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5ea81cc34e	实体修改	6 years ago
陈思洁	2a90329fcf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	63be82f044	实体修改	6 years ago
jimmy.zeng	73b6088977	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	d484efb69e	明细构造新增	6 years ago
crish	5e06022e51	Merge remote-tracking branch 'remotes/origin/dev'	6 years ago
jimmy.zeng	2a7ba550d6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	b1dd7d3915	合并冲突	6 years ago
陈思洁	d269576dbf	新增字段	6 years ago
jimmy.zeng	154730e69b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	ac1090d661	报表返回字段信息添加	6 years ago
曾贞一	ae12af551b	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	cfc0de67cf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	56a4d6b362	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	19253a9b6a	构造函数新增条码	6 years ago
wei.peng	96a29d3de8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	18dac2b569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy.zeng	1b06c1d07f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	592cd15add	调试枚举删除、库位导入工厂字段添加	6 years ago
许心洁	9de4d79009	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	d2036fd841	任务961，962，966，973	6 years ago
曾贞一	25e7ca08d3	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	7e5d2e1e56	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	18eff49e63	hql语句拼接修改	6 years ago
陈思洁	11aff72404	新增冗余字段	6 years ago
曾贞一	5aceaca82d	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	61822039c5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	3f5f89bd1b	流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）	6 years ago
曾贞一	18aff86ea0	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	188e2b5efd	pom版本还原	6 years ago
于学杰	921859b996	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	fe65067ca2	1. 增加 IOT 接口配置表的 POJO	6 years ago
曾贞一	b10b967b73	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	d340133e7a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	f56f8d714b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	617bb73dad	增加业务类型字段、修改临时变量字段类型 ... 修改hql查询字段	6 years ago
刘敏	a83b552203	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	2bc04b407e	计划日期、时间新增	6 years ago
许心洁	cb49d8d848	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ffb6f8a17c	任务列表不分页，主要查询字段加索引	6 years ago
jimmy.zeng	4359f347c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	acd1e6cfb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ce70994a57	盘点 按照盘点差异类型汇总	6 years ago
jimmy.zeng	a2a4dc6beb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4d00397411	修改盘点范围的排序规则	6 years ago
wei.peng	e8741ec364	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	b3a552d65d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	070bacf20e	所有外部单据增加创建时间和创建人的查询条件	6 years ago
曾贞一	7fab9a4d89	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	0d532b78c0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	e1cb06da5c	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	483ea59142	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	7a935276a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	bc953bb2c8	查询条件封装	6 years ago
刘敏	de381d438a	领料单模板创建	6 years ago
曾贞一	9d70008912	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	61ce4d1b3f	优化	6 years ago
汪云昊	b9d9d7402e	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	ef40914935	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	e9c596adce	盘点hql排序修改	6 years ago
jimmy.zeng	02baed5dbf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4573b09392	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	2058789438	盘点业务修改bug	6 years ago
jimmy.zeng	7002ac5a8a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	abf155ecd9	库存报表 创建人、创建时间添加	6 years ago
jimmy.zeng	221f05b175	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	839c139222	库存移动条码报表优化	6 years ago
jimmy.zeng	235498b162	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	638d9cb1a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9ff9c11c97	字段调整	6 years ago
曾贞一	fbe8544a02	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	cef48801df	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	a713e835fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	aee54acafc	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	ff52a412d4	库存初始化信息	6 years ago
陈思洁	b604c5d9a0	交易记录增加字段	6 years ago
许心洁	92d4bf46ce	#5255,#5039	6 years ago
曾贞一	7a62200736	Merge remote-tracking branch 'remotes/origin/test' ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	6 years ago
曾贞一	7ca6e46e4b	Merge branch 'dev' into test	6 years ago
jimmy.zeng	bf293d4758	生产报工时，原材料move单号写入关联移动单号中	6 years ago
刘敏	dacc203119	库存报表修改	6 years ago
曾贞一	380efb664e	Merge branch 'dev' into test	6 years ago
刘敏	8034e9e505	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	da1c9af3d4	库存报表新增	6 years ago
曾贞一	47d4a53706	Merge branch 'dev' ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	6 years ago
曾贞一	8b457c0618	DEV 合并 TEST pom.xml文件修改	6 years ago
于学杰	4235184afc	Merge branch 'Process' into dev	6 years ago
于学杰	e7913cfb26	1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV	6 years ago
于学杰	24da688384	Merge branch 'test' into dev	6 years ago
许心洁	b3f4e62a74	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
刘敏	794d4b69d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	145600a5d0	单据查询精准查询	6 years ago
许心洁	31313baec9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
许心洁	f6c425c649	平台获取设备ID方式改变+所有pojo加上序列化	6 years ago
曾贞一	3db421b825	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b3a0a71065	库存初始化信息	6 years ago
wei.peng	837d6ea567	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	af7b2404dd	Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
许心洁	d8786d8132	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	a4f2a7c848	hql修改asn订单明细	6 years ago
peter.pan	f365dc197f	Merge branch 'test'	6 years ago
peter.pan	4d83030c51	Merge branch 'dev' into test	6 years ago
许心洁	6431417462	dragon	6 years ago
许心洁	fb0cc3446b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1037f55f7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	30750923d1	字段修改类型	6 years ago
刘敏	871dbed84a	查询条件封装	6 years ago
peter.pan	363d521c36	Merge branch 'test'	6 years ago
peter.pan	d45b7b77f3	Merge branch 'dev' into test	6 years ago
曾贞一	f20c33b7f5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	898e1d39d4	盘点结果回传ERP，写入move_to_erp时做单位转换 ... 原材料扣减，单位转换	6 years ago
许心洁	bb8078cb94	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	059688410c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	17be4078be	设备信息开发	6 years ago
许心洁	b2328bb085	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	901fea5339	Merge branch 'test'	6 years ago
peter.pan	1fe05ab150	Merge branch 'dev' into test	6 years ago
曾贞一	c3fe273954	解决冲突	6 years ago
许心洁	60e6d51d35	流程管家2.0	6 years ago
peter.pan	39c5866084	Merge branch 'test'	6 years ago
peter.pan	4393c02bb3	Merge branch 'dev' into test	6 years ago
许心洁	4bad223c0d	直送发运JOB	6 years ago
曾贞一	7a4d68c409	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	a7144e3a1f	同步标识 2	6 years ago
刘敏	e09ad49fc9	物料新增结算供应商字段	6 years ago
peter.pan	161f8faee5	Merge branch 'test'	6 years ago
peter.pan	1c69b311a6	Merge branch 'dev' into test	6 years ago
刘敏	bfcd3ebaf0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
peter.pan	19871c5f27	Merge branch 'test'	6 years ago
peter.pan	8f977719c0	Merge branch 'dev' into test	6 years ago
刘敏	0a78cf4ec5	数字类型新增get	6 years ago
许心洁	ce7095932c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	1de613a09c	同步频率	6 years ago
peter.pan	31d49a1298	Merge branch 'test'	6 years ago
peter.pan	739f12657e	Merge branch 'dev' into test	6 years ago
刘敏	07008f8e1b	实体修改	6 years ago
peter.pan	562ea029fc	Merge branch 'test'	6 years ago
peter.pan	5c48b2eb79	Merge branch 'dev' into test	6 years ago
曾贞一	df49ab097b	赋默认值“待同步”为1	6 years ago
刘敏	f8fd8dbab0	同步标识修改	6 years ago
peter.pan	47238f131b	Merge branch 'test'	6 years ago
peter.pan	8daa2789a4	Merge branch 'dev' into test	6 years ago
曾贞一	1d1a2ac8b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	cf33f70e31	代码规范	6 years ago
刘敏	2aa1e9811e	数字类型方法重写	6 years ago
peter.pan	fdfdc9befb	Merge branch 'test'	6 years ago
peter.pan	bc9ac8d207	Merge branch 'dev' into test	6 years ago
刘敏	98d660f907	实体新增	6 years ago
刘敏	7811157312	实体字段新增	6 years ago
曾贞一	792dc0a190	WMS_MOVE_TO_ERP 增加字段年份	6 years ago
peter.pan	0692087834	Merge branch 'test'	6 years ago
peter.pan	5a195bfe2e	Merge branch 'dev' into test	6 years ago
曾贞一	2045b33801	单据锁定 SapOrderLock 添加字段同步标识	6 years ago
许心洁	6e30549ad4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	00fc0de4a9	冲突	6 years ago
许心洁	742e0a6f49	冲突	6 years ago
于学杰	6598a829e0	Merge branch 'dev'	6 years ago
jenkins	7bcff3cc66	Merge branch 'dev' into test	6 years ago
jenkins	cd70d9f66a	Merge branch 'dev' into test	6 years ago
刘敏	89edbcb80a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	98041fe58d	流程管家优化	6 years ago
刘敏	b4a538ebb5	单位换算	6 years ago
曾贞一	0341dd2f5e	bug #5030	6 years ago
jenkins	bc7267b777	Merge branch 'dev' into test	6 years ago
于学杰	63d7c2c6b8	1. 增加脚本引擎的POJO注释	6 years ago
刘敏	eafdcac5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	23c4b0742d	库存条码管理查询条件封装	6 years ago
jenkins	595a81f4b9	Merge branch 'dev' into test	6 years ago
jenkins	812be94ed3	Merge branch 'dev' into test	6 years ago
曾贞一	d5d6e21a15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8c5f7906af	bug #5038 ... bug #5045	6 years ago
刘敏	03a261a048	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jenkins	8c9a790faa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	0fc49d5b2a	IQ、OQ增加工厂字段	6 years ago
刘敏	9a61249756	库存条码管理查询条件封装	6 years ago
曾贞一	062f4becf4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	471aec30fe	开发 WIP报废出库	6 years ago
jenkins	11cdc2bfa3	Merge branch 'dev' into test	6 years ago
刘敏	ddedecc11c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5d7a44cec3	库存条码管理查询条件封装	6 years ago
曾贞一	1716628563	开发 发泡打箱包装job	6 years ago
jenkins	409cbb8492	Merge branch 'dev' into test	6 years ago
许心洁	db3d47cd6e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	4a717ec544	直送发运JOB+交易处理程序（下线结算）逻辑变动	6 years ago
jenkins	f4141fd2c6	Merge branch 'dev' into test	6 years ago
曾贞一	c3ddcbb81a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	86d3f8de48	开发 发泡打箱包装job	6 years ago
jenkins	40e20f7054	设备编号	6 years ago
jenkins	c969b09b85	Merge branch 'dev' into test	6 years ago
曾贞一	3f5c28e1af	盘点单 优化提交组件回显信息 ... 复盘开发 部分业务增加模糊查询	6 years ago
jenkins	e3819b31f5	Merge branch 'dev' into test	6 years ago
刘敏	7d5ea5bfec	客户物料号默认值	6 years ago
jenkins	577e1372ab	Merge branch 'dev' into test	6 years ago
陈思洁	a064c6b84a	枚举新增条码类型 ... 库存条码表新增字段	6 years ago
peter.pan	4149183450	Merge branch 'dev' into test	6 years ago
陈思洁	48ab7a49d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	ecd72ed41e	ASN订单明细数据新增分组查询接口	6 years ago
peter.pan	e2fde20be5	Merge branch 'dev' into test	6 years ago
刘敏	73b5758dc4	移动单主表返回数据	6 years ago
peter.pan	460dff866f	Merge branch 'dev' into test	6 years ago
曾贞一	77d6345c15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6a2b19d3e3	bug #4953	6 years ago
peter.pan	79d4055ab7	Merge branch 'dev' into test	6 years ago
许心洁	9a60664fb3	需求变更：ASN订单类型为AMP时任务明细的业务类型描述要给AMP ... +BUG:交易处理组件：下线扣减：物料可能没有维护默认入库库位	6 years ago
peter.pan	541198a1e9	Merge branch 'dev' into test	6 years ago
曾贞一	d258b846ac	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	483b93cb9f	bug #4939 ... #4914	6 years ago
陈思洁	25d8df360d	实体字段修改hql	6 years ago
peter.pan	0526fcf05c	Merge branch 'dev' into test	6 years ago
陈思洁	df8d025668	接口映射表基础数据维护	6 years ago
陈思洁	a3ccb4d449	hql提交	6 years ago
peter.pan	7c8e02c0c9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	51efe95e86	pojo	6 years ago
陈思洁	1514f9434e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	623d17a2ec	字段默认值赋值	6 years ago
刘敏	b941354087	盘点导入默认值	6 years ago
于学杰	6ba7a43ea7	Merge branch 'dev'	6 years ago
于学杰	4350a82043	1. 完善脚本引擎	6 years ago
于学杰	ca658628c8	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # pom.xml	6 years ago
刘敏	72ac1f39f4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d75570c987	库存报表问题修改	6 years ago
于学杰	5dc8cd5bda	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	02044789dc	1. TO ERP 增加单据行号字段 ... 2. 脚本引擎 & 规则引擎 增加工厂代码	6 years ago
陈思洁	f26cdda8ec	实体新增字段	6 years ago
Chnx	eb4914ae7a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Chnx	9c189dce3c	库存移动单查询接口	6 years ago
peter.pan	24f7ae3471	Merge branch 'test'	6 years ago
peter.pan	53d34096f7	Merge branch 'dev' into test	6 years ago
刘敏	cf7957525a	盘点指令默认值赋值	6 years ago
刘敏	6861d44a1c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	a1a77b63db	下线结算标识、是否录入生产批次。 ... POJO默认赋值2	6 years ago
peter.pan	d9ef2677fb	Merge branch 'dev' into test	6 years ago
shiyanghuan	b2866c85dd	bug修改	6 years ago
peter.pan	f4613c2f5c	Merge branch 'test'	6 years ago
peter.pan	61ecc2a74f	Merge branch 'dev' into test	6 years ago
陈思洁	d47c9f8650	合并冲突pojo	6 years ago
陈思洁	f0e0867e2c	库存移动pojo新增字段	6 years ago
wei.peng	a1f8ca3096	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
shiyanghuan	b330676d61	库存报表业务改动以及bug修改	6 years ago
shiyanghuan	af278555d0	库存报表业务改动以及bug修改	6 years ago
Chnx	0c841b645e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Chnx	8f182f962d	库存移动单查询接口	6 years ago
刘敏	d2839f6cf2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	58b067e3cc	库存报表存储区级联子存储区查询	6 years ago
peter.pan	5741bfa2e6	Merge branch 'test'	6 years ago
peter.pan	5bed1d27ec	Merge branch 'dev' into test	6 years ago
陈思洁	79b36a30a4	冲突合并	6 years ago
陈思洁	fe3d392e9b	新增枚举信息 ... 移库单明细表冗余主表临时字段 新增物料表字段	6 years ago
曾贞一	1f0bfd4554	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	cf96de8043	盘点 盘点差异结果同步ERP	6 years ago
刘敏	8f5d952c4f	单位查询工厂添加	6 years ago
peter.pan	53135c27f5	Merge branch 'test'	6 years ago
peter.pan	b39d7038fa	Merge branch 'dev' into test	6 years ago
许心洁	e6d60f6886	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	dec3743911	流程管家推队列查询条件没有封装	6 years ago
peter.pan	1d9683b05f	Merge branch 'test'	6 years ago
peter.pan	36b2d36fdd	Merge branch 'dev' into test	6 years ago
曾贞一	51753bb237	bug#4515	6 years ago
peter.pan	eeefb843b4	Merge branch 'test'	6 years ago
peter.pan	37b8755485	Merge branch 'dev' into test	6 years ago
shiyanghuan	073393a5b1	bug修改	6 years ago
shiyanghuan	7dd78d1983	bug修改	6 years ago
shiyanghuan	172fc81bee	bug修改	6 years ago
许心洁	e43c493463	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	994da92b4e	交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG	6 years ago
peter.pan	c02d22ecba	Merge branch 'test'	6 years ago
peter.pan	b18d393fe0	Merge branch 'dev' into test	6 years ago
曾贞一	81ed2465e3	盘点实盘信息 增加字段 是否范围内	6 years ago
peter.pan	52addcf5ea	Merge branch 'dev' into test	6 years ago
shiyanghuan	7ee861d61e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
shiyanghuan	2c28d6303f	bug修改	6 years ago
peter.pan	543171dfbb	Merge branch 'dev' into test	6 years ago
许心洁	f853f06ceb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	97b60f0906	下线结算HQL的BUG	6 years ago
jiajack	681ca7eebe	修改取值为空时的问题	6 years ago
peter.pan	c436c8ee3d	Merge branch 'test'	6 years ago
peter.pan	bd28a7ac63	Merge branch 'dev' into test	6 years ago
peter.pan	1ee48f4ef8	xxx	6 years ago
陈思洁	fede09a5eb	WMS_ERP库存移动表修改item的数据类型	6 years ago
刘敏	7be287137a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	19b5764776	收货回执打印信息新增 供应商字段新增 出库条码规则校验修改	6 years ago
jiajack	7b70f47c64	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	27ba751a09	修改iqc数据库默认值	6 years ago
peter.pan	e3354f52bd	Merge branch 'dev' into test	6 years ago
shiyanghuan	52b9e09835	条码打印-条码模糊查询	6 years ago
许心洁	9b9f94f059	盘点调差暂时处理	6 years ago
peter.pan	b8730fac47	Merge branch 'dev' into test	6 years ago
许心洁	ebf517cb3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	81eb13bafd	写入SAP单据锁定表	6 years ago
peter.pan	628f1db31c	Merge branch 'dev' into test	6 years ago
曾贞一	529617a8b7	优化	6 years ago
peter.pan	96264870c2	Merge branch 'dev' into test	6 years ago
许心洁	efbe9dac9e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	bf02cbf8a4	PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算	6 years ago
shiyanghuan	cef6d9c3ad	bug修改	6 years ago
peter.pan	99710d5c20	Merge branch 'test'	6 years ago
shiyanghuan	da5d5d1af0	客户编号-模糊查询	6 years ago
peter.pan	9c38ed702a	Merge branch 'dev' into test	6 years ago
shiyanghuan	e00a0a9d9d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
shiyanghuan	c2609be241	作业类型分页查询 模糊查询	6 years ago
刘敏	97adebba21	枚举新增 实体字段新增	6 years ago
刘敏	eefaf55f24	供应商字段类型修改	6 years ago
刘敏	7fc7fab54c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	493fbb83d9	条码查询条件	6 years ago
peter.pan	3b1d19bbab	Merge branch 'dev' into test	6 years ago
曾贞一	a7fbc9e58f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b5ff789263	开发 wms推送AMP库存数据	6 years ago
陈思洁	a8dee4713a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	31f6f4deef	枚举字段新增AMP ... ASN主表、生产报工明细表新增属性 hql查询ASN主表信息	6 years ago
刘敏	16301be9dc	JOB开发实体新增	6 years ago
刘敏	3090b2aaad	实体缺失字段新增	6 years ago
刘敏	8cbc19eb37	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	da12d8f6b0	错误信息字段冗余	6 years ago
许心洁	c7aca0a94d	交易处理主程序转换数据错误+出入移库查找添加条件	6 years ago
peter.pan	f4bf536296	Merge branch 'test'	6 years ago
wei.peng	ee5a4f1dfe	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	703dc6851c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	f85a0296ae	开发 bom拆解功能	6 years ago
于学杰	dd2408cd4a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	72ef115db8	1. 批次字段不允许为空	6 years ago
刘敏	0a69cddb53	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	b98b48e4e5	SAP_产品报工汇总表新增	6 years ago
陈思洁	ede4458709	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	6f41158ecb	生产发运新增实体属性	6 years ago
刘敏	08af5fde04	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	a551249165	Merge branch 'dev' into test	6 years ago
于学杰	bc6d7f5c4d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	e7bd528736	1. 设置 is_sync 字段不允许为空，默认值为 2	6 years ago
陈思洁	d9d776060f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	557880ffd2	生产报工明细实体修改	6 years ago
shiyanghuan	b29d5722bc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
shiyanghuan	31b7e2d8dc	库存交易报表和未完成订单报表bug修复	6 years ago
peter.pan	d39c16c5d5	Merge branch 'test'	6 years ago
peter.pan	49d35f264e	Merge branch 'dev' into test	6 years ago
于学杰	35f92b05e3	1. 修改ERP接口暂存表的字段，增加关联单据类型	6 years ago
刘敏	787eaaf53d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	1ee9cb24f2	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	2b1414814c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	baeb202ca5	1. 增加查询系统配置参数的结构	6 years ago
peter.pan	7861048e31	Merge branch 'test'	6 years ago
陈思洁	1b1f2aca51	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	2ce560b39f	生产报工明细实体修改和枚举新增	6 years ago
刘敏	7ac3509f96	状态查询添加是否有效	6 years ago
shiyanghuan	400b380b55	未完成订单查询报表代码提交	6 years ago
jenkins	470d319504	Merge branch 'dev' into test	6 years ago
陈思洁	4a4a50638c	生产报工明细实体提交	6 years ago
刘敏	98229202b8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d91c9138b3	字段新增	6 years ago
sky.meng	2f1a3080ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
sky.meng	05c56e46b4	库存预警看板开发	6 years ago
刘敏	d7f15cddef	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ae4e31e22c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	484c5942e8	所有业务单据Item属性都用String类型	6 years ago
peter.pan	176f9ffd5f	Merge branch 'test'	6 years ago
刘敏	eb7ff3fd40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	4b924c64a3	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
peter.pan	af7e8d7a43	组织码	6 years ago
刘敏	e42c238d16	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	7c28110bd4	代码忘了发起合并请求	6 years ago
刘敏	cd566574cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	713503d7ff	Merge branch 'dev' into test	6 years ago
于学杰	91f1a120a2	1. 修改编译不过的代码	6 years ago
于学杰	5d1447c92a	1. 解决标准拣货多级存储区查找的问题	6 years ago
peter.pan	ced56de9de	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	b1ca55e3a3	pojo	6 years ago
许心洁	41324abdad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b13a9cd79c	PDA获取任务列表+盘点冻结根据移动明细源库位更新库存	6 years ago
sky.meng	854ee5b3cf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	6 years ago
sky.meng	0f3d67d110	供应商收货看板功能完成	6 years ago
许心洁	8ba2173753	冲突	6 years ago
许心洁	8347085f26	冲突	6 years ago
刘敏	48589a10cb	默认字段修改	6 years ago
许心洁	e3d5e5bb19	PDA获取任务列表+盘点冻结根据移动明细源库位更新库存	6 years ago
刘敏	945ef82867	实体字段新增	6 years ago
wei.peng	eb2f61c32f	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	d0d9a467a3	乐观锁修改数字类型	6 years ago
wei.peng	edc0dda102	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	62ae657151	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	71f6d48d16	修改流程管家实体--架构	6 years ago
wei.peng	f32f7e72a2	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
shiyanghuan	f3151cbbe3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
shiyanghuan	e13d4163b7	库存交易报表代码提交	6 years ago
wei.peng	f1c49c1cae	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	4d37e2a095	合并	6 years ago
wei.peng	9cc7c5d8b8	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	2f595807ea	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	14a8afca83	优化 盘点代码	6 years ago
刘敏	cabb4c9357	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	1a43546bd1	条码状态报表开发	6 years ago
alwaysfrin	4ce22aaa3f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
alwaysfrin	d4dce36280	流程管家优化	6 years ago
jenkins	e4cf82841f	Merge branch 'dev' into test	6 years ago
于学杰	663d8cdcf1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	aed953a03e	1. FIFO 推荐时要加上 sn_status = 40 的筛选条件	6 years ago
刘敏	6aaf2f3f3e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	1f403ebe40	代码优化	6 years ago
jenkins	c12cdea29f	Merge branch 'dev' into test	6 years ago
peter.pan	96e031b2f2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	062b20af23	物料清单dao层	6 years ago
刘敏	8d8c91f352	盘点调差导入接口表开发	6 years ago
wei.peng	a4016dc911	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	022d178833	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	e8c736ee67	开发 交叉盘点 库存容量更新	6 years ago
曾贞一	316050dd24	开发 交叉盘点 库存容量更新	6 years ago
刘敏	98cf305653	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	6ee8d7d2a2	1. 修改潜在BUG	6 years ago
刘敏	7488f0652e	移库单明细查询条件新增、盘点导入开发	6 years ago
刘敏	34dcf6d526	枚举修改	6 years ago
wei.peng	3605e5ef35	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	9282edf93a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	c6f5111510	1. 解决标准拣货中的 FIFO 按照存储区推荐问题	6 years ago
汪云昊	0507cf7ee0	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
汪云昊	6c68b123f0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	a8a1c2fe8b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago