3158 Commits (6d88569204e74ae4360c610de379475972c20a72)

Author	SHA1	Message	Date
聂帅	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
Dominic_Xiao	e7044a6dfe	修复数据迁移校验数据源BUG	4 years ago
nies	eb7e63ffec	王杰:生产数据表 增加系统同步标志,核心包 条码 包装 表增加系统同步标志	4 years ago
钮海涛	df068126ff	Merge remote-tracking branch 'origin/ext-dev' into ext-dev ... # Conflicts: # modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java	4 years ago
jun	62ddd292c9	17619 19081-盘点策略-增加循环规则	4 years ago
于学杰	ae904b8981	Merge pull request '增加了一个方法' (#290) from test into ext-dev ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/290	4 years ago
钮海涛	1736ff0ac9	恢复部分资源评估选项。	4 years ago
nies	17c7ff73d5	Merge branch 'test' into ext-dev	4 years ago
聂帅	b8b9daf870	Merge pull request '17245 19081-出库单-条码明细-导出报错' (#289) from junsheng.li/i3plus-pojo-junsheng:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/289	4 years ago
jun	9f7718d92d	17245 19081-出库单-条码明细-导出报错	4 years ago
于学杰	0a8acc71b2	Merge pull request '产线多次提交数据以及 优化首页接口和不合格审理单' (#286) from baoyu.wang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/286	4 years ago
王宝玉	35f09a6e50	产线多次提交数据以及 优化首页接口和不合格审理单	4 years ago
puxiao.liao	d5f8e50dfd	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
andly.pan	98fb50c059	增加枚举 ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
gsz	258e51aaf1	新增二车间工作工序枚举	4 years ago
钮海涛	0450e2665a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	d69c8e682b	销售订单拆分下发。	4 years ago
puxiao.liao	31344a9317	代码合并	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
puxiao.liao	e44798bd4a	代码合并	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
Wynne	0dd2f3b3c3	通用界面 requestmodel修改方法组id	4 years ago
puxiao.liao	4b1228fbbc	代码回滚	4 years ago
钮海涛	8b3bdc40fe	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	c8074d219a	延期订单问题修复	4 years ago
puxiao.liao	c4a691ecb9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	1b3b5ea6a5	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	3bfb61178b	修改MES_QC_CHECK_TYPE	4 years ago
nies	88781e7831	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	4850f4ccc2	新增tms的SOFT_TYPE	4 years ago
jun	d0c62b9b2d	16909 19081-生产报废单导入XLS后，单据类型是【隔离报废】，而不是正常的【生产报废单】	4 years ago
puxiao.liao	b44e02cdf6	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jhh2579	f4e6c63956	中航工序外协检	4 years ago
puxiao.liao	4de836b28a	质检明细状态增加选别	4 years ago
nies	5da810fb20	Merge branch 'test' into dev	4 years ago
钮海涛	5b41f25711	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	13d015e79a	工序间最大间隔限制调整前	4 years ago
Wynne	55af273ea7	feat(Screen): 界面回显 ... 界面回显	4 years ago
puxiao.liao	e4b7159fc7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	804401e12c	修复枚举导出异常	4 years ago
puxiao.liao	4250f215f2	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	f0c0a4038c	ua配置	4 years ago
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	4 years ago
wynne1005	8cb6abc09d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	c55875e129	feat(screen): 7.7 通用界面与前端完成回显 ... 7.7 通用界面与前端完成回显	4 years ago
王杰	c22117f395	Merge branch 'test' into dev	4 years ago
puxiao.liao	70ec23db12	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	72a2a24cf7	用户信息优化	4 years ago
puxiao.liao	c842d3e5e5	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
nies	0cda9012f2	Merge branch 'test' into dev	4 years ago
joke.wang	d96f4b5d74	16496 19081-设备管理调整-	4 years ago
wynne1005	bb88851f17	还原pom	4 years ago
wynne1005	0e21856803	Merge branch 'dev' into test	4 years ago
wynne1005	85b922d492	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	42fb211a26	625 数据对象更新	4 years ago
puxiao.liao	7e8b0fdb42	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	76af5bc47d	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	7109cc8acb	生产计划下发到MES	4 years ago
陈思洁	28474c8aba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	fc8619208a	pom	4 years ago
王杰	1f1acc05a3	Merge branch 'test' into ext-dev	4 years ago
王杰	a71774ba24	pom	4 years ago
王杰	3e63b97bc3	Merge branch 'test' into dev	4 years ago
王杰	c14eb6e0bb	pcn	4 years ago
王杰	21ca70f863	pom	4 years ago
jun	bda7b30475	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	0a148e4035	增加质检枚举信息	4 years ago
wynne1005	d6b2bce9b0	fix(screen): 6.21 枚举调整 增删改查测试 ... 6.21 枚举调整 增删改查测试	4 years ago
puxiao.liao	17151a9b79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	5a354229f7	泰国电检	4 years ago
陈思洁	9ea5b11f20	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	02cf004828	【3566 20063-鉴定报工-20210618】	4 years ago
puxiao.liao	a4bc97c5da	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	8b5447f5ca	停机统计报表	4 years ago
陈思洁	0170a86f60	【3484 20063-待处理报工基础数据-20210610】	4 years ago
puxiao.liao	93906742a6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	ee42edc94c	【3484 20063-待处理报工基础数据-20210610】	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	2f903e07fa	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	224e3a9a51	字段和枚举的新增	4 years ago
puxiao.liao	de75b43008	增加质检枚举信息	4 years ago
wynne1005	261d5b3655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
puxiao.liao	a8b163261d	mysql 版本修改	4 years ago
钮海涛	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	4 years ago
王杰	a0f4fef78d	Merge branch 'dev' into test	4 years ago
王杰	bddf876ee3	工位展示组件 增加 doFunction 方法	4 years ago
王杰	4fdab21958	Merge branch 'test' into ext-dev	4 years ago
王杰	15dc951bf1	dev merge test	4 years ago
王杰	5d33795cff	test merge dev	4 years ago
王杰	ab1bc23eb7	Merge branch 'test' into dev	4 years ago
wynne1005	95ac5f0ee3	feat(screen): jdbc拼接初步完成 待整理代码 ... jdbc拼接初步完成 待整理代码	4 years ago
puxiao.liao	a001dae575	代码回滚	4 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	4 years ago
李俊生	206b522af5	pom冲突	4 years ago
钮海涛	7c60ce4cdc	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	b5bbf7aefb	增加等待时间评估规则	4 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	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
钮海涛	f50d358cdd	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
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