2162 Commits (d98e84759cbb15dafca352c86ba60ee7eef219b1)

Author	SHA1	Message	Date
陈思洁	b9844c255b	生产计划表结构增加	6 years ago
gcj	3e6ca8d039	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	a1a3d1e838	【Bug清单】------------------------------	6 years ago
于学杰	67b5069c48	1. 增加分组提交的配置字段	6 years ago
jokelone	a337f1824f	Merge branch 'dev' into test	6 years ago
陈思洁	3a353b1539	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1d5f4b38a4	【KT-1282 计划拉动-班次管理】	6 years ago
gcj	32dccc056c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	6 years ago
gcj	1e10bdee0c	【坤泰运输管理】	6 years ago
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
陈思洁	eb5f9610a8	【KT-1282 计划拉动-班次管理】	6 years ago
陈思洁	5797ec4b1b	新增工位表字段	6 years ago
陈思洁	4f67cc1310	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	61f3465255	新增工位表字段	6 years ago
许心洁	49a126843b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	2ce2f17353	流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化	6 years ago
jokelone	690918add5	Merge branch 'dev' into test	6 years ago
曾贞一	594d6a4135	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	a254841385	更新 'modules/i3plus-pojo-wms/pom.xml'	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago
puxiao.liao	e580dcbd2d	【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663	6 years ago
曾贞一	892d63b9b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ca71303bee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	b6ae28c957	【采购收货】	6 years ago
jenkins	d2591b419b	Jenkins自动合并	6 years ago
许心洁	e4348cd334	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fa8a88c6d0	流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中	6 years ago
陆卫豪	93126de988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	1d0c03ba9c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
E	831daa4964	【#1241 KT-收货看板-增加道口】	6 years ago
gcj	a35171a41d	【采购收货】	6 years ago
曾贞一	bb92161133	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	33f3fd0963	Jenkins自动合并	6 years ago
qianhs	c8f23ba640	【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	91ec41b3c0	暂时注解掉索引信息。	6 years ago
曾贞一	793535e74c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8892c78692	【EU成品发运-客户编号】	6 years ago
jenkins	f4988f68f7	Jenkins自动合并	6 years ago
puxiao.liao	7df617b290	【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651	6 years ago
jenkins	ad6d4f5034	Jenkins自动合并	6 years ago
陈思洁	42d1a461a4	新增附件信息表	6 years ago
jenkins	66252032b3	Jenkins自动合并	6 years ago
陈思洁	9cb03c8661	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c6ff8f109c	新增附件信息表	6 years ago
王杰	6da48220a5	Merge branch 'dev' into test	6 years ago
puxiao.liao	1d66ce2612	【VDA推荐入库-入库成功-无引导信息】bug6645	6 years ago
jenkins	c8b0c49b57	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	544944d31c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	d0e6d30a9e	#6639 【VDA生产领料-FIFO跳过-系统异常】	6 years ago
gcj	e827462426	【采购收货】	6 years ago
wei.peng	6d5fc7ab39	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	e5767574fe	任务明细POJO添加交易类型代码字段：唯一索引	6 years ago
王杰	73b1e827d6	Merge branch 'dev' into test	6 years ago
gcj	87dd679d47	【采购收货】	6 years ago
许心洁	e37653c544	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	214b3a07b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f39e16511f	给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常	6 years ago
jenkins	5947429d54	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	8d15084b20	1. 调整5个批次的名称	6 years ago
jenkins	68b650ab81	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	8447ef39c9	【采购收货】	6 years ago
jenkins	870dc7007d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	acbbbf8e32	【采购收货】	6 years ago
jenkins	f6506bdd0b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	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