2255 Commits (53bd4066f2eededff7e58cae2bafb1b13a14f8b7)

Author	SHA1	Message	Date
肖奕扬	33c26c7dd3	Merge branch 'ext-dev' into test	4 years ago
Dominic_Xiao	f5a7487799	设备周期作业计划配置新增指派人字段	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
castle.zang	fa4f5c6900	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	e2682b8a98	17114 19081-返工返修显示的BYPASS项需要可以设置-20210820	4 years ago
王宝玉	35f09a6e50	产线多次提交数据以及 优化首页接口和不合格审理单	4 years ago
puxiao.liao	e3ebdfeb2c	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	9ea42cd032	16818 20135-热处理绑定没有定成功CMS标签成功	4 years ago
Dominic_Xiao	6e94cb6c47	人员技能增加有效校验	4 years ago
Dominic_Xiao	388fc9089c	16895 19081-PC-MES-人员技能-禁用后数据已经显示-20210730	4 years ago
肖奕扬	72c61c5426	Merge pull request '1629 19048-组装关键件绑定增加解绑功能-20210625' (#283) from honghui.jiang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/283	4 years ago
蒋鸿辉	cac0421b99	1629 19048-组装关键件绑定增加解绑功能-20210625	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
joke.wang	db9dcabf1f	报工表增加索引	4 years ago
Dominic_Xiao	69e2f819f2	16891 19081-EOL看板-19:00至00:00显示数据为0-20210730	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	af21429f34	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	4b1228fbbc	代码回滚	4 years ago
Dominic_Xiao	91bd3d9021	北京隔离报废打印	4 years ago
Dominic_Xiao	5a44baf73a	北京报废打印变更	4 years ago
jhh2579	54279d43ff	中航工序外协检	4 years ago
jhh2579	9dac40797a	中航工序外协检-2	4 years ago
jhh2579	f4e6c63956	中航工序外协检	4 years ago
nies	5da810fb20	Merge branch 'test' into dev	4 years ago
puxiao.liao	1a403dfefd	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	efbb51711e	16826 19081-备件计划导入功能增加数量选项，便于快速导入-20210723	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	a086d24203	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	d2ec6e27a5	条码注释掉版本字段	4 years ago
puxiao.liao	e48341f47b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	4 years ago
Dominic_Xiao	4297c59ef4	去除无效索引	4 years ago
Dominic_Xiao	5c62f1b0d5	产线班次时段新增顺序字段	4 years ago
Dominic_Xiao	adfec8957d	看板班次时段增加序号	4 years ago
puxiao.liao	48fb24f3d7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	2521606f5b	删掉无效索引	4 years ago
puxiao.liao	ac535feab8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	370f4e9a02	强过报工定时任务	4 years ago
puxiao.liao	59677dc00a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	c3a018dc1f	零件消耗数量模型	4 years ago
王杰	a1fcd53e1f	Merge branch 'test' into ext-dev	4 years ago
王杰	c22117f395	Merge branch 'test' into dev	4 years ago
王杰	257bd43a8f	对象结构增加plc代码	4 years ago
puxiao.liao	11296ad9f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	cfcb4bda03	设备故障现象增加上传图片	4 years ago
puxiao.liao	9a952c4f3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	c8b994a596	作业任务查询新增设备代码	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	d325e01e0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	7c67e954c7	设备任务上传文件	4 years ago
Dominic_Xiao	9c94d857d7	泰国电检条码打印	4 years ago
joke.wang	52f4ea0331	设备任务上传文件	4 years ago
joke.wang	fd32eb6bf8	工装使用次数预警job	4 years ago
joke.wang	d96f4b5d74	16496 19081-设备管理调整-	4 years ago
wynne1005	bb88851f17	还原pom	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
joke.wang	3c42131f2b	16436 19081-PCN-返工返修-隔离-基于条码查询零件时-散件清单和物料bom，和增加物料名称查询条件	4 years ago
陈思洁	e3a558913b	【3566 20063-鉴定报工-20210618】	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
王杰	a71774ba24	pom	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
Dominic_Xiao	7a92162ca6	卡斯马锁定记录表增加工位名称字段	4 years ago
王杰	005d3ef8f9	物料	4 years ago
Dominic_Xiao	5a354229f7	泰国电检	4 years ago
Dominic_Xiao	66c627a698	新增泰国扭矩产线专用条码生成规则	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
Dominic_Xiao	1b01f74f42	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	33b4b60c38	报废率趋势优化	4 years ago
joke.wang	8b5447f5ca	停机统计报表	4 years ago
Dominic_Xiao	6947405f44	16328 20135--锁定记录增加零件码这个字段--2021-06-23	4 years ago
jun	0a8ad27fbb	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
宋双双	bef8415707	更新 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java' ... 泰国需求：接口表增加PACKAGE_NO字段索引	4 years ago
陈思洁	5cda292bc2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	29d62c4334	【3484 20063-待处理报工基础数据-20210610】	4 years ago
Dominic_Xiao	35e41f94e1	卡斯马锁定记录表锁定状态赋默认值	4 years ago
Dominic_Xiao	dbdcbec032	产品工序过程报表新增料架号字段	4 years ago
Dominic_Xiao	aa78fd8bd5	卡斯马异常锁定	4 years ago
puxiao.liao	9333bfc996	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	27ceea4113	16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18	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	e7df36d3e9	还原merge pom	4 years ago
wynne1005	69d872be7e	Merge branch 'dev' into test	4 years ago
puxiao.liao	2acc57e72d	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	778df56d2e	16217 20135--增加料架需要跟生产线绑定关系--2021-06-08 ... 16162 20135--自动操作增加工号扫码（在每一个工位第一步扫码工号，每操作一次需要扫描一次工号）--2021-06-28 16152 20135--异常锁定，解锁和解锁记录--2021-06-25	4 years ago
王杰	4fe445e4c3	test merge dev	4 years ago
puxiao.liao	590c433b89	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	c67f263e5d	卡斯马不良品处理格式化代码	4 years ago
joke.wang	cda0f670eb	16198 19081-工位工时统计	4 years ago
joke.wang	a271672ff5	产品追溯报表优化	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
joke.wang	5eae801feb	16073 19081-看板管理-产量看板-产量看板调整	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