3067 Commits (d5f6d501b56b8b040fb9d38f95221d08a36403f8)

Author	SHA1	Message	Date
钮海涛	81bbe8476a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	6e6b0a7c11	排程结果优化	4 years ago
wynne1005	2f1b184e9f	fix(impp): 格式化 ... 格式化	4 years ago
puxiao.liao	0d73e0797e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
wynne1005	4f74fdaa3d	密码过期策略加入安全策略	4 years ago
puxiao.liao	52bb4fe82f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	3fa05bc816	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	1f84c2f8aa	【15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22】	4 years ago
王杰	c7a62d52b5	Merge branch 'test' into ext-dev	5 years ago
王杰	a0f4fef78d	Merge branch 'dev' into test	5 years ago
王杰	bddf876ee3	工位展示组件 增加 doFunction 方法	5 years ago
王杰	4fdab21958	Merge branch 'test' into ext-dev	5 years ago
王杰	15dc951bf1	dev merge test	5 years ago
王杰	5d33795cff	test merge dev	5 years ago
王杰	ab1bc23eb7	Merge branch 'test' into dev	5 years ago
wynne1005	95ac5f0ee3	feat(screen): jdbc拼接初步完成 待整理代码 ... jdbc拼接初步完成 待整理代码	5 years ago
puxiao.liao	a001dae575	代码回滚	5 years ago
puxiao.liao	eb8f03cf19	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-jobflow/pom.xml	5 years ago
李俊生	206b522af5	pom冲突	5 years ago
钮海涛	7c60ce4cdc	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
钮海涛	b5bbf7aefb	增加等待时间评估规则	5 years ago
puxiao.liao	48d2f6680a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-screen/pom.xml	5 years ago
李俊生	85dd71b1ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-screen/pom.xml	5 years ago
wynne1005	83b4cb64df	merge dev	5 years ago
钮海涛	f50d358cdd	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
wynne1005	b46bd3b354	feat(core): 平台添加用户名登录方式 支持钉钉授权 ... 平台添加用户名登录方式 支持钉钉授权	5 years ago
潘天虎	43d7195a37	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	5 years ago
钮海涛	4088a85a5c	更改左边界计算逻辑：后道工序满模即可开始。	5 years ago
joke.wang	49f709959d	15711 19081-邮件提醒内容每一条之间增加换行和序号	5 years ago
钮海涛	3dd67766b2	测试时间	5 years ago
joke.wang	eef6f8e18b	节假日 泰国	5 years ago
钮海涛	e918d85702	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
钮海涛	30048f4ce1	修改枚举	5 years ago
wynne1005	1323569c56	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	0c860de567	feat(SCREEN): 数据对象操作 1 ... 数据对象操作 1	5 years ago
王杰	844349d583	冲突	5 years ago
王杰	21a3d716f4	pom	5 years ago
王杰	5bf5504992	pom	5 years ago
puxiao.liao	f429c08f30	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	5 years ago
钮海涛	ae88dda60d	新增MDM对象转换工具。	5 years ago
puxiao.liao	3af79ea582	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	5 years ago
puxiao.liao	a9881bc01f	修复泰国产品条码统计	5 years ago
钮海涛	508fd77881	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
钮海涛	4f697d51ec	演示问题修复	5 years ago
钮海涛	63a8aef96d	演示问题修复	5 years ago
汪云昊	ec605315bb	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	5 years ago
汪云昊	862256e751	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	9241c60f07	feat(mdm):通用导入导出及外部应用扩展	5 years ago
钮海涛	736087852e	新增成品检验报工	5 years ago
钮海涛	33be7da477	新增成品检验报工	5 years ago
wynne1005	9c4b233975	refactor(core): 支持用户密码过期 ... Finish 21.4.8	5 years ago
陈思洁	6ffd586274	【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】	5 years ago
wynne1005	5b003a613b	screen修改关系表名 增加历史表	5 years ago
wynne1005	64c2ed920f	修改通用界面端口 还原第三方数据库连接字符串中的时区	5 years ago
wynne1005	714a32a994	first commit	5 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	5 years ago
github33	9a4aae9f68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
github33	a61f2c1778	CYCLE_RULE--新增枚举	5 years ago
王杰	38d03b1060	状态机优化	5 years ago
wynne1005	15633bc28e	tmp	5 years ago
汪云昊	1ef29d1fce	revert(pojo):还原pom版本	5 years ago
wynne1005	a44a4a8be3	Merge branch 'dev' into test	5 years ago
汪云昊	4272aad4ac	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d45d5175dc	feat(softswitch):REST按状态码重试	5 years ago
wynne1005	44f61e1525	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	385156cd18	refactor(core): SSO 支持方式变更	5 years ago
钮海涛	ffa0aa94f8	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
钮海涛	caafb9c317	修改排程计划逻辑	5 years ago
puxiao.liao	f9c3fc705b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	5 years ago
simon.song	2dc6a886fe	14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题）	5 years ago
王杰	f8e0146b19	pom	5 years ago
曾贞一	f05c9bfaa4	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	5 years ago
joke.wang	6a00f4f7f9	14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序	5 years ago
汪云昊	46d94c051a	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	af4ce0fa32	feat(impp):组织结构添加事业部节点	5 years ago
钮海涛	ec35afa34e	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	5 years ago
钮海涛	9f12a44fb6	完成插单功能	5 years ago
puxiao.liao	aec66afa83	修复泰国翻包	5 years ago
wynne1005	b48f30fd47	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	960ec37cbc	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	5 years ago
汪云昊	a067683998	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
潘天虎	4261e9d34e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	5 years ago
钮海涛	a63334c5a1	去除事务sop	5 years ago
wynne1005	31f26f5b4f	Merge branch 'dev' into test	5 years ago
wynne1005	b8d254e55e	增加平台配置类型	5 years ago
潘天虎	754124ff25	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	5 years ago
汪云昊	c6031a0fc4	feat(softswitch):添加sap-rfc适配器	5 years ago
wynne1005	1f94eee641	Merge branch 'dev' into test	5 years ago
wynne1005	8c3a652ada	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6318ca6afc	feat(form): 动态表单新增跳转详情页枚举	5 years ago
王杰	f4e9bf4603	Merge branch 'test' into ext-dev	5 years ago
王杰	94d38bb175	test merge dev	5 years ago
joke.wang	e2a9222b47	pcn登陆限制	5 years ago
曾贞一	76079c9bee	Merge branch 'test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java	5 years ago
puxiao.liao	485fe13202	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	c880d51c9d	修复泰国翻包	5 years ago
王杰	dbc417269b	test merge ext-dev	5 years ago
王杰	03d95e2591	Merge branch 'dev' into test	5 years ago
王杰	e66a560661	冲突	5 years ago
王杰	4644639c2e	pom	5 years ago
王杰	c06902f8de	冲突	5 years ago
曾贞一	462ed4f1de	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	5 years ago
曾贞一	7b3ef8f268	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	5 years ago
曾贞一	5af6f3ae7f	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	5 years ago
王杰	096e2fc8bf	test merge ext-dev	5 years ago
王杰	f0c09ca0e6	Merge branch 'test' into dev	5 years ago
王杰	2b89e35c69	pom	5 years ago
王杰	78b5bb0c08	Merge branch 'test'	5 years ago
王杰	7111a3b60f	pojo	5 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	5 years ago
许心洁	410b95aefd	Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms ... # Conflicts: # modules/i3plus-wms-apiservice/pom.xml	5 years ago
puxiao.liao	696a0a8c3f	修复单据条码展开日期	5 years ago
王杰	25303ffc55	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
王杰	5a5874b137	test	5 years ago
王杰	45a1b63a23	Merge branch 'test'	5 years ago
王杰	84d9ec15f2	pom	5 years ago
王杰	f1db936f42	pom	5 years ago
王杰	d2f03a966e	Merge branch 'dev' into test	5 years ago
王杰	0183ca2a05	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
wynne1005	665a89a8ae	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	5b2f57450b	feat(core): 松下GID单点登录需求 ... 支持E9方式的SSo	5 years ago
钮海涛	fe0a83a8fe	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	1bc4c491b6	修改导入功能	5 years ago
许心洁	3cfa736132	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	5 years ago
王杰	fba7f636d9	状态机	5 years ago
王杰	1e6691c8b5	Merge branch 'test' into dev	5 years ago
joke.wang	acaeb348e1	标签基础页面	5 years ago
许心洁	896a88de44	合并测服代码	5 years ago
王杰	c8b21c0b69	pom	5 years ago
许心洁	8246a28c05	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
puxiao.liao	8eb1831861	Fix bug#12607	5 years ago
许心洁	d107c7a3fe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
肖奕扬	0ee06f6e03	Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev	5 years ago
Dominic_Xiao	2679582bc3	中航新增关闭开线检测功能	5 years ago
陈思洁	193c4a254c	【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】	5 years ago
王杰	7f6281f63e	报工数据查询报表	5 years ago
钮海涛	76cf0be79d	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	7d8fd15370	修复坤泰问题	5 years ago
汪云昊	b03d4bf573	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	1ea73e877f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	cb9add43a3	feat(sms):短信模型，枚举调整	5 years ago
shun	9cdf5827a3	JIS发运报表增加导出枚举	5 years ago
钮海涛	2740830e8f	合并test代码	5 years ago
Dominic_Xiao	c72a294a6f	回滚POM	5 years ago
肖奕扬	9f25d80eac	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	66671bafb8	Fix bug#13581	5 years ago
王杰	58c7b6854b	pom	5 years ago
曾贞一	bbd5dccbf8	【合并分支】	5 years ago
钮海涛	a82d657366	修复坤泰问题	5 years ago
simon.song	9dbfc00e6f	13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29	5 years ago