Commit Graph

330 Commits (93dd002b40122dbcdfb5432223b806165adb760f)

Author SHA1 Message Date
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 10 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 1e8f6672cf 裁片功能 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
王杰 c2b94c2ad6 生成零件号 可复用 10 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 11 months ago
王杰 27b40d6709 设备查询点位数据去除事务 11 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 11 months ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
11 months ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
11 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 11 months ago
yxw a8db4e761c 裁片原材料防错 11 months ago
jun 43ba2569c1 非排序拆解功能 11 months ago
王杰 8e321c50ff wuhan 工单 工步 11 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工,生成的条码规则不需要取物料扩展属性的条码规则,取一个固定的规则即可(8位年月日+4位流水号) 11 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 11 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 11 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
11 months ago
jun 3f4af68ed3 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
11 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 11 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 11 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 11 months ago
王杰 23b8e9fc51 装配件匹配提示优化 11 months ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 11 months ago
王杰 86f040de3a 时效性验证 12 months ago
jun a1b4eaee52 NC处理代码回退 12 months ago
jun 8c11e1e852 打印模板增加打印时间字段 12 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 12 months ago
王杰 85bf50215e 设备发送加工参数 12 months ago
微笑着面对明天 df8cd11e67 报工问题修改 12 months ago
王杰 0439e49640 系统配置查询方法 12 months ago
jun 98bdb40d14 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun fb6aa9048c 问题清单修复 12 months ago
王杰 3c024dcb89 mes报表验证分表配置 12 months ago
王杰 29759184b6 mes报表验证分表配置 12 months ago
王杰 44d11aef0e mesmove 增加 erp生产线值 1 year ago
王杰 8ea2581ab3 装车单 发运单 问题修改 1 year ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 62a45210fd 问题清单修复 1 year ago
王杰 15c5f12837 设备日志 1 year ago
微笑着面对明天 41d8aae13f 报工问题修改 1 year ago
王杰 e66cf87495 工步问题修复 工步调用工步 必须使用 executeInState方法 1 year ago
微笑着面对明天 6506c4626e mqtt修改 1 year ago
微笑着面对明天 5307e78324 报工问题修改 1 year ago
微笑着面对明天 4e9dd5201c mqtt修改 1 year ago
微笑着面对明天 77b8304de0 报工问题修改 1 year ago
微笑着面对明天 486a7f9306 mqtt开发 1 year ago
微笑着面对明天 4ef60c5324 业务履历修改 1 year ago
微笑着面对明天 963a373b9c nc修改 1 year ago
jun ed557c79ab 点检功能优化 1 year ago
王杰 cfea02b3b7 顺序防错 1 year ago
jun 79a5fbbb1e 41794 MES-PDA:点检-新增点检单问题汇总 1 year ago
王杰 e4a5fce755 工艺防错 1 year ago
微笑着面对明天 b53ab28e86 条码履历和加工单履历 1 year ago
王杰 3ee38c6e7a 条码生成 1 year ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 1 year ago
王杰 b431a1cf03 倒计时 1 year ago
administrator 099cb80f16 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 a443453c9c assemnly skip code 1 year ago
administrator bc901e7130 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 dc2da6c5ba step 1 year ago
王杰 1d6bd87867 时效性验证 1 year ago
微笑着面对明天 434c87fde3 报工问题修改 1 year ago
王杰 fa5046f056 工厂扫描 日志记录 1 year ago
jun 28a6c74ad8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 1a101affa2 保存设备日志 1 year ago
王杰 c282a05088 设备日志 1 year ago
jun a16c50d568 追溯报表,生成pdf文件 1 year ago
gsz 04e5bed576 根据前一天待报工记录数插入工单并报工job修改 1 year ago
administrator 4273eba96c 补录操作日志 1 year ago
王杰 f595d98629 pcn 客户端下线 1 year ago
王杰 863917dfb7 上下文key 变更 1 year ago
王杰 a6cac78e8d 前道防错工步 1 year ago
jun 7574dfe698 生产开模统计数据发送
追溯报表开发
1 year ago
王杰 b416e13e41 前道防错 1 year ago
jun b4f7aad050 生产开模统计job逻辑修改 1 year ago
jun 1ce8b4b480 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e04184acca 生产开模统计job 1 year ago
微笑着面对明天 1b71d890d8 展示组件 1 year 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
1 year ago
gsz 5e715f331a 根据前一天待报工记录数插入工单并报工job 1 year ago
王杰 09dc9c7200 可复用件 1 year ago
王杰 c077635e3c 工序完成 优化 1 year ago
王杰 41126d8e2b pcn 1 year ago
王杰 ff092a3ebb step 1 year ago
王杰 4c3048b236 step 1 year ago
administrator f64efdb8a5 时效性验证接口 1 year ago
jun a53aacb5b9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun c0ad75b6ff 条码补打二维码生成 1 year ago
王杰 43f74b6ce3 step 1 year ago
王杰 a249d62688 steo 1 year ago
王杰 265bfafe24 step 1 year ago
微笑着面对明天 02d5c0ed65 展示组件 1 year ago
administrator b3a96c4387 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 433d5eb232 step 1 year ago
administrator a75f8ca290 打印主条码工步 1 year ago
gsz 93b4d3a395 41404 主工位与子工位修改 1 year ago
王杰 3cd49fc831 step 1 year ago
王杰 08c5ccdd3c step 1 year ago
王杰 f5f4560de2 pcn job 1 year ago
jun c160012a19 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 73b4b0d4d9 条码打印功能开发 1 year ago
微笑着面对明天 f787dfeaee 展示组件 1 year ago
王杰 9207a635de Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 4ce0fedc54 step 1 year ago
微笑着面对明天 bff334f032 工步修改 1 year ago
王杰 7f6b9e8ece step 1 year ago
jun d42bba00d2 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 2a665781f6 PCN条码打印功能开发 1 year ago
administrator c00cddc048 仪表读数job 1 year ago
administrator 349a2a0cf7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun f1b3ed5929 演示功能修改 1 year ago
jun a9d1f7974c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e4ab2342b1 装箱防错演示功能修改 1 year ago
王杰 6e7f3881b7 step 1 year ago
administrator ae0054cb92 报工工步及非排序报工job 1 year ago
王杰 d2a1b018d4 step 1 year ago
jun 1e37552112 查询枚举明细接口 1 year ago
jun 49e52fcfd9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 104bd117bb 装箱防错功能开发 1 year ago
王杰 d7fff9d021 pcn step 1 year ago
微笑着面对明天 9b761d52f7 展示组件 1 year ago
王杰 4fe47f60a5 step 1 year ago
微笑着面对明天 8cef863bae 返工修改 1 year ago
王杰 b250830f3e step 1 year ago
王杰 d7fec1f617 step 读主条码工步 1 year ago
微笑着面对明天 af8decbd88 工步开发 1 year ago
gsz b049a2097a 电子化检验-转正常不需要责任人 1 year ago
王杰 c2088d7828 step 1 year ago
王杰 596f6490d8 step 1 year ago
王杰 db4c1846a5 step 1 year ago
王杰 2bb18b5374 pcn step 1 year ago
王杰 c40ecb6c16 opc link 1 year ago
王杰 f346405d5d step 1 year ago
jun 63c6a6e955 OPCLink调用 1 year ago
微笑着面对明天 1401cd8734 工步开发 1 year ago
王杰 ba951ff29f step 1 year ago
王杰 d314fb46d7 step 1 year ago
gsz d1da64585a 开关班查询开班记录 1 year ago
王杰 526d1d3f94 step 1 year ago
王杰 2795d3109d step 1 year ago
LML丶 0cc30e4f19 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 67c3225938 点检 1 year ago
微笑着面对明天 9dc8ad01fa 返工需求开发 1 year ago
LML丶 5c35f490b1 点检 1 year ago
LML丶 c93328351f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 e5930fba43 点检 1 year ago
gsz 77b49db82b webService转http接口 writeVariableHttp 1 year ago
LML丶 84409c8c6f 点检 1 year ago