849 Commits (00851bf69f7a637ea0b4e824dbe642abe29bf19f)

Author	SHA1	Message	Date
puxiao.liao	c42a4b250d	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
曾贞一	00a12b8a1c	【15902 19125+ASN业务收货条码，收货完成后。在打印中心-条码打印状态标记为已打印+0519】	4 years ago
王杰	5d33795cff	test merge dev	4 years ago
puxiao.liao	a001dae575	代码回滚	4 years ago
李俊生	206b522af5	pom冲突	4 years ago
李俊生	85dd71b1ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
wynne1005	83b4cb64df	merge dev	4 years ago
wynne1005	b46bd3b354	feat(core): 平台添加用户名登录方式 支持钉钉授权 ... 平台添加用户名登录方式 支持钉钉授权	4 years ago
王杰	5bf5504992	pom	4 years ago
puxiao.liao	3af79ea582	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	a9881bc01f	修复泰国产品条码统计	4 years ago
puxiao.liao	b6a502475a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java	4 years ago
曾贞一	57a9a8b4fd	【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】	4 years ago
汪云昊	ec605315bb	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
汪云昊	862256e751	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
汪云昊	9241c60f07	feat(mdm):通用导入导出及外部应用扩展	4 years ago
puxiao.liao	2adc935bb0	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-mes-pcn/pom.xml sonar-project.properties	4 years ago
汪云昊	1ef29d1fce	revert(pojo):还原pom版本	4 years ago
wynne1005	44f61e1525	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	385156cd18	refactor(core): SSO 支持方式变更	4 years ago
王杰	f8e0146b19	pom	4 years ago
曾贞一	f05c9bfaa4	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
钮海涛	1072a62f79	PDA首页增加目标存储区显示	4 years ago
andly.pan	5859716998	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
andly.pan	5e98df411e	更改重置参数 ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
汪云昊	960ec37cbc	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
汪云昊	a067683998	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
puxiao.liao	2da5b569a6	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
puxiao.liao	29ee22da5d	软适配定时任务的修改	4 years ago
andly.pan	754124ff25	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
汪云昊	c6031a0fc4	feat(softswitch):添加sap-rfc适配器	4 years ago
wynne1005	1f94eee641	Merge branch 'dev' into test	4 years ago
wynne1005	6318ca6afc	feat(form): 动态表单新增跳转详情页枚举	4 years ago
王杰	f0c09ca0e6	Merge branch 'test' into dev	4 years ago
王杰	2b89e35c69	pom	4 years ago
许心洁	1367584df0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	cf83ab060d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
许心洁	5fae039262	合并测服代码	4 years ago
许心洁	071b0ea9ce	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... # Conflicts: # sonar-project.properties	4 years ago
许心洁	410b95aefd	Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms ... # Conflicts: # modules/i3plus-wms-apiservice/pom.xml	4 years ago
王杰	5a5874b137	test	4 years ago
王杰	45a1b63a23	Merge branch 'test'	4 years ago
王杰	84d9ec15f2	pom	4 years ago
王杰	f1db936f42	pom	4 years ago
wynne1005	665a89a8ae	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	5b2f57450b	feat(core): 松下GID单点登录需求 ... 支持E9方式的SSo	4 years ago
王杰	c8b21c0b69	pom	4 years ago
许心洁	d107c7a3fe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
肖奕扬	0ee06f6e03	Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	6fab12fc50	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	e72c2dd09a	任务#2586	4 years ago
puxiao.liao	d486da1120	增加二维码生成功能	4 years ago
钮海涛	2740830e8f	合并test代码	4 years ago
王杰	58c7b6854b	pom	4 years ago
曾贞一	bbd5dccbf8	【合并分支】	4 years ago
钮海涛	d301332162	合并dev代码	4 years ago
汪云昊	2cfbe85ab6	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	718466b8df	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	60ef8f3b96	feat(sms):平台短信功能	4 years ago
钮海涛	baed7db4ed	合并dev代码	4 years ago
钮海涛	48b4e45850	Merge remote-tracking branch 'remotes/origin/test' into dev	4 years ago
钮海涛	6e5ea4462f	合并master代码	4 years ago
钮海涛	977b8ac23c	Merge remote-tracking branch 'remotes/origin/test'	4 years ago
puxiao.liao	268c04ddf3	Fix bug#13229	4 years ago
王杰	cd5b882e1f	dev merge test pom 冲突解决	4 years ago
许心洁	3d1d05ef1c	1.天津委外发运库存移动单打印	4 years ago
许心洁	1474be7486	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	0bb69b6505	优化盘点	4 years ago
许心洁	de9578d439	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	4 years ago
Dominic_Xiao	86f9faa01d	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
puxiao.liao	ad0325f7df	修复天津BUG	5 years ago
wynne1005	d893e76ab4	merge	5 years ago
wynne1005	aa450c10e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bdf8e0d782	错误pojo修改	5 years ago
Dominic_Xiao	167b0dad0c	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
puxiao.liao	46cc056a43	修复天津BUG	5 years ago
simon	55188db083	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	af732b7a4f	合并test代码	5 years ago
puxiao.liao	9b70e3c7bf	fifo 推荐过滤条码	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
许心洁	66de2c1cbb	任务#2965	5 years ago
许心洁	4757408a3b	任务#2965	5 years ago
钮海涛	89a45d326b	合并test代码	5 years ago
钮海涛	f63813d66d	合并master代码	5 years ago
钮海涛	ceebe541f2	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
汪云昊	f2180f18f3	revert(pojo):还原pom版本	5 years ago
汪云昊	cc947c08f5	revert(pojo):还原pom版本	5 years ago
汪云昊	8f899f2f46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	fdec58c92a	feat(form):表单导入功能支持	5 years ago
汪云昊	206e5f8d20	feat(form):支持导入数据	5 years ago
汪云昊	1825cfbdf3	revert(pojo):还原pom版本	5 years ago
puxiao.liao	e68735be83	MOVE_SN 增加 left_code 属性	5 years ago
汪云昊	c9b4b37c23	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	687de9d828	feat(form):支持存储过程参数	5 years ago
曾贞一	d8e5aa44bc	pom.xml	5 years ago
曾贞一	9a350912ea	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java	5 years ago
汪云昊	31cdda5b33	feat(softswitch):适配记录,FTP文件支持SID	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
puxiao.liao	6907ab6dc0	北京麦格纳看板需求	5 years ago