2448 Commits (d18beff50cf8b17aa24bd23b4f1b933d9c52e44e)

Author	SHA1	Message	Date
曾贞一	44648e4218	【1396 亚太-领料任务明细看板】	5 years ago
王杰	01e896a752	Merge branch 'dev' into test	5 years ago
曾贞一	60ab897195	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e14e813230	【7476 发运的新老标签对应报表】	5 years ago
jenkins	27b1f5ca21	Jenkins自动合并	5 years ago
qianhs	22eaa30dab	【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】	5 years ago
jenkins	1ae61084c5	Jenkins自动合并	5 years ago
曾贞一	415ae5a45b	【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】	5 years ago
jenkins	6e545a7ec1	Jenkins自动合并	5 years ago
袁津哲	db6522fba3	优化动态搜索与自定义列表代码	5 years ago
jenkins	c90df4e96a	Jenkins自动合并	5 years ago
许心洁	28ce8615fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	51d60a107a	SAP指令锁定逻辑修改： ... 根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表； 原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；	5 years ago
jenkins	7e6f83a974	Jenkins自动合并	5 years ago
陈思洁	babc158ed6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5feae0dd1a	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
陈思洁	09339a6e1f	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
jenkins	d790bcf355	Jenkins自动合并	5 years ago
袁津哲	89a7cafee4	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	6371e8df60	Jenkins自动合并	5 years ago
袁津哲	f7c98e3982	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	a19cace3b1	Jenkins自动合并	5 years ago
puxiao.liao	86b73d43f9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	6f82fa17fd	Jenkins自动合并	5 years ago
许心洁	889c6ac548	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f7c9ebf6e	SAP指令锁定组件逻辑修改：若根据单据号查询到了记录则不再新增了，并且调用此组件时缓存中一定得存在ORDER_NO; ... 定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口	5 years ago
qianhs	a1ec8d7293	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
puxiao.liao	347197f305	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	b64327831a	【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号 ... 】bug7402	5 years ago
jenkins	69ff58a67e	Jenkins自动合并	5 years ago
qianhs	61303a9f38	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	458137d216	Jenkins自动合并	5 years ago
许心洁	c2ba0a5663	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	e967001c75	Jenkins自动合并	5 years ago
许心洁	cb7f868d64	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
袁津哲	ad8e51dfae	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	c1609539cf	Jenkins自动合并	5 years ago
许心洁	de0d57179c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	35839db806	BUG#7359 任务列表分组字段和移动单赋值逻辑更改	5 years ago
jenkins	006fd3aef3	Jenkins自动合并	5 years ago
曾贞一	3a9e719005	【vda收货时，是否分组提交】	5 years ago
jenkins	274011537c	Jenkins自动合并	5 years ago
qianhs	f1afdf92e9	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	24f9ed25c2	Jenkins自动合并	5 years ago
qianhs	9d744318cd	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	a0b67a3723	Jenkins自动合并	5 years ago
袁津哲	8285c87624	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	16a414192f	Jenkins自动合并	5 years ago
曾贞一	c543043da5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	328f2e64c5	【同批次修改】	5 years ago
qianhs	2eb14492d4	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	7057c685cc	Jenkins自动合并	5 years ago
E	c7a2c79f26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	8e168c5109	Jenkins自动合并	5 years ago
袁津哲	ff4cd68e89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	c2e66de638	Wms动态搜索与自定义列表，表单开发	5 years ago
袁津哲	86694d3ceb	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	e88b93a22c	Jenkins自动合并	5 years ago
gcj	8245950fd3	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	51c66e9279	【宁德问题清单】	5 years ago
jenkins	8d614aef8d	Jenkins自动合并	5 years ago
陈思洁	1e0a0ff4fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c24de431d4	【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】	5 years ago
曾贞一	c3ad3d260a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	3d7f88d2ee	【7201 收货BOP移库流程图】	5 years ago
gcj	8414af2011	【按规则推送邮件】	5 years ago
gcj	890b094e15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	7090f30b94	【按规则推送邮件】	5 years ago
jenkins	56e53906ec	Jenkins自动合并	5 years ago
qianhs	241350ae83	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
E	0cc70fe2d0	【#1390 基础数据-客户信息增加导入功能】	5 years ago
jenkins	3db9a86504	Jenkins自动合并	5 years ago
袁津哲	fc19275ef0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4e0f40042a	Wms动态搜索与自定义列表，表单开发	5 years ago
陈思洁	b0065bd650	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	fa576d7a6d	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
jenkins	fe71007a5c	Jenkins自动合并	5 years ago
袁津哲	42bbb852c4	Wms初始化扫描实体字段新增逻辑优化	5 years ago
汪云昊	536200cf2b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
袁津哲	2f2f24356c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	daf3365ce3	Wms初始化扫描实体字段新增逻辑优化	5 years ago
gcj	cbe87c6bd7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	c14d6c6916	【宁德问题清单】	5 years ago
袁津哲	e5138ac4e9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	e1386275d0	Wms初始化扫描实体字段新增逻辑优化	5 years ago
陈思洁	99f79ee5db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	25606ea25a	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
袁津哲	29f785ed35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	7d4ba10449	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	ae8475de5d	Jenkins自动合并	5 years ago
许心洁	2f90982e68	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c53c8c04e3	BUG#7186	5 years ago
jenkins	b0bbf43a9b	Jenkins自动合并	5 years ago
宋军超	b0f60a9176	2020-01-08创建动态列表与查询model	5 years ago
jenkins	75dc17f4c4	Jenkins自动合并	5 years ago
e-jiawentao1	7b696d7e73	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	a92090a3ab	2020-01-07创建动态查询与表单各层	5 years ago
e-jiawentao1	c51453a856	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	9fbc120666	动态搜索与自定义列表初始化扫描Bean字段	5 years ago
jenkins	189bece3f7	Jenkins自动合并	5 years ago
e-jiawentao1	b2edab4ef4	2020-01-07创建动态查询与表单dao	5 years ago
e-jiawentao1	1dba90f768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	b939ce6625	2020-01-07创建动态查询实体	5 years ago
王杰	685d7949bf	Merge branch 'dev' into test	5 years ago
许心洁	7d63a933c0	生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑	5 years ago
jenkins	a685cd208d	Jenkins自动合并	5 years ago
许心洁	267ec6c647	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	823f818abf	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
许心洁	fe809e2eff	定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错	5 years ago
曾贞一	989e05c64c	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
jenkins	dfb06def2b	Jenkins自动合并	5 years ago
曾贞一	9e9d3e2afa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5a4510cedb	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
陈思洁	bae2130d72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1f1f6ec825	【KT-1346 增加拉动任务的暂停和开启】	5 years ago
WYnneaoapc	adb4bd2a1c	Merge branch 'dev' into test	5 years ago
puxiao.liao	0d2df2ec43	【 7194 Po明细导出，单据状态为中文 ... 】bug7194	5 years ago
puxiao.liao	a3a5e63baa	【 7194 Po明细导出，单据状态为中文 ... 】bug7194	5 years ago
许心洁	861f46323b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7594b3d515	SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消	5 years ago
E	a1276b5542	【#1338 库位物料中需要增加批量导入】	5 years ago
许心洁	a231651315	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	0a7f6ebf24	Merge branch 'dev' into test	5 years ago
gcj	b29347c409	【坤泰运输管理】	5 years ago
许心洁	9a272f8b6a	BUG#6755：移动单监听队列新增逻辑：如果当前处理的移动单的交易类型配置成需要推送异常邮件，并且全局参数“系统管理员”也有配置，则随送异常邮件	5 years ago
jenkins	688d976683	Jenkins自动合并	5 years ago
陈思洁	05efdbb568	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
陈思洁	1e1e5e907e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	472adfd03c	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
WYnneaoapc	569c2613fe	Merge branch 'dev' into test	5 years ago
puxiao.liao	f8e3edabc3	【 7159 线边退料逻辑错误，应该为：扫描A条码，输入原条码的剩余数量，拆包生成的新条码留在线边，原条码退回仓库。若数量与原条码相等，则不做拆包。 ... 】bug7159	5 years ago
jenkins	028ae09f9c	Jenkins自动合并	5 years ago
曾贞一	2da366630f	【VDA波次配料--物料汇总优化】	5 years ago
曾贞一	ed25a6f7d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	46bf93f410	【VDA波次配料--物料汇总优化】	5 years ago
jenkins	9ee137a5c3	Jenkins自动合并	5 years ago
gcj	5c838ebcf1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	62c50e04cc	【宁德问题清单】	5 years ago
jenkins	c830600235	Jenkins自动合并	5 years ago
E	b175de4635	【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型"	5 years ago
E	e962a1d22a	【#1331 KT-基础数据-物料信息】“标准包装”改为“标包”	5 years ago
许心洁	d5efd000b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	d94ccd5ac5	下线扣减交易处理组件BUG：获取双精度类型数值时应该判断是否为空getHandledQtyVal	5 years ago
王杰	7287aaeb77	其他组未提交的代码	5 years ago
E	9e47c4ac5a	【#1332 基础数据-容器类型管理】新增期限单位字段	5 years ago
jenkins	b96d22b011	Jenkins自动合并	5 years ago
许心洁	018908d3cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	032bd61b87	物料拆分新增等份拆分功能+ ... 快速移库写入移动单明细的行号写入规则不对，优化性能+ 下线扣减交易处理组件修改逻辑：有条码就扣减，移动单明细表新增已处理数量，处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+ 实时库存明细报表新增列“处理中数量”（待过账的数量）	5 years ago
puxiao.liao	d34ba5e114	【 经讨论六合一允许扫描来源或目标不同的零件号，但是提交时需要按照目标来源拆分成不同的单据 ... 】bug7068	5 years ago
jenkins	e306cc6cdc	Jenkins自动合并	5 years ago
qianhs	7f69df95df	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	1163faaac1	Jenkins自动合并	5 years ago
曾贞一	0493feaf80	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	1f8885779f	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
陆卫豪	56fe97e200	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	9d5eac441e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	b5d50af250	【KT-1284 计划拉动-生产计划管理】	5 years ago
曾贞一	6eafdb1d7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5ea55135dc	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
jenkins	320607590b	Jenkins自动合并	5 years ago
gcj	c199b977e5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	cfa465817f	【修改模糊查询】	5 years ago
王杰	06afd98334	Merge branch 'dev' into test	5 years ago
qianhs	34e4d837af	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	6a19a07fce	Jenkins自动合并	5 years ago
gcj	7e41cde458	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	894dbed46c	【宁德问题清单】	5 years ago
jenkins	f39163513c	Jenkins自动合并	5 years ago
曾贞一	4bd0aa8d57	【系统配置-模糊查询 】	5 years ago
jenkins	1fbd9c4357	Jenkins自动合并	5 years ago
gcj	9c2dcba09d	【运输管理】添加查询关联单号	5 years ago
jenkins	cc45dbc2cb	Jenkins自动合并	5 years ago
曾贞一	91716272a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	393d3f12b8	【7055 新增波次拣货流程】	5 years ago
jenkins	695a9b2e63	Jenkins自动合并	5 years ago
陈思洁	03982ad2e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	03eeacd273	【KT-1298 物流路线【处理模式】优化】	5 years ago
王杰	ab68895760	test分支修改pom	5 years ago
王杰	c87b00756f	dev分支修改pom	5 years ago
qianhs	1d7cf41653	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化	5 years ago
qianhs	4c8a94bdfa	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
qianhs	a2ac02aa47	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
E	69e20029e8	【1320 KT物料信息--需要维护物料的类型：器具】增加描述：90=器具库	5 years ago
gcj	a7d1ec785b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eb084d3904	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	0d7e64b160	在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中，省去每个组件中再去循环查询。	5 years ago
qianhs	5c28c8344c	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
WYnneaoapc	0191a17a4d	Merge branch 'dev' into test	5 years ago
gcj	b29d84bbad	【运输管理】	5 years ago
gcj	ba355aab55	【运输管理】	5 years ago
jenkins	5513e95884	Jenkins自动合并	5 years ago
gcj	01e5919349	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
jenkins	34b843bd1f	Jenkins自动合并	5 years ago
puxiao.liao	4f1455012f	【领料上线扫描时，在扫描完条码后将目标库位带出。 ... 】bug7024	5 years ago
gcj	0e1599789d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	d92850c1a4	【运输管理】	5 years ago
jenkins	03051f4fd1	Jenkins自动合并	5 years ago
puxiao.liao	0c01ffb230	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
jenkins	8efcd210aa	Jenkins自动合并	5 years ago
陈思洁	d0ddf208c3	【KT-1297 物流路线的【适用范围】优化】	5 years ago
jenkins	95048bce44	Jenkins自动合并	5 years ago
qianhs	d4d30bf634	【 零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】	5 years ago
汪云昊	1318c6ef56	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	5d4e8a94c4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c5ae91b41e	【KT-1286 计划拉动-计划拉动JOB】	5 years ago
jenkins	55dcb795c9	Jenkins自动合并	5 years ago
许心洁	258c1ccbe8	流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库	5 years ago
jenkins	cfebb937fb	Jenkins自动合并	5 years ago
gcj	4c2d922ed9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	2c63820f98	【运输管理】	5 years ago
jenkins	350f7101d2	Jenkins自动合并	5 years ago
puxiao.liao	da4f32f0b4	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
gcj	59e7704f67	【运输管理】装车单	5 years ago
陆卫豪	5393d6e034	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	40c64db0b1	冲突	5 years ago
陈思洁	ee14ce1d4b	【KT-快速入库功能】	5 years ago
jenkins	015d284239	Jenkins自动合并	5 years ago
puxiao.liao	99a1ec309d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	3bfb0995d5	【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 ... 】bug1299	5 years ago
jenkins	39f4c733a4	Jenkins自动合并	5 years ago
gcj	304677e7da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	91e3209ef9	【运输管理】	5 years ago
jenkins	6be1ef7dbd	Jenkins自动合并	5 years ago
许心洁	5a1dc6dc7d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	67f7d66782	宁德现场问题#330	5 years ago
jokelone	874fd139dc	Merge branch 'dev' into test	5 years ago
E	ef9293867f	【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】	5 years ago
jokelone	0dfb948810	Merge branch 'dev' into test	5 years ago
许心洁	927579aca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	fc663ee283	作业流程导入导出BUG#6189	5 years ago
陈思洁	45c1fc6571	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	129e60a6df	【KT-1284 计划拉动-生产计划管理】	5 years ago
gcj	a6bb80a5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	2e98e17a05	【运输管理】	5 years ago
qianhs	da2cfd77b0	【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】	5 years ago
陈思洁	7d07580a78	合并冲突	5 years ago
陈思洁	b9844c255b	生产计划表结构增加	5 years ago
gcj	3e6ca8d039	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	a1a3d1e838	【Bug清单】------------------------------	5 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