1408 Commits (35beb0c60e8b580da93b78e674c7640973613817)

Author	SHA1	Message	Date
刘敏	06a42e315b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	a6d0def85d	查询条件优化	6 years ago
jimmy	aca664fc4f	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jimmy	1aee9a6cf5	修改基础数据的findByHqlWhere方法	6 years ago
Silliter	6aec563884	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	927799e1db	更新库容方法优化	6 years ago
jenkins	4a5d0f0cb3	Merge remote-tracking branch 'origin/dev' into test	6 years ago
amy	a91ff1feaf	查询优化	6 years ago
amy	062d56573f	查询修改	6 years ago
amy	06dd8b42da	查询优化	6 years ago
jenkins	fb4be4580d	Merge remote-tracking branch 'origin/dev' into test	6 years ago
gragon.xu	1a8a6418d8	物料分页查询条件加上“snControl”	6 years ago
gragon.xu	3926ba11c1	监控台	6 years ago
gragon.xu	ec9764d3d7	d	6 years ago
jenkins	15d53b47ec	Merge remote-tracking branch 'origin/dev' into test	6 years ago
Silliter	afac75bb2b	质检明细删除问题修改 ... 看板卡新的moveno生成问题 任务操作问题 校验库容问题	6 years ago
Silliter	ac70ce91fd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	8d1567a0b5	根据任务关联单号模糊匹配任务列表	6 years ago
Silliter	5abb5d1821	任务列表优化	6 years ago
Silliter	83ce4f0efb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	588a517ae1	任务列表接口优化	6 years ago
gragon.xu	0744d38714	质检基础数据前后端调整：去掉入库单号，把关联单号作为查询条件；数据不可操作	6 years ago
柯裕	ee33834f9a	优化	6 years ago
jenkins	df63afecf8	Merge remote-tracking branch 'origin/dev' into test	6 years ago
gragon.xu	6396fb1a38	物料查询新增“snControl”条件	6 years ago
Silliter	8a69224e05	优化入库和质检明细处理业务	6 years ago
Silliter	b0cb1b795b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	6b25e77793	监控台模拟数据+不同库存数量接口修改	6 years ago
Silliter	28e43c087b	合并dev分支代码	6 years ago
Silliter	7f36c485ab	盘点实盘	6 years ago
gragon.xu	ae8f051f53	单号生成	6 years ago
Silliter	6cb456fcc4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	72691f50ed	散件收货移动单明细推入队列错误； ... 库位物料字段维护；	6 years ago
Silliter	0181b0ecab	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	b17d65356a	盘点主表新增get方法	6 years ago
Silliter	f509514233	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	d9a523473d	PO散件单据不可以生成条码+任务生成随机单号加上“RANDOM”标志	6 years ago
Rock.Yu	ec7fbd6b72	1. 增加了无状态的会话	6 years ago
Silliter	ac52608e22	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Rock.Yu	bc9eb6c673	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	9fabcbc85d	1. 业务规则中用到的对象必须加到 POJO 里	6 years ago
Silliter	7343d25e19	流程管家优化 ... 任务列表优化	6 years ago
yunhao.wang	9c54bc6f9d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Rock.Yu	a85cc69e14	1. 修复 Object 加载有问题的 BUG	6 years ago
Silliter	2fd68ec15e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	a13d87c246	优化任务列表和流程管家	6 years ago
Silliter	df714efc3b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	d9b1be4622	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	5d52910960	移库单主表的“是否校验条码”字段去掉	6 years ago
amy	67e0d7a443	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
amy	fc6368ca5f	查询条件封装修改	6 years ago
gragon.xu	13106615ee	PO明细标准包装改为Double	6 years ago
Silliter	d885d6b877	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	b8e9d9c1d4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jessica.chen	43ad2e35c9	代码错误--刘敏	6 years ago
Rock.Yu	2aa692a9c0	1. 增加无参数的构造函数	6 years ago
柯裕	0c73ad7072	移库明细新增临时字段	6 years ago
gragon.xu	6e4d59cf7f	根据PO单号批量生成条码	6 years ago
Silliter	28a962d9d4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	47424307f2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	4b5fc9d394	根据PO单号批量生成条码	6 years ago
Silliter	0f637fe2f7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	03b28b5682	数字型字段get方法重写	6 years ago
Rock.Yu	e58b28ecc4	1. 完善规则引擎，增加了规则存储在数据库的功能 ... 2. 修改脚本引擎 repository 命名	6 years ago
gragon.xu	6dccfc8fa8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	404ad6bad8	交易处理组件生成移库单新增属性“是否指定条码”默认为是	6 years ago
jimmy	9dca4f2dbb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	eda257bf23	盘点PDA端，输入数量校验	6 years ago
Silliter	7e73059944	合并dev分支代码	6 years ago
Silliter	0f7695eab3	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	85210d4ca1	优化流程管家	6 years ago
Silliter	4c0116b082	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	b0e4f719e2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
amy	53628e89d7	代码规范修改	6 years ago
Silliter	a4bc8ec6ca	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jessica.chen	3390a89b29	修改基础数据备注字段	6 years ago
amy	fc80e34b14	代码规范修改	6 years ago
Silliter	f39a9d14da	合并dev分支代码	6 years ago
Silliter	b36ba9c34f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	4f31301ea1	流程管家收货业务优化	6 years ago
gragon.xu	a3f258dd1d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	7020b1a534	前端：库存交易记录添加移动单号作为查询条件； ... 后端：添加常量TASK_JOB,TRANS_AM + 库存交易记录添加移动单号作为查询条件 + 修改任务生成component属性命名 + 修改获取冻结数量HQL + 交易反向处理：交易过期提示，数量比较要用.doubleValue	6 years ago
Silliter	ba3a542934	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	8684d95c1e	优化代码	6 years ago
jessica.chen	8a396061b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jessica.chen	73d1378f0d	修改移库单条码的sql查询语句	6 years ago
jiajack	3a5f43f97b	删除iml文件	6 years ago
Silliter	5a59437437	优化代码	6 years ago
amy	71279f2241	查询条件新增	6 years ago
Silliter	85b8aeb89b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
yihang.lv	6e8e425f1e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
yihang.lv	4a97182c45	供应商登录微服务	6 years ago
amy	17d9927b1a	代码优化	6 years ago
Silliter	c8aa6ec786	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	86125cff37	盘点pc端	6 years ago
jimmy	15542b7205	盘点pc端:散件盘点	6 years ago
Silliter	ca118faefd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	e53418c2dc	提交代码	6 years ago
柯裕	8692e0dc23	增加库存条码开窗查询	6 years ago
Silliter	7e0f4b031f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	678d154b1f	需求变更：所有单据明细和条码查询条件去掉行号;生成入库单的明细的是否免费字段默认为计费	6 years ago
gragon.xu	485ac1998c	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	11fd6979ed	盘点pc端	6 years ago
Silliter	0589b5e79a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	07c227769d	修改	6 years ago
Silliter	e61669dd98	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Rock.Yu	28458ac2fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	a222cf09d9	1. PDA通用组件测试代码修改	6 years ago
jimmy	18964b2977	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	f04cb00994	盘点pc端	6 years ago
gragon.xu	0863e49b1a	任务合并查询明细错误：基础查询方法改版 ... 单据任务生成状态默认：10创建 交易处理组件：移动单不一定有关联单据，代码错误	6 years ago
Rock.Yu	8a10110f4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	a49647f275	1. 增加注解	6 years ago
amy	74651aa817	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	34cadcfb54	更新库容公用方法优化	6 years ago
jimmy	64fd37652d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	1d57eb5a10	盘点pc端	6 years ago
Silliter	92c5457521	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	6c1316f262	合并代码	6 years ago
Silliter	1adb344e31	优化流程管家	6 years ago
gragon.xu	59b086dc5d	BaseBean.findByHqlWhere:查询别名代码错误 ... WmsHqlPack:修改封装方法使用DdlHqlPack 任务合并代码错误	6 years ago
amy	02483b4f92	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	0825229a78	移库单明细实体修改	6 years ago
Silliter	b9d013280f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	2e9ed6a288	散件盘点	6 years ago
yunhao.wang	19a57e8c3e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
柯裕	2988f34bbd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	6b89f8d572	更新实体	6 years ago
amy	fcc36ef7f6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
amy	c1b477dd32	修改	6 years ago
柯裕	c43a166a25	优化module	6 years ago
Silliter	fa2303d838	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
柯裕	956c8c0362	增加临时变量	6 years ago
Silliter	ee1488d28e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
柯裕	1f11a6f280	更新实体	6 years ago
Silliter	e8deda24fe	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
柯裕	6944deef54	实体类更新	6 years ago
jimmy	a6dd9e53ec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	3902dcca43	盘点PDA端	6 years ago
amy	006fe4b95a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	ecdd1d45de	是否散件枚举添加	6 years ago
柯裕	98d4f691f1	优化	6 years ago
Silliter	fe644066af	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	6fb971cd60	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	9b8ebb5628	实体数量处理	6 years ago
gragon.xu	0e9315cd89	作业任务生成事务控制	6 years ago
Silliter	38311760a1	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Rock.Yu	c38a62955d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	bd4df83519	1. 增加脚本引用 POJO	6 years ago
jimmy	cd00bdd954	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	3c2a345b93	盘点pc端	6 years ago
wei.peng	93f4745afd	Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... # Conflicts: # pom.xml	6 years ago
柯裕	9477ba5c91	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	26b4f3e5b4	调整微服务入参	6 years ago
Silliter	5a557495af	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	84c07f3db0	优化单据打印业务	6 years ago
gragon.xu	dd31efa945	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	9a185abed1	调用获取单号不需要SID+盘点实体添加是否散件字段	6 years ago
柯裕	1f50fecf80	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	0211390c44	PO明细实体状态数据类型更新为Integer; ... PO明细查询封装hql单据编号匹配改为equal	6 years ago
gragon.xu	8b3b37260e	枚举统一	6 years ago
gragon.xu	2987e34dc7	ASN,PO明细表，产品入库表的ERPWHNO改成ERPAREANO	6 years ago
Silliter	0ad159581c	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	e09d96a925	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	b2544dcb43	盘点调差开发	6 years ago
amy	69cef0bf3a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	ecde67e47e	修改	6 years ago
Silliter	e8de83b696	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	287a9b3892	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	9a7c26338a	订单打印，流程管家优化	6 years ago
柯裕	e2a6619dcc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	130343ea6b	PO明细实体更新	6 years ago
yihang.lv	b41e06f412	wmsPOMasterDetails erpWhNo---》 erpAeraNo	6 years ago
Silliter	dbeb965e9b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	fea99120ca	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	4be69f77c0	开发单据打印	6 years ago
柯裕	913dcae75f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	85493e4f88	散件收货查询	6 years ago
gragon.xu	2ce0dcbaf1	dragon	6 years ago
amy	1560a9b73d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	fb819c27b2	实体字段添加	6 years ago
yihang.lv	39ddab4cf9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
yihang.lv	e4bbd3a1a1	物料表 添加 是否条码管理	6 years ago
amy	ce9ad43cd8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	e4a271cd4f	庫位物料新增是否生成領料單字段	6 years ago
gragon.xu	2a38dc0b0c	库位的零件数量为Double类型	6 years ago
jimmy	2192ecdb18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	871fae62ec	重写库位get方法	6 years ago
Silliter	ec50aef781	开发单据打印	6 years ago
jimmy	94f588cfdb	盘点PAD组件	6 years ago
柯裕	b65f6197c5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	2e578200d8	质检主表添加是否散件字段	6 years ago
Silliter	3e9a40a47a	开发提交按钮控制	6 years ago
Silliter	b99c28e1b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	a889e00cba	优化任务列表	6 years ago
amy	cd3ef63c90	po是否散件字段添加	6 years ago
amy	4dd8bd3b5c	移库单字段新增	6 years ago
gragon.xu	8ef0e787b9	交易反向处理	6 years ago
Silliter	6d8a8f4bb9	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	d14e0a5cb2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	046ece7221	流程管家优化	6 years ago
yihang.lv	2cf97f8ed1	移库单订单条码表 分页查询 条件去掉 partNameRdd	6 years ago
yihang.lv	f9a820dae4	bean 所有QTY数量默认为0修改	6 years ago
yihang.lv	1176053fe9	移库单条码表增删改查	6 years ago
Silliter	2292738c7d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jessica.chen	e4aa1cfbc3	库存移动明细数据实体	6 years ago
Silliter	111c6177c9	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	1f4a00f39e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	01dc635d38	开发流程管家	6 years ago
alwaysfrin	e10d71919a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
yihang.lv	6f8f13c552	根据类型查询库位分页	6 years ago
alwaysfrin	1897d227e6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
alwaysfrin	ea2eb6103d	优化调整	6 years ago
Silliter	dd0af51d8f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	4aaa9bc03a	1.优化流程管家 ... 2.开发条码打印，订单打印，收货回执打印	6 years ago
gragon.xu	3be87f2882	作业任务表：“是否配料”->“是否一步法操作”	6 years ago
gragon.xu	6b9823cd64	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	18fc77b99c	反向交易处理程序+作业任务新增“是否一步法”字段	6 years ago
Silliter	5f76a14276	优化条码打印功能	6 years ago
Silliter	6396056d08	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	ca8b9462b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	970fa83557	dragon	6 years ago
Jack.lv	b9d00d181e	条码枚举	6 years ago
Silliter	d19d57979f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	75e622763c	解决冲突	6 years ago
Silliter	234aad93e3	1.优化流程管家 ... 2.任务列表查询加入任务状态字段	6 years ago
gragon.xu	c9215a7079	任务明细没有工厂；任务合并hql语法错误	6 years ago
Silliter	b1f195a185	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	4e8ab00fed	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	6cf53459e2	修改代码	6 years ago
amy	8df7fb3f4b	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
gragon.xu	78d551f8e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	4ef08afaa7	dragon	6 years ago
amy	bf24e3f58c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	ebc92f6290	实体新增临时字段	6 years ago
jimmy	8d442fcafa	修改代码	6 years ago
Jack.lv	5c6ab755dd	userTime改为userTime	6 years ago
Jack.lv	eb37a1f7ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Jack.lv	fa4c4cd957	作业类型删除处理组件编号和数据来源编号	6 years ago
Silliter	dcfb0f5cdf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	738db8d837	条码打印开发，角色微服务提供	6 years ago
jimmy	f52b3ff189	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	8da671628c	盘点PC	6 years ago
Silliter	618ce5d560	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
柯裕	bbfd340fd0	质检	6 years ago
Silliter	e20936ca2b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	c4ef1e66f3	开发条码打印后端	6 years ago
wei.peng	8ec8dba414	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	6630842f3c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	b883f7de2d	添加临时变量	6 years ago
Jack.lv	630c6e8f66	作业处理组件增删改查、作业任务明细查询、作业任务生成日志查询完成	6 years ago
Silliter	11bbe2a57d	优化流程管家	6 years ago
Silliter	6464cbd533	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	48161d95a1	枚举冲突	6 years ago
gragon.xu	e7fa2f3abf	NC,盘点交易处理组件	6 years ago
Jack.lv	972d2b04a7	wmshpak删除多余代码	6 years ago
Silliter	62196df6bf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jessica.chen	30996a92a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jessica.chen	166b725e43	出库组件新增	6 years ago
Silliter	74b63d8a72	开发流程管家根据任务创建流程	6 years ago
gragon.xu	87a033a427	外部单据的计划时间全部从zDate,zTime改成planDate,planTime,否则HQL执行失败	6 years ago
gragon.xu	868be93389	质检单和移库单主表的CUSTOMER_NO修改成了CUST_NO	6 years ago
gragon.xu	8a58b48826	移库单主表去掉物料号，物料名称，数量属性	6 years ago
Silliter	0b56c38cba	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Jack.lv	a8736a4747	新增、修改、查询 数据权限	6 years ago
Silliter	de5760bba1	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Jack.lv	c0be6489a3	bean修改 Warehouse 回退为原来的code 、 name 、address	6 years ago
Jack.lv	56568be77e	bean修改 WmsHqlPack 同步pdm	6 years ago
Jack.lv	f6c64a8632	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Jack.lv	d6def493e4	bean修改 同步pdm	6 years ago
gragon.xu	e1825eac40	交易处理组件ALL	6 years ago
Silliter	238160a65f	数据访问层优化	6 years ago
gragon.xu	a7dea093d7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	86e96e8f76	交易处理组件公共方法提取	6 years ago
Silliter	9c08de7a7a	定时获取库存移动信息开发	6 years ago
Silliter	9401fb9b00	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	8ac4046a7d	开发校验权限和获取个人任务列表公用方法	6 years ago
wei.peng	0a5c19ebe5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	d289e7009a	增加移库移动明细表 已移库数量	6 years ago
Silliter	cc4484a562	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
gragon.xu	274c5aec26	dragon	6 years ago
gragon.xu	201f960d08	冲突	6 years ago
gragon.xu	31d91f48b3	收货交易处理组件开发	6 years ago
柯裕	398a3d98c5	更新POJO	6 years ago
gragon.xu	f662140075	WmsOrderMasterModel无用了	6 years ago
gragon.xu	7e8965421e	WmsOrderDetailsModel	6 years ago
amy	946d4bf634	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	1fd8e5e76f	实体字段添加	6 years ago
gragon.xu	ded9b1c37f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	d89770e138	作业任务处理程序	6 years ago
Jack.lv	ed7857b86d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Jack.lv	b667d6840e	获取权限和根据权限获取任务列表	6 years ago
jessica.chen	0ce23f95b1	拆分组件修改	6 years ago
柯裕	e3ae013868	更新POJO	6 years ago
柯裕	f25395ebd6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	ce9cbe1198	更新pojo	6 years ago
gragon.xu	e3a87e5d2e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	fc89b8493d	移库单明细新增源，目库存地属性	6 years ago
Silliter	bdf8a8993f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	a5390d7b1a	开发拆分条码逻辑	6 years ago
Jack.lv	296db97c72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Jack.lv	6c6710dd67	在途库位 枚举修改	6 years ago
gragon.xu	3056922b15	POMasterDetails修改属性名whNo->erpWhNo	6 years ago
gragon.xu	4d3b4ac15c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	44148da43c	comit	6 years ago
Rock.Yu	4d5b9da91d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	9a9c7ba7ec	1. 增加获取条码下一步状态的实体类	6 years ago
Silliter	adb7f189f1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	7ba8fa832c	定时获取库存移动信息开发	6 years ago
Rock.Yu	288ecaedba	1. 增加获取条码下一步状态的 POJO 类	6 years ago
gragon.xu	5bc4d9140b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	8a38eca2f0	获取WmsConfig	6 years ago
amy	1f27756f9b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	8a9d09dbdf	wms系统参数表新增	6 years ago
amy	770b294029	wms系统参数表新增	6 years ago
柯裕	20f8730f41	新建移库单条码DAO	6 years ago
gragon.xu	0361d6bd79	业务类型统一存数字类型；关联单据类型统一存字符串类型	6 years ago
Rock.Yu	d64ef34b4a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	1093680f89	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	d6154a3c14	Transient包引错	6 years ago
Rock.Yu	407c24e516	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	2133221748	循环依赖 问题修复	6 years ago
Rock.Yu	964a623119	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	e9a04ec960	解决冲突	6 years ago
Silliter	6b419e11cb	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java	6 years ago
Silliter	ba90dfb123	开发交易处理主程序	6 years ago
Rock.Yu	4b5046ad44	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Rock.Yu	4ccdf4c774	1. 增加了条码状态检查的规则实体类	6 years ago
gragon.xu	d67d4fa929	SQLPACK冲突	6 years ago
gragon.xu	1aa8f7fd1a	任务处理程序	6 years ago
jessica.chen	5b7f23ca82	拆分组件新增	6 years ago
jessica.chen	5378284454	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jessica.chen	268f86b602	库存移动条码表实体修改	6 years ago
Silliter	3faba3bbc2	实体调整	6 years ago
Silliter	380f16943f	库位，条码服务创建	6 years ago
Silliter	8a78c19329	库位，条码服务创建	6 years ago
Silliter	73181f1c1a	WMS实体对象重构，枚举修改	6 years ago
wei.peng	3fce943723	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	bb0eda58f4	流程管家调整	6 years ago
Silliter	c45091584c	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	879178697d	#	6 years ago
amy	b2f6b3255a	实体修改	6 years ago
Silliter	dd11ff1e71	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	0f0611d9ee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	8d4d8c1b1a	开发返回pda实体	6 years ago
amy	effa749d3f	#	6 years ago
wei.peng	3f6b281912	发版 2018年12月28日	6 years ago
amy	cbf734b0b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	a4d59caaeb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
Silliter	b4e1d97d10	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
Silliter	b55906ced0	生产领料优化	6 years ago
gragon.xu	e167913e66	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gragon.xu	b41698ba1b	移库单信息BUG	6 years ago
Silliter	3fcdba6c94	生产领料优化	6 years ago
amy	20cdd4170c	盘点状态实体枚举添加	6 years ago
Silliter	cc3bb9e9ae	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
amy	5d7e5567be	主表状态值更新	6 years ago
amy	e4a2c6a5eb	移库单明细临时字段添加	6 years ago
amy	9e49372cf5	添加hql目标文件规范化	6 years ago
amy	294560df40	查询方法修改	6 years ago
柯裕	1df72e1d4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
柯裕	93ff5ad071	移动条码对象封装	6 years ago
amy	f456ff2f75	入库上架扫描条码	6 years ago
wei.peng	38be37aad0	Merge branch 'dev' into test	6 years ago
jimmy	a9ab449316	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jimmy	159892b64d	修改	6 years ago
amy	e8741f7628	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	e329c69aa5	公用计算方法修改	6 years ago
Silliter	52afc18c1a	解决冲突	6 years ago
Silliter	dadd0a2f30	解决冲突	6 years ago
gragon.xu	e31440345c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	a1e69d404d	Merge branch 'dev' into test	6 years ago
jimmy	456a1dc8b9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	abce5adfd7	修改库存移动单条码信息 状态注释	6 years ago
Silliter	1594ae5843	解决冲突	6 years ago
Silliter	2ce7eebf7b	解决冲突	6 years ago
Silliter	91ee0d37d3	解决冲突	6 years ago
wei.peng	9b1acb4b8f	Merge branch 'dev' into test	6 years ago
柯裕	0a8ffd10ec	组件优化	6 years ago
amy	0fbb0fa3ca	库存移动单字段修改	6 years ago
amy	b146a7bd0b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
amy	5f693abd08	库存移动明细	6 years ago
Silliter	6ade9a50f9	解决冲突	6 years ago
Silliter	e5b99693f7	解决冲突	6 years ago
Silliter	01689fde87	解决冲突	6 years ago
gragon.xu	004a7969d7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	821f7fc380	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
Silliter	3c027cef03	解决冲突	6 years ago
jimmy	586454a288	修改库位类型	6 years ago
yunhao.wang	7b2d7f78dd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	9646f1b3d3	修改2858	6 years ago
Silliter	201afe2cb0	流程管家业务优化	6 years ago
Silliter	4346fe48f0	流程管家业务优化	6 years ago
gragon.xu	7ddbc5f76b	流程管家在每次调用组件之前要验证当前redis中是否包含组件所需参数，不满足则抛异常	6 years ago
yunhao.wang	8cb5c2ee1a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy	a2695771e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy	fe67546768	开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码	6 years ago
amy	90f4662416	内部移库单交易类型查询条件添加	6 years ago
gragon.xu	9e01521e21	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
gragon.xu	620a4b0c99	#3015,#3017,#3018,#3041,#3045	7 years ago
Silliter	faf1c1318f	Merge remote-tracking branch 'remotes/origin/dev' into test	7 years ago
jimmy	33aaf8962f	Merge remote-tracking branch 'origin/dev' into dev	7 years ago
jimmy	290e2e00c9	修改查询时间	7 years ago
gragon.xu	ff572a219e	dragon	7 years ago
wei.peng	47105866be	合并代码 解决冲突	7 years ago
Silliter	9449d7af99	解决冲突	7 years ago
Silliter	c912dd4b62	解决冲突	7 years ago
Silliter	f990cd147e	Merge remote-tracking branch 'remotes/origin/dev' into test	7 years ago
Silliter	9036a37b32	解决冲突	7 years ago
wei.peng	878113c093	Merge branch 'dev' into test	7 years ago
Silliter	85061bbc4f	流程管家单元测试编写	7 years ago
wei.peng	1139aa6d75	冲突解决 合并代码	7 years ago
wei.peng	786c652900	冲突解决 合并代码	7 years ago
wei.peng	95a58d97a2	冲突解决 合并代码	7 years ago
wei.peng	47dd4c68b5	配置文件修改 Test to dev	7 years ago
wei.peng	ac71b08de9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
Silliter	1d0a59ff5b	Merge remote-tracking branch 'origin/dev' into dev	7 years ago
Silliter	b597df2986	解决代码逻辑错误问题	7 years ago
jimmy	628c0c86dd	修改名称	7 years ago
jimmy	7ffe4bf190	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
jimmy	09a88efc88	开发po订单条码表	7 years ago
Silliter	03f57393f3	Merge remote-tracking branch 'origin/dev' into dev	7 years ago
Silliter	4e002cda14	解决代码逻辑错误问题	7 years ago
amy	47d3187232	移库单主表字段删除	7 years ago
wei.peng	42b8443073	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
amy	f3d6ab4302	抽点、检查抽点修改	7 years ago
Silliter	afa644d5c7	解决代码逻辑错误问题	7 years ago
amy	8ad39b7c12	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
Silliter	10939f8087	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... # Conflicts: # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-wms/pom.xml # pom.xml	7 years ago
Silliter	068978f052	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... # Conflicts: # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-wms/pom.xml # pom.xml	7 years ago
Silliter	2a451b36a7	合并代码测试	7 years ago
amy	d3e0c18d78	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	7 years ago
amy	8b3434b27c	。。	7 years ago
wei.peng	9eb7122e99	发布 正式版本 1.0	7 years ago
wei.peng	e0f3118296	发布 正式版本 1.0	7 years ago
yunhao.wang	cb95d0a713	项目pom版本更新为test	7 years ago
yunhao.wang	236dbc4f66	项目pom版本更新为dev	7 years ago
amy	a3861b194d	modify	7 years ago
柯裕	c95830289a	解决冲突	7 years ago
柯裕	70e1c259e2	优化库存移动单	7 years ago
jimmy	787501c59c	提交代码	7 years ago
Silliter	d87eedb285	优化代码	7 years ago
amy	00061db0ca	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	398de72b6c	内部移库单实体字段添加	7 years ago
Silliter	3f5dcf9627	Merge remote-tracking branch 'origin/master'	7 years ago
Silliter	ca78fb48fc	优化代码	7 years ago
gragon.xu	660db622a8	组件实体类去掉调用方法属性	7 years ago
jimmy	950303231f	提交代码	7 years ago
yunhao.wang	838f500156	Merge remote-tracking branch 'origin/master' ... # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java	7 years ago
yunhao.wang	d7b4b1f7ab	transient 替换为 @Transien	7 years ago
jimmy	707d54cc1c	提交代码	7 years ago
柯裕	ca92b5caed	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	7982a4fdc1	存储区查询条件优化	7 years ago
Silliter	e45e68824f	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	800c77cf1d	解决冲突	7 years ago
柯裕	41ecb414c1	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	23e538a5a7	作业任务条件模糊查询	7 years ago
gragon.xu	b158c70e60	流程管家v1	7 years ago
gragon.xu	f66854eb42	dao	7 years ago
gragon.xu	6ab4674a3b	冲突	7 years ago
gragon.xu	d2672e33d4	冲突	7 years ago
gragon.xu	805ada2d1f	流程管家create	7 years ago
amy	e8d25fc375	抽点比例添加工厂	7 years ago
Silliter	55093f22d7	解决冲突	7 years ago
Silliter	ab9a0aae5d	解决冲突	7 years ago
柯裕	92b1caa276	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	05d0995463	set改为List	7 years ago
amy	b782ea1d12	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	f9537daabf	查询语句	7 years ago
Silliter	3a97a25b4e	Merge remote-tracking branch 'origin/master'	7 years ago
Silliter	ac84f62e70	解决冲突	7 years ago
amy	d616af3a00	检查抽点	7 years ago
柯裕	e3a8fb7b12	修改字段	7 years ago
Silliter	d2847f60ba	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	cb395f077e	解决冲突	7 years ago
jessica.chen	b43ffb6fc3	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	69f4a95394	实体类已收数量添加	7 years ago
Silliter	61b16569a4	解决冲突	7 years ago
Silliter	e1d0e75c74	解决冲突	7 years ago
Silliter	8e6bc17a45	解决冲突	7 years ago
jessica.chen	b2e4c2496a	解决冲突	7 years ago
gragon.xu	7a8baf42d7	冲突	7 years ago
gragon.xu	cd777e00a5	流程管家create	7 years ago
Silliter	506f13d4b2	解决冲突	7 years ago
Silliter	e1c02277b3	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	bfc1d5ba2b	解决冲突	7 years ago
amy	d2a3f4a9bf	返回实体代码字段添加	7 years ago
amy	4d8148ea9d	返回实体构造添加	7 years ago
Silliter	fd83bef49b	解决冲突	7 years ago
Silliter	b77406b1e0	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms ... # Conflicts: # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java	7 years ago
Silliter	0dbb07ea9d	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	b0d191ceaa	解决冲突	7 years ago
柯裕	4337055898	PO条码表	7 years ago
Silliter	43ed6deb6c	解决冲突	7 years ago
Silliter	95826a1846	优化代码逻辑	7 years ago
jessica.chen	83de8099bc	作业参数	7 years ago
jessica.chen	8553764df1	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	fce89348c7	作业参数	7 years ago
amy	c9dd7ba3cb	参数类型枚举添加	7 years ago
amy	1deba1c026	实体id序列化	7 years ago
amy	6178a4ce87	联合查询字段添加	7 years ago
柯裕	64c42217d4	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	15aae342ee	作业记录明细字段完善	7 years ago
gragon.xu	7978b37bd4	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	0a0bafca8c	作业步骤组件；参数测试；修改组件参数的amID加上防止前端接收long型参数精数丢失；	7 years ago
jimmy	ba154986ea	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	efa5da8667	开发作业步骤调用	7 years ago
jessica.chen	ae7c00576a	作业参数添加枚举状态	7 years ago
amy	fa54afe122	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	0c568f2107	添加查询条件	7 years ago
柯裕	7035bdd80c	作业记录，作业记录明细	7 years ago
jimmy	4ca1d70e0c	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
jimmy	911e93429e	修改抽点比例查询条件	7 years ago
jessica.chen	fce4518982	解决冲突	7 years ago
jessica.chen	4b410c1408	新增作业步骤调用参数信息和作业记录参数信息	7 years ago
amy	0fe5c32fdc	Merge remote-tracking branch 'origin/master'	7 years ago
amy	103a27c36e	作业流程与明细开发	7 years ago
Silliter	f99d4e4dc6	修改测试环境数据库编码	7 years ago
amy	7b71b349a7	修改	7 years ago
amy	805545574a	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	205b4701aa	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	6977e11090	bug	7 years ago
jimmy	351aaf732c	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	37c8e3e212	开发作业步骤调用	7 years ago
amy	20152e7efd	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	1eb12350b2	時間	7 years ago
jessica.chen	41b0855f5d	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	c2d8a35df6	更改物流路线信息	7 years ago
Silliter	e2ebcd9430	修改测试环境数据库编码	7 years ago
Silliter	377f5d6194	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	9c1466fdca	修改测试环境数据库编码	7 years ago
jimmy	cdde15c1bc	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	9fefeffdb7	开发作业步骤调用	7 years ago
gragon.xu	8f969353a6	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms ... # Conflicts: # modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java	7 years ago
gragon.xu	da4665b0d7	作业步骤处理组件，参数实体，dao,sqlPack	7 years ago
jimmy	42831bcff6	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	e5c5e80d41	开发作业步骤调用	7 years ago
Silliter	47bb3d6f7a	修改测试环境数据库编码	7 years ago
Silliter	dc634e860f	修改测试环境数据库编码	7 years ago
jimmy	fe5996b792	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	29c28271b3	开发作业	7 years ago
柯裕	43ebe4be72	修改条件数据类型匹配	7 years ago
Silliter	356a238369	修改测试环境数据库编码	7 years ago
amy	a1ea518108	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	2374663655	ASN订单明细查询条件初始化	7 years ago
amy	f7172d63ab	ASN订单明细查询条件初始化	7 years ago
Silliter	e9e7d37fa7	修改测试环境数据库编码	7 years ago
Silliter	56b823d11d	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	bff458438b	项目结构调整	7 years ago
amy	31cdce0f85	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	02c8790b4c	库存移动行号类型修改	7 years ago
jimmy	719899898f	添加是否库位查询条件	7 years ago
jessica.chen	b79ed3bae2	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	5d4cb12c6c	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	2066bee025	单元测试	7 years ago
jimmy	9cda18eb32	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	e5567ce4eb	修改代码	7 years ago
jessica.chen	0d87b466eb	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	a3d7e3426c	更改模块	7 years ago
gragon.xu	690d9ef408	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	b3faaf50f4	库存交易前后端以及(11月19日)所有的小bug	7 years ago
Silliter	1cd4f356fd	项目结构调整	7 years ago
jessica.chen	145182f2da	更改模块	7 years ago
jessica.chen	9b529bf438	更改模块	7 years ago
amy	8841e18a4d	库存移动单	7 years ago
amy	25a1f215f8	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	fecbfe821e	库存订单实体字段修改	7 years ago
jimmy	b2d19f7cbf	合并sql	7 years ago
jimmy	64ea8f7fab	开发盘点主表、盘点冻结表、盘点实盘表	7 years ago
jessica.chen	c5109d7e93	解决冲突	7 years ago
jessica.chen	c332718ffb	更改模块且新增模块	7 years ago
amy	2aed8cfa1d	库存移动单	7 years ago
amy	2f991db5de	合并	7 years ago
amy	21a79af65a	合并	7 years ago
Silliter	71c78ec2b4	项目结构调整	7 years ago
gragon.xu	074b861035	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	87def59c4d	库存，库存条码，库存交易信息，库存交易条码V1	7 years ago
amy	9e340835ad	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	1dba2e2011	字段信息查找修改	7 years ago
gragon.xu	b02c8f4674	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms ... # Conflicts: # modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java	7 years ago
gragon.xu	12392de1a4	库存，库存条码，库存交易信息，库存交易条码V1	7 years ago
Silliter	9498b3e2dc	项目结构调整	7 years ago
Silliter	46beafb09e	项目结构调整	7 years ago
Silliter	13f9849d8e	项目结构调整	7 years ago
Silliter	62b5dec0d6	项目结构调整	7 years ago
柯裕	8dc237f9d4	解决冲突	7 years ago
柯裕	f68378ba48	盘点子表	7 years ago
Silliter	1917c01c09	项目结构调整	7 years ago
Silliter	7e25f836c4	项目结构调整	7 years ago
Silliter	4c4edda8dd	项目结构调整	7 years ago
jimmy	519e945f5e	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	7bc674d027	修改字段	7 years ago
jessica.chen	b7b2b8df39	Merge remote-tracking branch 'origin/master'	7 years ago
gragon.xu	3fdeb69eee	dragon	7 years ago
jessica.chen	108188b6f7	更改模块	7 years ago
amy	8798674795	Merge remote-tracking branch 'origin/master'	7 years ago
jessica.chen	3da0022d64	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	aa506869cd	字段信息查找修改	7 years ago
gragon.xu	10da7ff5bc	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	5e9467cd35	更改模块	7 years ago
Silliter	4aadf5adf7	单元测试开发工具类新增	7 years ago
gragon.xu	3c1d015653	移库单菜单权限提交	7 years ago
jessica.chen	73b35ee0aa	更改模块	7 years ago
jessica.chen	de35193b12	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	eb8795e1a6	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	d5b71f274f	单元测试开发工具类新增	7 years ago
jessica.chen	fb1756198d	更改模块	7 years ago
amy	8ab93eb53a	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	40b536aa8e	初始化修改	7 years ago
柯裕	bd282d875f	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	b81e502101	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	2995a1e057	修改查询条件	7 years ago
柯裕	0cc642f9b6	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	0c7eac9025	单元测试开发工具类新增	7 years ago
amy	c82ba74e9e	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	88429e342e	枚举修改	7 years ago
柯裕	19c635e8b2	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	675e3abb6f	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	eb2ac7a408	修改查询条件	7 years ago
jimmy	b4735f3469	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
jimmy	611fb5b601	修改有效性等等	7 years ago
Silliter	3c32f511a7	单元测试开发工具类新增	7 years ago
gragon.xu	e6775e65f6	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	9189ca1bbd	前端调整	7 years ago
jessica.chen	15f1df839b	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	c66edabb7f	修改查询条件	7 years ago
jessica.chen	aa23a3973f	修改抽点记录信息和产品发运信息	7 years ago
amy	90dda577fb	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	d4929181c7	删除标识枚举更改	7 years ago
gragon.xu	7cd7712912	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms ... # Conflicts: # modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java	7 years ago
gragon.xu	766318f1dc	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	d4fa40ed79	controller&service合并	7 years ago
jimmy	014a296bcd	移动抽点比例信息	7 years ago
jessica.chen	92f58a0162	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	538ecf84c3	修改拼接	7 years ago
gragon.xu	762d7d4cc0	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	db8e869674	测试	7 years ago
jimmy	cf32b4c92a	修改PO订单明细表sql	7 years ago
柯裕	5914c4e746	产品入库模块和作业任务模块	7 years ago
jessica.chen	bf6c51b3aa	Merge remote-tracking branch 'origin/master'	7 years ago
jessica.chen	6fe3f2a1ff	增加抽点记录信息	7 years ago
amy	477f6c5ff1	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	22d5ba1c0f	字段修改	7 years ago
jessica.chen	8a55b01825	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	37008febab	查询条件添加	7 years ago
jessica.chen	72407a5afc	更改产品发运信息	7 years ago
gragon.xu	87048b4e42	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	73c5e20c01	移库单主表，移库单详情表	7 years ago
jimmy	b9db3d0076	开发po订单主表、明细表	7 years ago
jimmy	6fc6519382	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	92d74bee7b	开发po订单主表	7 years ago
gragon.xu	d0b8f1649d	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	41edf3f731	添加工厂代码作为查询条件；添加批量软删除方法	7 years ago
amy	1ef429fc78	添加组织代码查询条件	7 years ago
amy	ae61fad0d5	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
柯裕	0bacd88012	修改类名	7 years ago
amy	1263460ced	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
amy	d0c6ec627c	查询条件添加	7 years ago
jessica.chen	67f219a433	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jessica.chen	d2860e03fc	更改库存交易归档表信息和库存表信息	7 years ago
jimmy	b2ad639060	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	6079c8e1a7	开发po订单主表	7 years ago
alwaysfrin	dad173dfd0	1，对象hashcode和equals继承父对象 ... 2，主键生成策略优化	7 years ago
gragon.xu	375ba45b98	物料接口对接	7 years ago
gragon.xu	fd767b349e	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	6ebc052d76	pojo	7 years ago
jimmy	d0db4acfba	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
jimmy	5f0f6402a5	增加hql语句	7 years ago
Silliter	e1f8878224	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	716ed00874	单元测试开发工具类新增	7 years ago
amy	fee107d322	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	d73f134579	有效条件更改	7 years ago
柯裕	7b54382c1a	添加查询条件	7 years ago
amy	ce3e2eb75a	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
amy	a1f496f8fb	实体数字类型默认值添加	7 years ago
Silliter	021b4767cd	wms工厂仓库类书写	7 years ago
gragon.xu	83c4347a8a	back	7 years ago
gragon.xu	0df6504c56	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
gragon.xu	eb168e80f4	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
gragon.xu	de2325d2eb	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
amy	2108f314b1	有效条件更改	7 years ago
gragon.xu	341a340ac8	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	7 years ago
amy	6aad727b3d	Merge remote-tracking branch 'origin/master' ... # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java	7 years ago
amy	aec47b10fa	供应商、作业类型基础数据	7 years ago
gragon.xu	2b1bf288e1	Part	7 years ago
jimmy	e0737797eb	开发抽点比例	7 years ago
amy	0f7af655aa	wms查询条件添加	7 years ago
Silliter	397f89f72e	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	49422a3350	wms工厂仓库类书写	7 years ago
gragon.xu	4937974f60	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	8d92834a2e	PartRepository	7 years ago
Silliter	b8f0183d84	wms工厂仓库类书写	7 years ago
Silliter	959291b6a9	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	9be6f3677d	wms工厂仓库类书写	7 years ago
gragon.xu	3be0585879	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
gragon.xu	a626a6f91b	PartRepository	7 years ago
gragon.xu	1d7aae1310	Part实体	7 years ago
Silliter	b5abfb8eda	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago
Silliter	fc2258bbef	wms工厂仓库类书写	7 years ago
柯裕	c7a030ee57	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	7 years ago