911 Commits (f1c2f71e873fb7bfde2c8d6183790eeaba2bf4ed)

Author	SHA1	Message	Date
jun	6fb3bebb71	问题清单bug修复	10 months ago
administrator	9254ace3fc	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	10 months ago
administrator	8950311d38	导入零件与产线关系	10 months ago
王杰	9bcc7452f8	清除不用代码	10 months ago
administrator	704e3c30ce	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	10 months ago
jun	11a0cafc90	打印模板不区分工厂	10 months ago
微笑着面对明天	f0da109d4c	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	6921b2d333	报工	10 months ago
jun	12a164f54f	bug 41859	10 months ago
jun	2e48c4f4e6	问题清单问题修复	10 months ago
administrator	308aa1603f	修改工单的生产序列号	10 months ago
jun	8eb0dd64e5	跨工厂防错表名修改	10 months ago
jun	f3ee1d1ab9	问题清单问题修复	10 months ago
jun	47e0abbd06	问题清单问题修复	10 months ago
jun	1be92c9e7b	返回值类型转换	10 months ago
jun	c94b8ba822	增加Pisces数据源	10 months ago
jun	bdeb76d456	增加pisces数据源	10 months ago
jun	52d1519a91	41816 试制件工单-手动插单时，不需要卡控零件产线对应关系	10 months ago
jun	1de46a3e8f	41793 MES-PC：演示过程-点检单页面问题	10 months ago
jun	1d24be316a	41815 MES:PC-生产工单-手动按钮报工，已完成数量也要累加	10 months ago
jun	9bbcc13ff5	41807 组件返工作业--返工单创建时间超过配置时间（增加配置）后，通过邮件提醒	10 months ago
jun	c9998589da	排序工单导入问题修复	10 months ago
微笑着面对明天	e2b71f8ceb	业务履历新增	10 months ago
微笑着面对明天	f0c39b0a6c	业务履历新增	10 months ago
王杰	80402f86f0	编码规则	10 months ago
微笑着面对明天	844dafc2ce	业务履历	10 months ago
王杰	12d3944353	误删文件	10 months ago
gsz	5374bf371b	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	10 months ago
gsz	1f63093d15	主子工位卡控去掉	10 months ago
jun	059bd13f16	41785 产线看板查询点检结果存在显示异常	10 months ago
jun	8f88fcadac	跨工厂防错功能开发	10 months ago
gsz	56f285e1cf	QMS点检结果脚本	10 months ago
administrator	552e0098c4	增加产线与工位的关系--校验唯一性	10 months ago
administrator	c8dd6fef9a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
administrator	712b62051c	增加产线与工位的关系	10 months ago
gsz	d15d620e92	MES_QMS报废品汇总+MES可疑品汇总JOB	10 months ago
administrator	fceafc19ee	增加产线与工位的关系	10 months ago
administrator	cd28b340aa	Bto增加produceSeq规则	10 months ago
jun	2d9e5bd025	新增试制件逻辑	10 months ago
jun	095716d731	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	3c556186da	工艺流程界面问题修复	10 months ago
gsz	4657a697ab	MES_QMS报废品汇总+可疑品汇总pojo	10 months ago
jun	73350ef0b9	追溯报表页面样式调整	10 months ago
jun	5db1430759	41696 生产工单页面，增加车型配置下拉选择	10 months ago
administrator	3e262a7e6e	Bto增加圆整时间	10 months ago
jun	15a644c5a8	工单页面问题修复	10 months ago
jun	040e5f1b3a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	f7c34ae3b0	追溯报表，字体地址变更	10 months ago
administrator	2f9f3b75fd	零件发运组关系	10 months ago
jun	91bf6c376a	追溯报表，翻译	10 months ago
jun	e80a47b6a5	追溯报表，生成pdf文件	10 months ago
gsz	ea2b735694	主子关系ExtendType修改	10 months ago
jun	d84a7a61e5	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	f605d49d1d	生产开模统计数据发送 ... 追溯报表开发	11 months ago
gsz	260c42fc3c	41549 枚举修改	11 months ago
gsz	810aa42ca5	41549 枚举修改	11 months ago
gsz	e7a0262fd1	主子工位报错	11 months ago
logic.fang	dfa12c6df5	产线看板-“异常停线时间”部分需求未明确	11 months ago
gsz	aa6c6f58b3	41525导入功能优化-校验并返回数据+枚举中文导入	11 months ago
gsz	4326bbe286	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	e3fc93ecaa	根据生产加工记录产线物料产生的工单报工job测试	11 months ago
jun	6160d3da6a	更新系统同步标志	11 months ago
gsz	3720a134c5	41606 BTO工单的生成规则需要根据产线独立排序	11 months ago
jun	165ef27abf	设备信息表、设备变量表：查询条件需要支持模糊查询	11 months ago
jun	b76a98727b	递归查询bom树信息	11 months ago
jun	c5445e7617	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	6a837edbb8	41603 生产工单-导入工单时，系统不应该区分产线的大小写	11 months ago
gsz	2fa26b16e1	41236 非排序加工规则-编辑时未带出字段	11 months ago
jun	6a0d1eee40	BOM树开发	11 months ago
jun	fe60829f79	41583 BTO创建工单基于生产组配置，现在配置成发布，实际工单生产状态是未处理	11 months ago
jun	6d7e2c40d0	fix #bug 41559 ... fix #bug 41577	11 months ago
administrator	743ba7d251	Maximo修改接口对象为大写	11 months ago
jun	91b7738bd0	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	83e4391f2e	生产工单导入问题修复	11 months ago
administrator	7aa0e85c10	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	5e998706cf	Maximo修改接口对象为大写	11 months ago
gsz	3c910c4bfb	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	71a8a6eed3	41549 零件发运组+零件拉动组+非排序产品加工规则配置+零件生产组 导入	11 months ago
jun	e3e8d6ed8d	添加设备时，同一个设备可以关联到2个工位，需要修复。	11 months ago
administrator	05512b63f5	BTO 如果生产组零件组禁用了生产零件则跳过	11 months ago
logic.fang	3e5a3ac66f	41513 MES-PC端-生产版本、物料信息-查询接口要求允许同时查询禁用、启动的数据	11 months ago
gsz	58f4bccad7	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	6e1a17e253	41525 设备+缺陷+点检模块新增导入功能	11 months ago
jun	df74eb09cd	工单修改需要同步标识需要改为未同步	11 months ago
jun	524ba1060b	问题清单问题修复	11 months ago
jun	36fb84aef3	问题清单问题修复	11 months ago
jun	29cc194ad7	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	3a1ecd62e2	问题清单问题修复	11 months ago
logic.fang	19893a3119	产线看板-部分	11 months ago
logic.fang	057a9f2f2f	MES设备数据查询报表-增加“日志类型名称”、“更新时间”、“更新人”	11 months ago
logic.fang	b664e74e37	产线产品加工规则报表	11 months ago
jun	29720c309a	报工调整	11 months ago
jun	45d07effe3	工单相关问题修复	11 months ago
gsz	53bcf4fa40	FS报表-可疑品条码信息报表	11 months ago
jun	a2e1e427a3	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	e9d081c413	报工调整后，只是报工调整数量需要变化	11 months ago
administrator	f0f812fbfa	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	3c81d6cf8a	导入模板管理开发	11 months ago
jun	4bd046e407	1、工单汇总回传SAP异常问题修复 ... 2、导入模板功能开发	11 months ago
gsz	bedb0c264c	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	665a0369a6	41404 主工位与子工位修改	11 months ago
jun	d1a0e05f7e	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	be13f191fd	41388 工单界面不显示产线名称	11 months ago
logic.fang	a9993e56b4	MES设备数据查询报表	11 months ago
jun	1194039fff	包装定义维护--增加是否验证LOT Number查询条件	11 months ago
jun	566d9d8b0d	工单演示问题修复	11 months ago
jun	c9075c7803	工单演示问题修复	11 months ago
jun	9f4b6b049b	接口映射函数添加NotTrans处理逻辑	11 months ago
jun	def92011b7	问题清单问题修复	11 months ago
administrator	76628d0151	增加BTO缺失字段	11 months ago
jun	ebeeabeb7f	CBR冲销优化	11 months ago
jun	6bd043ff5d	CBR冲销	11 months ago
gsz	14ae5dcdf4	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	f32028f27d	6.13 bug修改	11 months ago
administrator	54e1dc05ab	重构maximo的ws服务接口	11 months ago
jun	bbe3d22215	核心包中存在，二开中移除	11 months ago
jun	2a89cd5776	规则代码基础数据	11 months ago
jun	aee32ac3e8	新增打印机配置	11 months ago
administrator	46684e8ee8	maximo仪表主数据和设备主数据 webService服务 地址:http://localhost:8300/i3plus/mes-service?wsdl localhost替换为部署环境的ip	11 months ago
administrator	94b3bd2199	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	7f078c176d	基础主数据bug	11 months ago
gsz	6187044e1e	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	ea08717ad7	bug修改	11 months ago
jun	0508f5918a	字段变更	11 months ago
administrator	7baf424ccf	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	1424806cf8	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	5b3b9f15a2	bom取值逻辑变更	11 months ago
gsz	6c20420829	bug修改	11 months ago
administrator	ef644554a1	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	c35452fb94	bug修改	11 months ago
gsz	b3c185eab8	华为云OBS接口修改	11 months ago
gsz	4309761919	41255 非排序加工规则-新增&编辑-汇报方法字段	11 months ago
gsz	3055568c36	华为云OBS服务接入	11 months ago
administrator	d2a71caa3c	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	6b99baa3c7	41232 MES-PC：车系页面问题汇总	11 months ago
gsz	572503cace	41238 物料bom页面条数没有显示	11 months ago
administrator	d6189f43ab	恢复注释掉的 ProduceSeq	11 months ago
administrator	2263ba7836	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	41cd3c45b6	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	2ba89b2cdf	41238 物料bom页面条数没有显示	11 months ago
王杰	14d23ee8d3	工单状态 加工	11 months ago
gsz	eb0af4bad3	解决bug 41235 41231 41223 41225 41226 41232 41234	11 months ago
administrator	cb82726adf	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	3bda4b3a06	武汉报工逻辑调整	11 months ago
jun	5680b47cb4	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	0fa4ff86be	逻辑修改	11 months ago
gsz	eb3de12f5e	装车单详情新增发运组查询	11 months ago
jun	7f89951056	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	9161c1b4d5	报工功能演示修改	11 months ago
gsz	19a71a99ec	点检单设备查询无效	11 months ago
jun	b82af4a2f0	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	b354c07e5b	武汉报工功能开发	11 months ago
gsz	c28fbbb20e	bug修改	11 months ago
gsz	2685dd0e84	MesPartSap修改字段数据来源 零件状态	11 months ago
administrator	7cf5aa1f25	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	d546070fcd	客户车型转换配置明细	11 months ago
administrator	ad12de4d28	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	e9bab83882	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	1d8b426667	媒体文件维护	11 months ago
administrator	c651fa000b	暂时注释掉 ProduceSeq	11 months ago
administrator	8dc060da00	BTO修改 及 增加job配置,及job日志显示	11 months ago
gsz	cee870bf8c	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	9d06f117f9	组织模型新增设备过滤已绑定工位	11 months ago
administrator	d8f32bc5a9	更新字段	11 months ago
administrator	b52d8c4c33	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
gsz	b32a1b1160	组织模型新增设备过滤已绑定工位	11 months ago
gsz	90cc18b191	责任人区域关系修改	11 months ago
gsz	544247bae8	责任人区域关系	11 months ago
administrator	9338f4870a	bto-job第一个版本完成，按时圆整	11 months ago
gsz	f62c90d3ff	生产工单produceSeq类型改变报错	11 months ago
gsz	19859d11c9	所有页面零件信息查询支持模糊匹配	11 months ago
gsz	68af7786cf	客户零件转化配置字段修改	11 months ago
jun	c6778d3b56	包装定义维护功能开发	11 months ago
jun	73b97cc3b0	物料信息主数据修改	11 months ago
LML丶	3efad1a43c	BOM树	11 months ago
LML丶	ad5889f96e	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
LML丶	b214ed3bad	BOM树	11 months ago
gsz	149855d02b	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	f8e40a535d	根据产线和班组查单个开关班记录接口	11 months ago
jun	121ced9b8e	主数据bug修复	11 months ago
LML丶	22680d10ab	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
LML丶	7d749607a6	修改装车单明细	11 months ago
jun	195c7bf5c0	功能演示：主数据bug修复	11 months ago
jun	a88744c157	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	dce484125c	主数据bug修复	11 months ago
LML丶	804f0b847a	修改装车单明细	11 months ago
gsz	f7bb788ec0	MesCustomerPart修改pojo字段	11 months ago
gsz	3e2994bedb	Mes PDM表对照修改字段	11 months ago
LML丶	9ea589d9b3	修改装车单明细	11 months ago
LML丶	5a634f7ba1	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	e142961a0f	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
LML丶	3762d71ed4	修改装车单明细	11 months ago
jun	6790a6e1da	主数据bug修复	11 months ago
gsz	ca5426b7ec	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
gsz	93450bccbf	Mes PDM-config下面的表对照	11 months ago
jun	20f9e853cf	主数据bug修复	11 months ago
微笑着面对明天	66a8669203	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	11 months ago
微笑着面对明天	c4e6e97320	基础主数据bug	11 months ago
LML丶	6eb056acd6	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
LML丶	167389c275	修改装车单明细	11 months ago
jun	73f566ee10	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	b133ed57b6	演示问题清单0521	11 months ago
微笑着面对明天	035c67e571	基础主数据bug	11 months ago
LML丶	ab291c8c77	修改装车单明细	11 months ago
LML丶	8fefd3dbac	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
LML丶	5506f9611d	修改装车单明细	11 months ago
王杰	d654ac93f5	mes	11 months ago
jun	15de434e68	41053 MES：生产工单问题汇总	11 months ago
jun	68a2f24362	班次查询有效期内的班次	12 months ago
LML丶	f1f7e0cd29	修改装车单明细	12 months ago
LML丶	f8fc179046	修改装车单明细	12 months ago
LML丶	9e812fdd51	修改装车单明细	12 months ago
LML丶	e997e6110b	Merge remote-tracking branch 'origin/dev' into dev	12 months ago
LML丶	3e4b2a5172	修改装车单明细	12 months ago
微笑着面对明天	971c719065	基础主数据bug	12 months ago
LML丶	64b565fc86	修改装车单明细	12 months ago
LML丶	ad5974f98a	发布	12 months ago
gsz	1967d69a05	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	12 months ago
gsz	c442e79998	根据设备停机超时时间新增设备停机记录JOB	12 months ago
jun	7e0b83ac8f	Merge remote-tracking branch 'origin/dev' into dev	12 months ago
jun	88668667ec	工单页面排序调整	12 months ago
gsz	3f2441aea8	查询工位停机类型和原因	12 months ago
gsz	a10c96d993	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	12 months ago
gsz	aaf43a36b8	设备生产停机记录	12 months ago
微笑着面对明天	de9d52a455	基础主数据bug	12 months ago
gsz	0d9f80c19f	CCSC接口映射下发检验结果bug修改	12 months ago
gsz	8e122920ad	CCSC首尾件和随机件bug修改	12 months ago
gsz	cc241b68b6	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev	12 months ago
gsz	05ace94510	CCSC三个表页面CRUD	12 months ago
王杰	9b0e4b99c3	mes	12 months ago
LML丶	9a8ca50f5e	增加查询条件	12 months ago
LML丶	e55a9c4f3e	增加查询条件	12 months ago
gsz	a38dcfbcb5	开关班管理开发	12 months ago
gsz	a1a59e6c7e	QMS同步MES_CCSC任务检测结果	12 months ago
王杰	67f1953f20	mes	12 months ago
LML丶	50fa5f470c	增加查询条件	12 months ago
LML丶	37dbbb982f	增加查询条件	12 months ago
LML丶	a187118703	增加查询条件	12 months ago
LML丶	be5d161874	增加查询条件	12 months ago
LML丶	0a97500eac	增加查询条件	12 months ago
LML丶	19e407cae3	修改接口	12 months ago
LML丶	d2da4e449d	修改接口	12 months ago
LML丶	e052858c6b	修改接口	12 months ago
LML丶	12aa742fe0	修改接口	12 months ago
LML丶	8855a848bd	修改表字段	12 months ago
LML丶	df7436e81c	修改表字段	12 months ago
LML丶	ea7037e44a	Merge remote-tracking branch 'origin/dev' into dev	12 months ago
LML丶	0db692de60	修改表字段	12 months ago
微笑着面对明天	3c9608ab18	基础主数据bug	12 months ago
LML丶	bd7a1e6249	修改表字段	12 months ago