Commit Graph

543 Commits (mes-uat-changshu0609)

Author SHA1 Message Date
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 5 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 5 months ago
王杰 4721c5e1ba 批次防错 5 months ago
王杰 4241dcd230 shipping rfid 5 months ago
臧学普 4102d444db 深汕kitting 5 months ago
王杰 c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 6 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 6 months ago
王杰 1a5c2272e7 红外焊超差预警 6 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新&裁片报表 6 months ago
王杰 dca4d89330 包装补打印 6 months ago
王杰 bd4f18ed84 重庆打包 6 months ago
王杰 1f6fe5e4a0 零件打包 6 months ago
王杰 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test 6 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 6 months ago
王杰 47e87b8fe1 44517 装箱防错后吐条码需求(芜湖) 6 months ago
臧学普 eee50bfcdf 44791 迁移线末大屏看板到 pcn 7 months ago
王杰 1edc7329f6 Merge branch 'uat-temp-wj-2412270000-44514' into uat 7 months ago
王杰 b89c6e4775 Merge branch 'uat-temp-wj-2412280000-44630' into uat 7 months ago
王杰 1d4ac69a53 44509 需要边端开发和零件条码状态相关的报表,用来展示未知条码 merge uat-temp-castle-2412301006-44509 解决冲突 7 months ago
王杰 8501f466ea Merge branch 'uat-temp-castle-2412301037-44520&44635' into test 7 months ago
王杰 8e519ae585 Merge branch 'uat-temp-wj-2412270000-44514' into test 7 months ago
王杰 4b9beb099d Merge branch 'uat-temp-wj-2412280000-44630' into test 7 months ago
臧学普 86f9128348 44509 查询条码状态 7 months ago
臧学普 e992c4de6d 44635 芜湖排序发运打印 7 months ago
臧学普 b910521dc7 44509 pcn端条码报表 7 months ago
王杰 4fda271266 Merge branch 'uat-temp-castle-2412250942-44253' into test 7 months ago
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 7 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 7 months ago
王杰 7462388c13 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 7 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全,扫描的条码需要增加定位 (修改提示信息) 7 months ago
臧学普 b335bdd105 修复bug 44253 同Pisces,零件发运组/发运组明细可以实现“前道工艺”校验 7 months ago
王杰 6e83356ec4 排序拆解 7 months ago
臧学普 03f6e6fbce 新增Leo接口,通过报工条码查询零件号 7 months ago
王杰 f95fbce203 Merge branch 'dev-temp-caslte-241218-44247' into dev-temp-workorder-report 7 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 7 months ago
臧学普 c3324d4736 fix bug 44247 装箱防错分外协件和自制件,自制件的情况下可以不用维护扫描规则 7 months ago
王杰 0994ffd413 Merge branch 'dev-temp-wj-2412180000-44399' into dev 7 months ago
王杰 103f2dcd07 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 7 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 7 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 7 months ago
王杰 49716d9adb Merge branch 'dev-temp-wj-2024150000-00000' into dev 7 months ago
王杰 56efc17296 1. 生产过程控制 工步正确提示音(匹配成功加工规则/匹配成功装配件);2.生产过程控制 工步删除部分提示信息(扫描/读装配件/匹配装配件/保存装配件 精简提示信息);3.生产过程控制 工步保存加工数/显示加工数/清除加工数 逻辑调整 (工位图跟加工数同时维护时, 优先展示工位图, 并且仍统计加工数(原逻辑:加工数优先展示));4.生产过程控制 工步非排序打印, 不打印时不再发送空打印信息给客户端, 同时不再变更条码的打印状态, 并不再提示打印成功;5.生产过程控制 工步排序打印, 查询工单 查询方式 调整, 不使用in查询;6.生产过程控制 展示组件信息发送逻辑变更: 排序/非排序 工单信息/班次班组/工位图(加工数)/队列表格 改为一次性发送到客户端 7 months ago
王杰 cbca3e6e73 解决冲突 7 months ago
王杰 bf87b62618 Merge branch 'dev-temp-wj-2412120000-44263' into dev 7 months ago
王杰 420f043fd1 PDA上允许用户删除点检单,并且同步到WEB端 7 months ago
王杰 47cc8d6261 44263 PCN装箱防错:满箱关箱后,提示“当前箱条码已完成装箱。请扫描下一个箱条码” 7 months ago
王杰 1dedd5646a 44290 开关班管理,选完产线后自动退出到登录页面 7 months ago
jun 0850df7369 武汉cockpit发运防错按照散件方式写入 8 months ago
jun c8ef2c8044 fix #bug 44007 排序发运增加客户订单号写入到mes_jis_shipping字段:按照广州工厂装车单字段写入。 8 months ago
王杰 9134ed28aa 拉动单打印 增加 LOCK 8 months ago
王杰 7e15f04548 离线数据回传解析增加补偿逻辑 8 months ago
jun 8edddb1bc0 Merge remote-tracking branch 'origin/dev' into dev 8 months ago
jun a2a750489f 43927 装箱防错逻辑更新及优化 8 months ago
臧学普 6554e176f4 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 8 months ago
臧学普 fe3c342dee 离线客户条码打印 8 months ago
王杰 6e2ce20b3b 展示组件 初始化 时禁用扫描框 ; 排序工单 及条码 的上线时间赋值 扫描工单的时间 8 months ago
王杰 16d03491d3 打印 增加零件条码参数属性;离线部分代码提交;选择工单按钮 开始结束查询条件默认值接口返回; 8 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 8 months ago
jun ac90d30220 设备点检最新方案调整 8 months ago
jun 51567a7b7f 广州发运慢问题修复 8 months ago
王杰 1c3e2656d8 排序 跳过 8 months ago
王杰 bb78d98afc 注释代码 8 months ago
王杰 872f8e9413 去除离线生产配置 8 months ago
jun a92e9ab627 打印模板事务问题修复 9 months ago
王杰 a237d0672e 可复用 逻辑重写 9 months ago
臧学普 a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
王杰 1e146c8596 裁片工单工步 修改 9 months ago
臧学普 a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
王杰 15f8d56864 离线同步JOB 9 months ago
臧学普 3d77e70d79 离线检查是否拉数据 9 months ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 9 months ago
jun 61c351f458 芜湖发运增加唯一性校验 9 months ago
王杰 d693da28c8 扫描产成零件工步 9 months ago
王杰 96c55eaad5 排序装配件 保存 记录 bug 修复 9 months ago
臧学普 12ca42f386 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
jun 84361a3027 查询条件没加工厂代码排查 9 months ago
臧学普 5c53be2c16 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java
9 months ago
臧学普 08b0b58982 重构sps代码 9 months ago
王杰 bc8533f0c8 装配件 唯一性 验证 增加 模内验证 9 months ago
jun 827ba97c7b 应急件库位管理演示问题修复 9 months ago
jun e2433f1a78 打印模板调整 9 months ago
jun b1f27d6e72 SPS 生成webservice从MES换到PCN 9 months ago
jun 18b4d11e9b CBR报工逻辑调整 9 months ago
王杰 bd72537b82 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 9 months ago
王杰 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
jun 176fb4505f 应急件库位管理开发 9 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 9 months ago
臧学普 409c979c0e 优化电测试 9 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
jun 31de710227 客户条码补打 9 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 e92c29a07a 装配件扫描 置顶 9 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 9 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 9 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 9 months ago
臧学普 1ebb40569f 电测试 9 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 5f604adc9d 显示前道所有装配件 10 months ago
王杰 ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 fdf8c283e8 设备日志明细分表 10 months ago
臧学普 ad2a7f8722 电测试开发 10 months ago
王杰 1c2c03dccb Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 797904c87a Merge branch 'dev' 10 months ago
王杰 b8cf5c7cfe byd 装配件策略 截取右侧流水 10 months ago
gsz 44f72a56a6 PCN发运单打印页面1 10 months ago
王杰 d379ad543e Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
jun c9d4d0fa2f 排序汇报job开发 10 months ago
王杰 9b685988ed Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 1cb80d9451 merge dev pom冲突 10 months ago
王杰 947fa99b48 工位扫描 监控日志信息 设备代码判空补字段值 10 months ago
王杰 5e2d89d6af Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 c39b5a9ab1 排序 保存工单装配件 10 months ago
王杰 413f68de13 保存加工结果 排序 10 months ago
jun b026ee071c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun fc3e0bab38 排序发运功能开发 10 months ago
yxw ffbc8c888d Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
yxw a9e45c3a00 装配目视单打印 10 months ago
王杰 9695bfae11 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 a431455f9f 保存工艺参数工步 10 months ago
王杰 98843e2581 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 c403807421 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 40f8d63189 设备点检 10 months ago
yxw ae996c361c PCN根据产线查询零件生产组信息集合 10 months ago
yxw 91f6148ac7 新增打印工单打印队列 10 months ago
王杰 857f7c4fc2 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 3215c2957e 漏信号 改LOG状态增加修改时间条件 10 months ago
王杰 6f590edc81 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 1fb16f0457 排序 根据工单或者客户条码 获取工单或者条码 10 months ago
王杰 1a05d6deb5 Merge branch 'dev-wuhan' into dev-wuhan-temp 10 months ago
王杰 05038cf65c 排序 匹配装配件工步 10 months ago
王杰 ba1a743d20 Merge branch 'master' into dev-wuhan-temp 10 months ago
王杰 bbd0f74b5c Merge branch 'dev' 10 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 10 months ago
yxw 3c60fd4487 PCN裁片工单打印 10 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw e476c0c4dc 裁片相关pojo修改 10 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 10 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 10 months ago
jun c454fa84a3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
10 months ago
jun e931661d01 包装解绑功能开发 10 months ago
王杰 f1f1d8fcdf 前道防错 10 months ago
xiangwei.zhang 55984cee69 判断可疑 10 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 10 months ago
王杰 89c1240140 合并dev 10 months ago
王杰 49549429cb 漏信号 优化 10 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 10 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 33cbf3d537 等离子功能开发 10 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 10 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 10 months ago
王杰 2314130e5a 上下文 物料 10 months ago
jun e22af55524 装车单跳过,是否要将装车单关联的发运单也一并完成,同时一并发给WMS 11 months ago
jun bf49601ad1 扫描可回用包装开发 11 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 11 months ago
yxw ae725102b7 保存裁片加工记录 11 months ago
jun d883d077fd 料包绑定增加外协件逻辑 11 months ago
王杰 59fc125885 通用顺序防错工步 11 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 11 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 11 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 11 months ago
yxw 1e8f6672cf 裁片功能 11 months ago
jun 2ef4f1e2f0 料包绑定功能开发 11 months ago
王杰 c2b94c2ad6 生成零件号 可复用 11 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, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 12 months ago
jun 7db20fcf4b AuthUtil修改为前端传参 12 months ago
jun e30b5fcbb5 装车,发运强过,跳过功能开发 12 months ago
王杰 23b8e9fc51 装配件匹配提示优化 12 months ago
jun fd2cf6d695 PDA产品加工记录查询&PCN报工功能调整 12 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