3192 Commits (yun-zuoyi)

Author	SHA1	Message	Date
wynne1005	b46bd3b354	feat(core): 平台添加用户名登录方式 支持钉钉授权 ... 平台添加用户名登录方式 支持钉钉授权	4 years ago
andly.pan	43d7195a37	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
钮海涛	4088a85a5c	更改左边界计算逻辑：后道工序满模即可开始。	4 years ago
joke.wang	49f709959d	15711 19081-邮件提醒内容每一条之间增加换行和序号	4 years ago
钮海涛	3dd67766b2	测试时间	4 years ago
joke.wang	eef6f8e18b	节假日 泰国	4 years ago
钮海涛	e918d85702	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	30048f4ce1	修改枚举	4 years ago
wynne1005	1323569c56	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	0c860de567	feat(SCREEN): 数据对象操作 1 ... 数据对象操作 1	4 years ago
王杰	844349d583	冲突	4 years ago
王杰	21a3d716f4	pom	4 years ago
王杰	5bf5504992	pom	4 years ago
puxiao.liao	f429c08f30	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	ae88dda60d	新增MDM对象转换工具。	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
钮海涛	508fd77881	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	4f697d51ec	演示问题修复	4 years ago
钮海涛	63a8aef96d	演示问题修复	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
钮海涛	736087852e	新增成品检验报工	4 years ago
钮海涛	33be7da477	新增成品检验报工	4 years ago
wynne1005	9c4b233975	refactor(core): 支持用户密码过期 ... Finish 21.4.8	4 years ago
陈思洁	6ffd586274	【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】	4 years ago
wynne1005	5b003a613b	screen修改关系表名 增加历史表	4 years ago
wynne1005	64c2ed920f	修改通用界面端口 还原第三方数据库连接字符串中的时区	4 years ago
wynne1005	714a32a994	first commit	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
github33	9a4aae9f68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
github33	a61f2c1778	CYCLE_RULE--新增枚举	4 years ago
王杰	38d03b1060	状态机优化	4 years ago
wynne1005	15633bc28e	tmp	4 years ago
汪云昊	1ef29d1fce	revert(pojo):还原pom版本	4 years ago
wynne1005	a44a4a8be3	Merge branch 'dev' into test	4 years ago
汪云昊	4272aad4ac	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	d45d5175dc	feat(softswitch):REST按状态码重试	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
钮海涛	ffa0aa94f8	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	caafb9c317	修改排程计划逻辑	4 years ago
puxiao.liao	f9c3fc705b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
simon.song	2dc6a886fe	14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题）	4 years ago
王杰	f8e0146b19	pom	4 years ago
曾贞一	f05c9bfaa4	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
joke.wang	6a00f4f7f9	14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序	4 years ago
汪云昊	46d94c051a	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
汪云昊	af4ce0fa32	feat(impp):组织结构添加事业部节点	4 years ago
钮海涛	ec35afa34e	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9f12a44fb6	完成插单功能	4 years ago
puxiao.liao	aec66afa83	修复泰国翻包	4 years ago
wynne1005	b48f30fd47	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	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
andly.pan	4261e9d34e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
钮海涛	a63334c5a1	去除事务sop	4 years ago
wynne1005	31f26f5b4f	Merge branch 'dev' into test	4 years ago
wynne1005	b8d254e55e	增加平台配置类型	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	8c3a652ada	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	6318ca6afc	feat(form): 动态表单新增跳转详情页枚举	4 years ago
王杰	f4e9bf4603	Merge branch 'test' into ext-dev	4 years ago
王杰	94d38bb175	test merge dev	4 years ago
joke.wang	e2a9222b47	pcn登陆限制	4 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	4 years ago
puxiao.liao	485fe13202	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	c880d51c9d	修复泰国翻包	4 years ago
王杰	dbc417269b	test merge ext-dev	4 years ago
王杰	03d95e2591	Merge branch 'dev' into test	4 years ago
王杰	e66a560661	冲突	4 years ago
王杰	4644639c2e	pom	4 years ago
王杰	c06902f8de	冲突	4 years ago
曾贞一	462ed4f1de	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
曾贞一	7b3ef8f268	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
曾贞一	5af6f3ae7f	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
王杰	096e2fc8bf	test merge ext-dev	4 years ago
王杰	f0c09ca0e6	Merge branch 'test' into dev	4 years ago
王杰	2b89e35c69	pom	4 years ago
王杰	78b5bb0c08	Merge branch 'test'	4 years ago
王杰	7111a3b60f	pojo	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
puxiao.liao	696a0a8c3f	修复单据条码展开日期	4 years ago
王杰	25303ffc55	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	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
王杰	d2f03a966e	Merge branch 'dev' into test	4 years ago
王杰	0183ca2a05	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	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
钮海涛	fe0a83a8fe	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	1bc4c491b6	修改导入功能	4 years ago
许心洁	3cfa736132	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
王杰	fba7f636d9	状态机	4 years ago
王杰	1e6691c8b5	Merge branch 'test' into dev	4 years ago
joke.wang	acaeb348e1	标签基础页面	4 years ago
许心洁	896a88de44	合并测服代码	4 years ago
王杰	c8b21c0b69	pom	4 years ago
许心洁	8246a28c05	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
puxiao.liao	8eb1831861	Fix bug#12607	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
Dominic_Xiao	2679582bc3	中航新增关闭开线检测功能	4 years ago
陈思洁	193c4a254c	【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】	4 years ago
王杰	7f6281f63e	报工数据查询报表	4 years ago
钮海涛	76cf0be79d	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	7d8fd15370	修复坤泰问题	4 years ago
汪云昊	b03d4bf573	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	1ea73e877f	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	cb9add43a3	feat(sms):短信模型，枚举调整	4 years ago
shun	9cdf5827a3	JIS发运报表增加导出枚举	4 years ago
钮海涛	2740830e8f	合并test代码	4 years ago
Dominic_Xiao	c72a294a6f	回滚POM	4 years ago
肖奕扬	9f25d80eac	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	66671bafb8	Fix bug#13581	4 years ago
王杰	58c7b6854b	pom	4 years ago
曾贞一	bbd5dccbf8	【合并分支】	4 years ago
钮海涛	a82d657366	修复坤泰问题	4 years ago
simon.song	9dbfc00e6f	13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29	4 years ago
simon.song	9ba8ae781d	13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29	4 years ago
王杰	0906539b82	总装 数据复核	4 years ago
puxiao.liao	129002573c	Fix bug#13399	4 years ago
王杰	605d620565	工位跳过记录	4 years ago
王杰	183a642c52	天津 安灯类型 增加 模具	4 years ago
钮海涛	d301332162	合并dev代码	4 years ago
simon.song	4e78dc93b0	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	0ee41dbda1	13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29	4 years ago
钮海涛	eea1084f84	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	6bfc2f92b0	修复坤泰问题	4 years ago
simon.song	a86a189fc3	13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29	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
王杰	5a0c89f79b	Merge remote-tracking branch 'i3plus-pojo/test' into test	4 years ago
王杰	b20fc8e552	总装 数据复核	4 years ago
puxiao.liao	7e400a1a68	Fix bug#13399	4 years ago
王杰	2ccee2523a	工位跳过记录	4 years ago
王杰	f63baa9c1a	天津 安灯类型 增加 模具	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
joke.wang	b58904bd94	国际化优化	4 years ago
王杰	d089d0fba8	Merge branch 'test' into dev	4 years ago
王杰	7e8970f3e2	数据复核	4 years ago
王杰	cd5b882e1f	dev merge test pom 冲突解决	4 years ago
钮海涛	4116dc6b91	修复坤泰问题	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
许心洁	30a6ef7ba5	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	56876e8cba	修复天津麦格纳问题	4 years ago
钮海涛	cfcde79f1f	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	230895c243	修复天津麦格纳问题	4 years ago
puxiao.liao	45201c42d3	盘点优化	4 years ago
wynne1005	b438735172	Merge branch 'test' into ext-dev	4 years ago
wynne1005	78d86be2f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
simon.song	4a120ca375	12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124	4 years ago
wynne1005	6472ebddba	mes枚举格式优化	4 years ago
joke.wang	c286c3d319	容器扫描工步逻辑修改	4 years ago
simon.song	effc34f74d	Merge remote-tracking branch 'remotes/origin/test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-mes-pcn/pom.xml	4 years ago
许心洁	d4696b54a3	墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举	4 years ago
puxiao.liao	0c50abaea8	修复条码状态查询异常	4 years ago
wynne1005	b1e09f09a3	mes添加stationwebsocket 的busiType类型 强制下线	4 years ago
钮海涛	95ba4d807b	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	0923584955	Sweb问题修复	4 years ago
joke.wang	da293141cd	oee bug修复	4 years ago
许心洁	de9578d439	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	4 years ago
许心洁	02decfe9c4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	5c1164a938	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	4 years ago
王杰	d64a8fd31c	工步参数 增加字段	4 years ago
puxiao.liao	c20922a455	Fix bug#12879 ... COGI调账支持出库单模式	4 years ago
simon.song	9b57f47af6	修改pom文件	4 years ago
wynne1005	d893e76ab4	merge	5 years ago
simon	55188db083	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	af732b7a4f	合并test代码	5 years ago
钮海涛	36130d12f2	新增供应商退货业务类型	5 years ago
钮海涛	6fe792f75b	posn新增供应商生产批次字段	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
钮海涛	b9283ec075	合并dev代码	5 years ago
钮海涛	b57ae573ed	合并test代码	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
陈思洁	88376bb350	【2958 11 2.5.3 热处理上件】	5 years ago
joke.wang	22411fa928	备件导入增加列	5 years ago
汪云昊	f2180f18f3	revert(pojo):还原pom版本	5 years ago
汪云昊	378205ef61	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	cc947c08f5	revert(pojo):还原pom版本	5 years ago
汪云昊	8f899f2f46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	4dd875a691	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	156b515497	修复SWEB问题	5 years ago
simon	7d451dc136	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	4c1add6ba4	修改中文描述	5 years ago
joke.wang	058bd05b4a	mgn-bj esop展示组件优化	5 years ago
汪云昊	3af9790a9e	refactor(impp):调整描述注解	5 years ago
puxiao.liao	89bf22521a	Fix bug#12380 ... 19048-支持批量下发BOM的功能	5 years ago
puxiao.liao	b124db3383	天津麦格纳看板BUG修复	5 years ago
joke.wang	e18b6c727e	mgn-bj强制封箱完成后重置数据	5 years ago
simon	1ba56bc59a	调整过程检验返回结果	5 years ago
汪云昊	f2a6ddd55a	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	426a6f2026	feat(ftp):ftp重试功能	5 years ago
汪云昊	7a6137a667	Merge remote-tracking branch 'origin/dev' into test	5 years ago
puxiao.liao	679ef67457	天津麦格纳看板BUG修复	5 years ago
rock.yu	bc3e94923f	增加数据源的类型	5 years ago
Aisiyu	a2a4a85312	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	1680314d49	[1211 天津麦格纳货运看板和asn看板修改 ]	5 years ago
rock.yu	3a5e446e90	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	77d8aa4bdd	修改天津工单拉动逻辑	5 years ago
汪云昊	8d66424bf6	fix(form):分页错误	5 years ago
汪云昊	2121124f4b	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	faf9bd4b14	fix(form):分页失效	5 years ago
汪云昊	3b1c068290	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	eb9e520d76	fix(form):分页失效	5 years ago
puxiao.liao	85d2f03b55	修复麦格纳BUG	5 years ago
wynne1005	48c1d2c1c8	feat(tj) 文件上传	5 years ago
wynne1005	8a648eab74	新增mysql连接时区	5 years ago
simon	ece1ca4c01	调整中航看板返回，修复中航pcn原材料上线bug	5 years ago
wynne1005	c118aac425	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	a2cf356516	修改mysql驱动版本 兼容mysql8	5 years ago
王杰	46c22020bd	总装 质量判定缺陷增加类型代码	5 years ago
汪云昊	1825cfbdf3	revert(pojo):还原pom版本	5 years ago
wynne1005	88c942f509	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	fb5df5aedf	照片采集完成	5 years ago
joke.wang	f38e41f1ec	增加看板类型	5 years ago
汪云昊	e87740e723	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	f47b699146	feat(form):支持存储过程参数	5 years ago
joke.wang	63b7162932	mgn-bj 半成品看板	5 years ago
汪云昊	dceb9b17a5	revert(pojo):还原pom版本	5 years ago
汪云昊	91f68d50d4	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	91b1a67f30	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	eb03280b2d	doc(sql):getStringLikePack方法标记不推荐	5 years ago
汪云昊	f1ab018d85	feat(softswitch):重试功能	5 years ago
Aisiyu	8b94991408	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	2db034a7f8	[1211 天津麦格纳WMS-ASN到货看板 ]	5 years ago
曾贞一	d8e5aa44bc	pom.xml	5 years ago
陈思洁	8dfcb7f429	【合并冲突】	5 years ago
陈思洁	3dc951c34f	【11964 19048-喷涂抛光报表变更-20201021】	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
曾贞一	5487c165ff	【11883 20021--北美领料需求变更--1023】	5 years ago
joke.wang	f57f4e25be	mgn-bj 总屏看板	5 years ago
汪云昊	a9520cecf7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	31cdda5b33	feat(softswitch):适配记录,FTP文件支持SID	5 years ago
曾贞一	c9378a7d8c	【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】	5 years ago
Dominic_Xiao	df35a22aac	解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句	5 years ago
Dominic_Xiao	5e1d0a75c9	解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句	5 years ago
Dominic_Xiao	4684466e7e	解决BUG:19048-班次时间显示异常:修改查询的SQL语句	5 years ago
Dominic_Xiao	f57be38c2b	解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句	5 years ago
许心洁	586365dc69	任务#2893,#2894,#2901	5 years ago
陈思洁	6fcf32aa80	【2890 10 2.3.8安灯作业优化】	5 years ago
puxiao.liao	62d5d62cef	北京MGN系列BUG修复	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
陈思洁	a6acf3d616	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	82a769cae1	【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 ... 2887 10 2.3.7安灯通知优化	5 years ago
songss	ef316af0c1	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
wynne1005	78a3943a3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4c86b836ca	OP20b逻辑变更 esop展示变更	5 years ago
汪云昊	15dc4b00c7	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ed22bd6f64	feat(form):存储过程调用适配mysql,mssql	5 years ago
puxiao.liao	ba81af744b	北京麦格纳看板	5 years ago
王杰	bb3039d1f2	包装关系查询宝贝	5 years ago
贾文涛	2301e03c85	增加呼叫不需要弹窗的枚举。	5 years ago
songss	3e629e63c5	控制计划-过程检验逻辑调整	5 years ago
wynne1005	9629823a79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	b00bcf66b2	图片展示类型	5 years ago
汪云昊	72e25305bf	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	a4bc17b0a6	feat(form):sap_hana数据库支持	5 years ago
wynne1005	05152538b2	合并冲突	5 years ago
wynne1005	fc36e55a38	新增mes 报表查询周期枚举	5 years ago
joke.wang	df063af038	物料类型1增加枚举	5 years ago
joke.wang	6930fdfbe7	mgn-bj 产线枚举优化	5 years ago
钮海涛	61d123cfc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	93626dad0f	新增质检完成状态报表	5 years ago
songss	578e2c5155	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
songss	bfe4b4f069	社保故障自动获取任务完善，根据不同等级调用不同的安灯接口	5 years ago
宋军超	fcc66835b8	开发天津看板功能	5 years ago
汪云昊	ce054916b4	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	401fccd4dc	fix(impp):DdlPreparedPack类处理大于小于错误	5 years ago
宋军超	d372256a68	添加喷涂不良类型枚举	5 years ago
宋军超	bd9547b825	优化天津麦格纳报表	5 years ago
陈思洁	11b461f1d6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1706b7a684	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
joke.wang	233853e1e6	库存排程	5 years ago
陈思洁	30f8e332fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	8f060d4aa4	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
joke.wang	c442845f94	跳序变更	5 years ago
汪云昊	2b6ff6498c	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	05f493b80e	feat(softswitch):添加重试功能	5 years ago
wynne1005	ebf0392057	去除多余optionType枚举	5 years ago
wynne1005	470775b527	备件生成冲突解决	5 years ago
wynne1005	f52f07fe77	备件导入	5 years ago
汪云昊	e97a1193e1	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	27088d2db5	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	e97369585d	fix(core):在用户未登录时国际化无效	5 years ago