Commit Graph

271 Commits (4440d368a06a5b3cf7fa595a6418c7cdd8a781c4)

Author SHA1 Message Date
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
8 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工,生成的条码规则不需要取物料扩展属性的条码规则,取一个固定的规则即可(8位年月日+4位流水号) 9 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 9 months ago
王杰 9d91db16b3 工步操作redis 方法去动词; 读加工结果 增加shot 9 months ago
jun 8361a745e6 42786 电子化检验质检完成后,进入NC判定后未记录判定操作人
42782 装配件替换,目前是选择复选框后,需要按照顺序进行扫描
9 months ago
jun 3f4af68ed3 42602 发运后,客退品返工,生成并打印新条码
42582 线边库存报表
9 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 9 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 9 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 9 months ago
王杰 23b8e9fc51 装配件匹配提示优化 9 months ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 9 months ago
王杰 86f040de3a 时效性验证 9 months ago
jun a1b4eaee52 NC处理代码回退 9 months ago
jun 8c11e1e852 打印模板增加打印时间字段 9 months ago
王杰 0866a27027 查询加工记录表加工厂条件; 匹配加工规则 提示优化;增加配置允许其他工位的未知条码扫描的生产线配置;同零件条码同物料限制汇报一次 10 months ago
王杰 85bf50215e 设备发送加工参数 10 months ago
微笑着面对明天 df8cd11e67 报工问题修改 10 months ago
王杰 0439e49640 系统配置查询方法 10 months ago
jun 98bdb40d14 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun fb6aa9048c 问题清单修复 10 months ago
王杰 3c024dcb89 mes报表验证分表配置 10 months ago
王杰 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 条码履历和加工单履历 11 months ago
王杰 3ee38c6e7a 条码生成 11 months ago
administrator 6b9d3c4b53 Merge remote-tracking branch 'origin/dev' into dev 11 months ago
administrator c5fa5f0127 补录日志--修改处理状态枚举 11 months ago
王杰 b431a1cf03 倒计时 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
王杰 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