803 Commits (2ac826e902b422a3b5c1a5eafb6c3f9128af1a0b)

Author	SHA1	Message	Date
王杰	5742015206	工位扫描 日志	11 months ago
王杰	74d5cb101b	条码生成工步	11 months ago
王杰	3ee38c6e7a	条码生成	11 months ago
王杰	f78108c702	装配件重置	11 months ago
王杰	292ece125c	按钮接口	11 months ago
administrator	6b9d3c4b53	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	13ff0c48b1	step	11 months ago
王杰	3a5b8f0568	倒计时	11 months ago
administrator	c5fa5f0127	补录日志--修改处理状态枚举	11 months ago
王杰	b431a1cf03	倒计时	11 months ago
微笑着面对明天	e1f5ed5610	规则策略	11 months ago
微笑着面对明天	22560a0a8b	报工问题修改	11 months ago
微笑着面对明天	d9d7931a91	报工问题修改	11 months ago
微笑着面对明天	6fc77688be	报工问题修改	11 months ago
王杰	7439a515cd	fsm reset	11 months ago
jun	fc046df6b4	排序发运校验问题修复	11 months ago
jun	8facc242b9	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	33ffd51602	41757 MES:PDA：点检进入报错＆点检无法下拉，无法点击完成点检	11 months ago
administrator	c283acfd7c	补录日志	11 months ago
administrator	099cb80f16	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	a443453c9c	assemnly skip code	11 months ago
administrator	bc901e7130	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	f0ffe11ffc	问题修复	11 months ago
jun	3ee25d0dc1	发送开模统计数据	11 months ago
王杰	ba107475aa	读设备 优化	11 months ago
王杰	13d721d936	工艺路线防错	11 months ago
gsz	d0a6298ecc	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	35a1928c78	QMS报废品汇总新增责任人	11 months ago
微笑着面对明天	c707e95ab6	加工异常修改	11 months ago
王杰	dc2da6c5ba	step	11 months ago
王杰	1d6bd87867	时效性验证	11 months ago
微笑着面对明天	434c87fde3	报工问题修改	11 months ago
王杰	f87281c0a0	工位扫描 日志	11 months ago
jun	3e29148f92	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	de0d1cffae	NC处理问题修复	11 months ago
王杰	fa5046f056	工厂扫描 日志记录	11 months ago
jun	108d0af528	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	db7ca36343	41724 MES-PCN：加料防错问题汇总	11 months ago
微笑着面对明天	86c8b2f9ea	报工问题修改	11 months ago
jun	28a6c74ad8	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	6cb853902e	加料防错功能开发	11 months ago
王杰	be4a094485	保存设备日志	11 months ago
王杰	1a101affa2	保存设备日志	11 months ago
王杰	4a43f37676	工单选择腔数	11 months ago
王杰	c282a05088	设备日志	11 months ago
jun	a16c50d568	追溯报表，生成pdf文件	11 months ago
gsz	0430190ac7	装车单中所有发运单全部变成发运回传-并修改装车单状态	11 months ago
gsz	6027b0a349	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	04e5bed576	根据前一天待报工记录数插入工单并报工job修改	11 months ago
jun	3095105625	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	09a2c97d4d	生产开模统计，只统计统计模具号不为空的数据	11 months ago
微笑着面对明天	1e0e4a94d1	报工问题修改	11 months ago
王杰	3fb0bff61d	show assembly	11 months ago
王杰	75d76803b9	显示转配件	11 months ago
微笑着面对明天	5f0812dcfc	报工问题修改	11 months ago
administrator	4273eba96c	补录操作日志	11 months ago
王杰	f595d98629	pcn 客户端下线	11 months ago
微笑着面对明天	ab8fe77754	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	c664aabb3c	展示组件	11 months ago
administrator	26f2c7ffc2	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	121109290b	一模多腔--查找装配件时规则取值问题	11 months ago
gsz	d94ceabc81	报工记录数插入工单并报工job-取前一天早班次时间	11 months ago
gsz	e17129ff62	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	180ce708a2	报工记录数插入工单并报工job-状态改为未汇报	11 months ago
微笑着面对明天	6bfd307598	展示组件	11 months ago
微笑着面对明天	34d54037dd	展示组件	11 months ago
微笑着面对明天	3e3d3543d3	分屏切换修改	11 months ago
王杰	863917dfb7	上下文key 变更	11 months ago
王杰	a6cac78e8d	前道防错工步	11 months ago
jun	69603b0aee	生产开模统计表，删除设备代码字段	11 months ago
jun	7574dfe698	生产开模统计数据发送 ... 追溯报表开发	11 months ago
gsz	f416fe94ce	根据前一天待报工记录数插入工单并报工job工作中心	11 months ago
王杰	9584c2d05e	step	11 months ago
王杰	b416e13e41	前道防错	11 months ago
gsz	de09ab75cc	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	68dc08b6f4	装车单中所有发运单全部变成发运回传	11 months ago
微笑着面对明天	7765671dc1	展示组件	11 months ago
administrator	371dd56277	保存加工结果--按需落库	11 months ago
gsz	c1fe6b6db8	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	2472fa4e69	根据前一天待报工记录数插入工单并报工job	11 months ago
jun	b4f7aad050	生产开模统计job逻辑修改	11 months ago
jun	1ce8b4b480	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	e04184acca	生产开模统计job	11 months ago
微笑着面对明天	1b71d890d8	展示组件	11 months ago
administrator	ea26dbc6ad	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	113d8a78dd	生产条码时增加小鹏一维码规则	11 months ago
gsz	948a70f491	根据前一天待报工记录数插入工单并报工job	11 months ago
gsz	0943051f02	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev ... Conflicts: modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java	11 months ago
gsz	5e715f331a	根据前一天待报工记录数插入工单并报工job	11 months ago
administrator	3f4f041c5e	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	6400ab2846	生产条码时增加小鹏一维码规则	11 months ago
王杰	6716d7c978	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
王杰	1cfac89842	发送指令 bug 处理 可能存在多个点位	11 months ago
administrator	2a2f606ed7	工步条码打印	11 months ago
administrator	a5f48cf90a	工位端条码补打功能	11 months ago
administrator	9b421f4ac9	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	0c3fe103de	工位端单件条码打印功能完成	11 months ago
微笑着面对明天	14aa4fde0b	展示组件	11 months ago
王杰	a219cdf441	context	11 months ago
王杰	5fc307c3b7	读设备 质量异常后重新读取	11 months ago
王杰	09dc9c7200	可复用件	11 months ago
administrator	1c65a74374	打印校验	11 months ago
jun	d3767119fa	条码补打，条码生成优化	11 months ago
王杰	c077635e3c	工序完成 优化	11 months ago
王杰	c488a5ef5c	step	11 months ago
administrator	a7eafa32eb	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	93eee6bb0e	step	11 months ago
王杰	41126d8e2b	pcn	11 months ago
王杰	1c01b3bc24	mes step	11 months ago
administrator	5c23d7827b	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	b8f6e67d8b	step	11 months ago
王杰	ff092a3ebb	step	11 months ago
王杰	4c3048b236	step	11 months ago
微笑着面对明天	eb317e9974	展示组件	11 months ago
王杰	d6b9195768	step	11 months ago
王杰	83e887f7af	step	11 months ago
administrator	7dcaeb9621	打印校验	11 months ago
administrator	f64efdb8a5	时效性验证接口	11 months ago
王杰	f8b0ae62f4	step	11 months ago
王杰	8cc88b9f1b	step	11 months ago
王杰	cf4b501bd0	step	11 months ago
jun	a53aacb5b9	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	c0ad75b6ff	条码补打二维码生成	11 months ago
王杰	e6fe1a6ddf	step	11 months ago
微笑着面对明天	7af7279c3c	展示组件	11 months ago
王杰	43f74b6ce3	step	11 months ago
微笑着面对明天	9174710dcf	展示组件	11 months ago
微笑着面对明天	24c251de15	展示组件	11 months ago
微笑着面对明天	3b2043c746	展示组件	11 months ago
王杰	6444e8ee7f	step	11 months ago
王杰	7894c6922f	steo	11 months ago
王杰	a249d62688	steo	11 months ago
微笑着面对明天	594edc20ae	装配件匹配	11 months ago
微笑着面对明天	5a954457a4	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
logic.fang	853ec9b6bb	41506 MES-PDA端-装车校验、排序发运校验-需要添加顺序卡控	11 months ago
微笑着面对明天	0a2bc86618	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	e7de46442c	排序发运校验bug修复	11 months ago
jun	d693181dc7	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	f55811f1ba	广乘-仪表打印模板增加客户物料字段	11 months ago
王杰	265bfafe24	step	11 months ago
jun	013650178c	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	32eecc1d49	广乘-仪表打印模板	11 months ago
administrator	6122f1e074	打印调整数据结构	11 months ago
微笑着面对明天	5a62071de2	展示组件	11 months ago
administrator	dc667158a1	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	922cbf0d69	打印调整获取organizeName的取值	11 months ago
微笑着面对明天	63b6c88ae9	展示组件	11 months ago
微笑着面对明天	042e582267	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	5689b31564	展示组件	11 months ago
王杰	df207217bd	step	11 months ago
王杰	de49a8120d	step	11 months ago
微笑着面对明天	02d5c0ed65	展示组件	11 months ago
gsz	2438909a65	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	7233067964	41404 主工位与子工位【区域 产线 工位】参数校验	11 months ago
王杰	628b8b1fc6	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
王杰	2bbffee2ae	steo	11 months ago
administrator	72a53f0706	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
administrator	a7b4bc3e4d	报工	11 months ago
王杰	32ef7b2a67	step	11 months ago
administrator	a586939520	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	d71a9a9856	展示组件	11 months ago
王杰	7621792533	step	11 months ago
administrator	e0fb916a90	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	f259900e87	step	11 months ago
王杰	3c18ac6527	step	11 months ago
administrator	22ccbe7a7f	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	cf09ddad50	step	11 months ago
王杰	3fc157fe8c	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
王杰	523ebecc58	steop	11 months ago
微笑着面对明天	33e04796f1	展示组件	11 months ago
administrator	fd2e5dc22e	打印主条码工步	11 months ago
王杰	802342330d	step	11 months ago
王杰	de1b3c22db	step	11 months ago
administrator	b3a96c4387	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	433d5eb232	step	11 months ago
微笑着面对明天	17838c071f	工步更新	11 months ago
administrator	a4dd49bde5	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	120dc75c05	step	11 months ago
王杰	9afe79eaa9	step	11 months ago
王杰	f7adb7b1d5	step	11 months ago
administrator	a75f8ca290	打印主条码工步	11 months ago
王杰	77e48610bf	step	11 months ago
微笑着面对明天	a4b9bdd253	展示组件	11 months ago
jun	1d1abf5980	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	20f97e217c	装箱防错问题清单问题修复	11 months ago
王杰	7deb1c2b1a	step	11 months ago
微笑着面对明天	46a130ebef	展示组件	11 months ago
微笑着面对明天	083a33eb61	加工规则	11 months ago
gsz	93b4d3a395	41404 主工位与子工位修改	11 months ago
gsz	8e90c343aa	开关班修改关班	11 months ago
gsz	d53b160e64	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
王杰	3cd49fc831	step	11 months ago
微笑着面对明天	fe4c3e36cf	展示组件	11 months ago
gsz	7567b037ca	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
微笑着面对明天	b768644b40	工步修改	11 months ago
jun	a2f7150b13	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	aa907b8fe5	问题清单问题修复	11 months ago
王杰	08c5ccdd3c	step	11 months ago
王杰	f5f4560de2	pcn job	11 months ago
王杰	b42910d3a7	step	11 months ago
王杰	b846728201	工位按钮 提示信息	11 months ago
王杰	778de8b8fe	step	11 months ago
jun	c160012a19	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	73b4b0d4d9	条码打印功能开发	11 months ago
微笑着面对明天	f787dfeaee	展示组件	11 months ago
王杰	9207a635de	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
王杰	4ce0fedc54	step	11 months ago
微笑着面对明天	bff334f032	工步修改	11 months ago
王杰	7f6b9e8ece	step	11 months ago
jun	d42bba00d2	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	2a665781f6	PCN条码打印功能开发	11 months ago
gsz	c3cb4cba96	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
administrator	c00cddc048	仪表读数job	11 months ago
administrator	8e349da2f7	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	c9a0c0e4ce	展示组件	11 months ago
gsz	0a6c10a3f7	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	9ed84873f4	开关班修改关班	11 months ago
gsz	8e6ce5711b	开关班修改关班	11 months ago
jun	74adc4830a	逻辑优化	11 months ago
gsz	782a9d2c84	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	11 months ago
gsz	116cc57e1e	开关班修改关班	11 months ago
jun	0923b6bf6d	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	650924be7c	逻辑变更	11 months ago
微笑着面对明天	17f4d5593b	展示组件	11 months ago
微笑着面对明天	dde587d1b9	展示组件	11 months ago
gsz	7c5ab8a857	开关班记录新增唯一校验	11 months ago
jun	4d7072a12f	逻辑优化	11 months ago
jun	da3691af7b	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	cce62542f3	缺陷录入	11 months ago
微笑着面对明天	06557113e6	展示组件	11 months ago
王杰	27335597ad	step	11 months ago
王杰	f87e216c67	pcn	11 months ago
jun	9464ef33a7	包装定义维护扫描类别，零件号类别类型错误	11 months ago
administrator	349a2a0cf7	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	f1b3ed5929	演示功能修改	11 months ago
jun	a9d1f7974c	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	e4ab2342b1	装箱防错演示功能修改	11 months ago
王杰	6e7f3881b7	step	11 months ago
administrator	8b0b94aa46	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	ce5423dbd1	展示组件	11 months ago
administrator	ae0054cb92	报工工步及非排序报工job	11 months ago
微笑着面对明天	71375033f9	展示组件	11 months ago
administrator	67f554dcaa	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	56fb8a3e3e	step	11 months ago
王杰	d2a1b018d4	step	11 months ago
王杰	1374383614	step	11 months ago
jun	1e37552112	查询枚举明细接口	11 months ago
jun	49e52fcfd9	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	104bd117bb	装箱防错功能开发	11 months ago
微笑着面对明天	b49d55575b	展示组件	11 months ago