879 Commits (3d36dc9437edbd9dbfb74b22c6531409a9473134)

Author	SHA1	Message	Date
nies	5acd3270f9	修改pom中版本为1.0.0.1	4 years ago
nies	968708d1b8	删除多余的taskNo	4 years ago
聂帅	98706bcc20	Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299	4 years ago
castle.zang	e75c5d35ae	删除多余字段taskNo	4 years ago
nies	17c7ff73d5	Merge branch 'test' into ext-dev	4 years ago
rock.yu	9e944b5440	解决代码编译不通过的问题	4 years ago
puxiao.liao	d7b34facf0	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-andon/pom.xml modules/i3plus-pojo-aps/pom.xml modules/i3plus-pojo-base/pom.xml modules/i3plus-pojo-bsp/pom.xml modules/i3plus-pojo-form/pom.xml modules/i3plus-pojo-hardswitch/pom.xml modules/i3plus-pojo-ics/pom.xml modules/i3plus-pojo-jobflow/pom.xml modules/i3plus-pojo-lac/pom.xml modules/i3plus-pojo-mdm/pom.xml modules/i3plus-pojo-mes-pcn/pom.xml modules/i3plus-pojo-mes/pom.xml modules/i3plus-pojo-model/pom.xml modules/i3plus-pojo-platform/pom.xml modules/i3plus-pojo-ptl/pom.xml modules/i3plus-pojo-report/pom.xml modules/i3plus-pojo-screen/pom.xml modules/i3plus-pojo-softswitch/pom.xml modules/i3plus-pojo-sweb/pom.xml modules/i3plus-pojo-wms/pom.xml modules/i3plus-pojo-workflow/pom.xml pom.xml sonar-project.properties	4 years ago
Dominic_Xiao	30eb4e2194	回滚POM版本	4 years ago
Wynne	7de40e37f5	Merge branch 'dev' into test	4 years ago
Wynne	bd3dcbac3a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	21a3e58b0c	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
nies	51160a4586	更新用户导入model	4 years ago
nies	0a36e83fd5	更新用户导入的model	4 years ago
puxiao.liao	24a0f1026f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
nies	5da810fb20	Merge branch 'test' into dev	4 years ago
nies	1e0f9a847a	新增人员导入的model类	4 years ago
puxiao.liao	1ff31386af	规则加载加入路径配置	4 years ago
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	4 years ago
gsz	cb3b714a69	Merge branch 'test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-screen/pom.xml	4 years ago
nies	f9eac5d6af	更新AccountExportModel	4 years ago
王杰	a1fcd53e1f	Merge branch 'test' into ext-dev	4 years ago
王杰	c22117f395	Merge branch 'test' into dev	4 years ago
nies	9879d6a7b9	新增账户导出的model	4 years ago
wynne1005	bb88851f17	还原pom	4 years ago
wynne1005	321209f2b4	Merge branch 'test' into ext-dev	4 years ago
wynne1005	e7df36d3e9	还原merge pom	4 years ago
wynne1005	7aa3d4bddf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	2b0a7198a5	fix(impp-framework core block): 统一提交 ... 还原pom 添加界面 icloud 升级mysql 驱动版本 添加松下日志切面	4 years ago
王杰	4fe445e4c3	test merge dev	4 years ago
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