Commit Graph

346 Commits (master)

Author SHA1 Message Date
王杰 29759184b6 mes报表验证分表配置 10 months ago
王杰 44d11aef0e mesmove 增加 erp生产线值 10 months ago
王杰 8ea2581ab3 装车单 发运单 问题修改 10 months ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 62a45210fd 问题清单修复 10 months ago
王杰 15c5f12837 设备日志 10 months ago
微笑着面对明天 41d8aae13f 报工问题修改 10 months ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 10 months ago
微笑着面对明天 6506c4626e mqtt修改 10 months ago
微笑着面对明天 5307e78324 报工问题修改 10 months ago
微笑着面对明天 4e9dd5201c mqtt修改 10 months ago
微笑着面对明天 77b8304de0 报工问题修改 10 months ago
微笑着面对明天 486a7f9306 mqtt开发 10 months ago
微笑着面对明天 4ef60c5324 业务履历修改 10 months ago
微笑着面对明天 963a373b9c nc修改 10 months ago
jun ed557c79ab 点检功能优化 10 months ago
王杰 cfea02b3b7 顺序防错 10 months ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 10 months ago
王杰 e4a5fce755 工艺防错 10 months ago
微笑着面对明天 b53ab28e86 条码履历和加工单履历 10 months ago
王杰 3ee38c6e7a 条码生成 10 months ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 10 months ago
王杰 b431a1cf03 倒计时 10 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
王杰 dc2da6c5ba step 11 months ago
王杰 1d6bd87867 时效性验证 11 months ago
微笑着面对明天 434c87fde3 报工问题修改 11 months ago
王杰 fa5046f056 工厂扫描 日志记录 11 months ago
jun 28a6c74ad8 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 1a101affa2 保存设备日志 11 months ago
王杰 c282a05088 设备日志 11 months ago
jun a16c50d568 追溯报表,生成pdf文件 11 months ago
gsz 04e5bed576 根据前一天待报工记录数插入工单并报工job修改 11 months ago
administrator 4273eba96c 补录操作日志 11 months ago
王杰 f595d98629 pcn 客户端下线 11 months ago
王杰 863917dfb7 上下文key 变更 11 months ago
王杰 a6cac78e8d 前道防错工步 11 months ago
jun 7574dfe698 生产开模统计数据发送
追溯报表开发
11 months ago
王杰 b416e13e41 前道防错 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
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
王杰 09dc9c7200 可复用件 11 months ago
王杰 c077635e3c 工序完成 优化 11 months ago
王杰 41126d8e2b pcn 11 months ago
王杰 ff092a3ebb step 11 months ago
王杰 4c3048b236 step 11 months ago
administrator f64efdb8a5 时效性验证接口 11 months ago
jun a53aacb5b9 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
jun c0ad75b6ff 条码补打二维码生成 11 months ago
王杰 43f74b6ce3 step 11 months ago
王杰 a249d62688 steo 11 months ago
王杰 265bfafe24 step 11 months ago
微笑着面对明天 02d5c0ed65 展示组件 11 months ago
administrator b3a96c4387 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
王杰 433d5eb232 step 11 months ago
administrator a75f8ca290 打印主条码工步 11 months ago
gsz 93b4d3a395 41404 主工位与子工位修改 11 months ago
王杰 3cd49fc831 step 11 months ago
王杰 08c5ccdd3c step 11 months ago
王杰 f5f4560de2 pcn job 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
administrator c00cddc048 仪表读数job 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 ae0054cb92 报工工步及非排序报工job 11 months ago
王杰 d2a1b018d4 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
王杰 d7fff9d021 pcn step 11 months ago
微笑着面对明天 9b761d52f7 展示组件 11 months ago
王杰 4fe47f60a5 step 11 months ago
微笑着面对明天 8cef863bae 返工修改 11 months ago
王杰 b250830f3e step 11 months ago
王杰 d7fec1f617 step 读主条码工步 11 months ago
微笑着面对明天 af8decbd88 工步开发 11 months ago
gsz b049a2097a 电子化检验-转正常不需要责任人 11 months ago
王杰 c2088d7828 step 11 months ago
王杰 596f6490d8 step 11 months ago
王杰 db4c1846a5 step 12 months ago
王杰 2bb18b5374 pcn step 12 months ago
王杰 c40ecb6c16 opc link 12 months ago
王杰 f346405d5d step 12 months ago
jun 63c6a6e955 OPCLink调用 12 months ago
微笑着面对明天 1401cd8734 工步开发 12 months ago
王杰 ba951ff29f step 12 months ago
王杰 d314fb46d7 step 12 months ago
gsz d1da64585a 开关班查询开班记录 12 months ago
王杰 526d1d3f94 step 12 months ago
王杰 2795d3109d step 12 months ago
LML丶 0cc30e4f19 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 67c3225938 点检 12 months ago
微笑着面对明天 9dc8ad01fa 返工需求开发 12 months ago
LML丶 5c35f490b1 点检 12 months ago
LML丶 c93328351f Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 e5930fba43 点检 12 months ago
gsz 77b49db82b webService转http接口 writeVariableHttp 12 months ago
LML丶 84409c8c6f 点检 12 months ago
LML丶 e62bc700f6 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 db8a866924 点检 12 months ago
王杰 0eb9b56fce ste 12 months ago
gsz 082ccf97c4 webService转http接口 todo 12 months ago
王杰 4d4eed1383 pcn step 12 months ago
王杰 8eab013247 pcn 12 months ago
gsz 529edd19d6 MES-PCN设备停机类型+开关班记录+产线与班组+产线与班次关系 12 months ago
LML丶 fefb032d22 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 458ee12f52 修改 可疑品提示消息 12 months ago
王杰 b63a8c51af Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 12 months ago
王杰 da319beefa pcn 12 months ago
jun 0eb778cfac 报工 12 months ago
LML丶 7a26e53381 修改 可疑品提示消息 12 months ago
王杰 374eb511fa pcn step 12 months ago
王杰 21211cba9d pcn 12 months ago
王杰 1679976c8b pojo 12 months ago
王杰 bc491b4f84 pcn 12 months ago
王杰 eeddd1811d pcn 12 months ago
王杰 b6ede3b70c pcn step 12 months ago
王杰 102378fe59 pcn 工步 12 months ago
王杰 26b0de1402 pcn 工步 读取加工结果 12 months ago
王杰 dd5744a9c1 pcn step 读取加工结果 12 months ago
王杰 4376c15c51 pcn step context 12 months ago
LML丶 7007f8d397 NC 处理修改字段 12 months ago
王杰 991ab57dfd pcn 工步 获取加工结果工步 12 months ago
LML丶 15774bac0a Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b278c02238 NC 处理修改字段 12 months ago
王杰 3a48a5e68e pcn ext 1 year ago
LML丶 3402d563a0 点检 1 year ago
LML丶 1ff3ea77d8 点检 1 year ago
LML丶 65b32a91a1 点检 1 year ago
LML丶 3d57cb1a84 质量 缺陷类型 NC处理 1 year ago
LML丶 2f35f544d0 质量 缺陷类型 NC处理 1 year ago
LML丶 6dcb5e83ba 质量 缺陷类型 NC处理 1 year ago
LML丶 599a4456fd 发运 1 year ago
王杰 d7fd02ca2f init pcn 1 year ago
王杰 da209d5551 init pcn 1 year ago
王杰 5d78b0b068 init pcn 1 year ago
王杰 9c3f58cbaf YF 1 year ago
王杰 ac48c64464 嘉兴 pcn 工单接口调整 1 year ago
王杰 4bfa20e9ed 节拍 变更 1 year ago
yxw 95162def50 手动报工修改、工单查询增加工单状态多选条件、工程巡检根据条件获取物料 1 year ago
王杰 dd0ce48a6b jx pcn 下线补录来源于DB的采集数据 1 year ago
王杰 6cd5a92fe3 jx pcn plc数据采集 1 year ago
yxw ce464505d4 38753 23032—PCN端【返修作业】点击”维修完成“,重复扫描条码,点击维修完成后,会重复生成mes_repair_task的数据。 1 year ago
王杰 742e3c958f plc collect pd 1 year ago
王杰 3a2f762ada jx pcn job collect third party db data 1 year ago
王杰 a8751468c7 jx pcn work cell scan busi change line off merge and recheck key part 1 year ago
王杰 a72331b6f6 jx pcn work cell scan busi change line off merge and recheck key part 1 year ago
王杰 9d81c7d6ec jx pcn takt collect 1 year ago
yxw 9d5600f548 批量启用禁用工序信息 1 year ago
yxw 45da3d6e81 停开机记录优化,在籍人数记录在MES_SHIFT_PROD_CENTER_PM中 1 year ago
王杰 09c1d60704 jx collect takt data 1 year ago
王杰 2a4d00c882 pcn work cell scan 1 year ago
王杰 a165129bc6 work cell takt collect 1 year ago
王杰 6b9d258845 jx pcn 数据复核 1 year ago
王杰 e56bf6f6f1 jx pcn 数据复核 1 year ago
王杰 67763547f8 jx pcn work scan force center pass add pwd check 1 year ago
王杰 920c81e4cd jx pcn plc pass step 1 year ago
yxw a00fc87fa9 BOM生效 2 years ago
yxw 59958cafae 出货检验产品条码由serialNumber改为productSn 2 years ago
yxw 68956fd344 1、单据作业增加关闭原因、关闭时间、关闭操作人员
2、返修增加维修明细时维修判定枚举更改为页面维护,涉及修改查询报表:修理品票明细报表、维修记录报表;(工程不良报表影响最大,修改大,暂不修改)
2 years ago
王杰 2f5453ae49 pcn line off diff time statistics 2 years ago
yxw cae33236fc 嘉兴出货检验 2 years ago
王杰 55a722089b jx pcn sn work cell scan busi commit 2 years ago
王杰 19f6fa6a1f jx pcn 2 years ago
王杰 8c01ab411c jx 条码下线】 2 years ago
王杰 bd24b50100 jx pcn 2 years ago
yxw af0be4abaa 返修 2 years ago
王杰 dfdc0122f0 jx pcn 2 years ago
王杰 1fa4eea56f 嘉兴终检 2 years ago
王杰 98a4ec8270 jx pcn sn line on 2 years ago
王杰 91a5461523 JX pcn 条码上线 2 years ago
yxw 896eaa63b6 质量判定修改:增加字段“是否解冻” 2 years ago
yxw b2ee33414b 上线工位 2 years ago
yxw 27174712d9 扭矩管理 2 years ago
yxw d8602085ea Merge remote-tracking branch 'origin/dev' into dev 2 years ago
yxw e02d45e8a0 工单首检更改为Q管理 2 years ago
王杰 10a5eff3eb first commit 2 years ago
administrator 07b2de66e4 mes-pcn-dev-base 2 years ago