Commit Graph

1597 Commits (64f890c0f3c687c4026240aac2153ddfdac76d01)

Author SHA1 Message Date
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 10 months ago
王杰 5e7541a1cd Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 601b16567a 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 0da9863cf7 Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 e602f615b9 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 0552ad769d Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 35f98ef220 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 c8aee6a401 Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 7462388c13 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 270bf21986 分支提交错误, 代码回退 10 months ago
王杰 567a81d3bf Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 c6570b2916 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 98f999bc7e 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 5aaa08b8b7 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 a39dad81eb 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 10 months ago
王杰 7a52fea201 Merge branch 'uat-temp-wj-2412270000-44586' into dev 10 months ago
王杰 20adcbfa3c Merge branch 'uat-temp-wj-2412270000-44514' into dev 10 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全,扫描的条码需要增加定位 (修改提示信息) 10 months ago
王杰 ed5bb4bd66 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 b79667bf09 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 ec9bc99df3 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 4890c50a76 Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 c544b33b99 44613 未完成数量不能小于0 10 months ago
王杰 70bd1fd55b Merge branch 'uat-temp-castle-2412250942-44253' into dev 10 months ago
王杰 8ba822d174 Merge branch 'uat-temp-wj-2412260000-44069' into dev 10 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 10 months ago
xiangwei.zhang df69bc6293 未完成数量不能小于0 10 months ago
王杰 1dd4c179f6 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 4d5d0cfb52 Merge branch 'uat-temp-wj-2412240000-44246' into dev 10 months ago
王杰 0d0205d48f Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 375b196b3f 合并dev-temp-castle-2412201550-44316 存在冲突 fork uat 后 copy dev 的工单类 后 再copy 44316改动的地方 10 months ago
王杰 414021eee0 44246 每件正常做完,背景变蓝,而报错时背景闪红 10 months ago
castle.zang b335bdd105 修复bug 44253 同Pisces,零件发运组/发运组明细可以实现“前道工艺”校验 10 months ago
王杰 b75199dadc 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 10 months ago
王杰 d0b86456de Merge branch 'uat-temp-castle-20241224-44242-new' into dev 10 months ago
castle.zang 29cf5385d9 设置扫描的是包装 10 months ago
王杰 5c568266d8 Merge branch 'dev-temp-castle-2412200948-44429' into dev 10 months ago
王杰 70f24a27b4 Merge branch 'uat-temp-xw-2412241000-44315' into test 10 months ago
castle.zang 2837839ff6 统一记录errorMsg 10 months ago
王杰 069890b9c5 uat-temp-xw-2412241000-44315; uat-temp-castle-20241224-44242-new 10 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检,需要区分批次和单件 10 months ago
castle.zang 4002a1ac61 fix bug 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 10 months ago
王杰 c54f8c7f37 Merge branch 'uat-temp-wj-241223-44507' into dev 10 months ago
王杰 3626cdb3ce 44507 发运校验,大小写校验去除、需要启用“扫描方式判断” 10 months ago
王杰 cff7de02c1 Merge branch 'dev-temp-castle-2412191916-44449' into dev 10 months ago
王杰 4d64f91d2c 44449 新增Leo接口,通过报工条码查询零件号 10 months ago
王杰 ece7a67bab Merge branch 'dev-temp-castle-2412191916-44449' into dev 10 months ago
castle.zang 73d5b9e71b Merge branch 'dev-temp-castle-2412231549-44242' of https://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/serviceimpl/busi/MesBoxingErrorProofingService.java
10 months ago
castle.zang bd44cdb016 Merge branch 'dev-temp-castle-241223-44258' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
castle.zang d410d31d3f fix bug 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 10 months ago
castle.zang 3a5316bf48 fix bug 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 10 months ago
王杰 b59d0a114f Merge branch 'uat-temp-wj-241223-44507' into dev 10 months ago
王杰 0d6824c1db 44507 发运校验,大小写校验去除、需要启用“扫描方式判断” 10 months ago
castle.zang 20b69531e1 fix bug 44258 芜湖发运单打印 10 months ago
王杰 d6a455ba77 Merge branch 'dev-temp-wj-2412200000-00000' into test 10 months ago
王杰 9972bcec04 合并44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 (dev_temp_xw_20241220140000_44480) 解决冲突 10 months ago
王杰 e12c33f573 Merge branch 'dev-temp-workorder-report' into test 10 months ago
王杰 93a996260a Merge branch 'dev-temp-wj-2412200000-00000' into dev 10 months ago
王杰 a35ae3fab0 44486 MES:加工管理工位补充加工记录:打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件 10 months ago
王杰 0047ba39ac 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 340da17f68 44315 条码需要完成质检,再重新录入电子化检验 10 months ago
王杰 e0a2cbd9e2 44315 条码需要完成质检,再重新录入电子化检验 10 months ago
xiangwei.zhang cc88f3dd79 条码需要完成质检,再重新录入电子化检验 10 months ago
王杰 31136522f5 Merge branch 'dev-temp-wj-2412200000-00000' into dev 10 months ago
王杰 ed809a616d 44480 扫描一个设备ID, 显示的还是所有的点检单, 不是这个设备的点检单 10 months ago
王杰 1dca0cb3f3 打印件,自进自出,未加工完成未知后,再次扫描被误识别为外协件的问题修复 10 months ago
xiangwei.zhang a611078a51 合并代码冲突问题 10 months ago
王杰 8689e54762 Merge branch 'dev-temp-workorder-report' into dev 10 months ago
王杰 7892031fa8 合并 dev-temp-xw-2412201000-44315 解决冲突 10 months ago
王杰 63c285faa8 解决冲突 10 months ago
王杰 6e83356ec4 排序拆解 10 months ago
xiangwei.zhang 523991461e 重复报工导致报错修改 10 months ago
xiangwei.zhang ea51058c7b 条码需要完成质检,再重新录入电子化检验 10 months ago
castle.zang 600ca579b3 fix bug 44429,报工异常保存到加工结果报表中 10 months ago
castle.zang 03f6e6fbce 新增Leo接口,通过报工条码查询零件号 10 months ago
王杰 f95fbce203 Merge branch 'dev-temp-caslte-241218-44247' into dev-temp-workorder-report 10 months ago
王杰 b44d897cb6 Merge branch 'dev-temp-workorder-report-wj-202412190000-00000' into dev 10 months ago
王杰 2112aa63e9 Merge branch 'dev-temp-caslte-241218-44247' into dev 10 months ago
王杰 379aad9ba4 bom 查询条件 增加配置 10 months ago
castle.zang c3324d4736 fix bug 44247 装箱防错分外协件和自制件,自制件的情况下可以不用维护扫描规则 10 months ago
王杰 0994ffd413 Merge branch 'dev-temp-wj-2412180000-44399' into dev 10 months ago
王杰 4a3e42f31f 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 10 months ago
王杰 103f2dcd07 44399 工位表的工位图的file_ID取 mes_media_file_cfg表的ID 10 months ago
王杰 fab425a2db Merge branch 'dev-temp-caslte-241218-44247' into dev 10 months ago
王杰 644a60aacf merge dev-temp-wj-2412180000-00000 :pda产品加工记录查询报表修改 解决冲突 10 months ago
王杰 dd3dddd97f 产品加工记录 查询 报表 页面数据展示优化 (增加当前条码的最新状态工位质量等信息, 修复加工记录列表零件状态空的问题) 10 months ago
castle.zang 35a7dce7f9 fix bug 44247 装箱防错分外协件和自制件,自制件的情况下可以不用维护扫描规则 10 months ago
王杰 c391180ce7 Merge branch 'dev-temp-castle-20241217-44178' into dev 10 months ago
castle.zang f6326549ae 修复bug 44178 不要修改NC判定人 10 months ago
王杰 372b82522c Merge branch 'dev-temp-wj-2024160000-00000' into dev 10 months ago
王杰 5b22c555e2 武汉油漆线批量打印 解决 没有去掉编码规则里面前缀的问题 10 months ago
王杰 62faf00e3d Merge branch 'dev-temp-wj-2412120000-44244' into test 10 months ago
王杰 be69327589 Merge branch 'dev-temp-wj-2412120000-44244' into dev 10 months ago
王杰 570e2bfab1 44244 PDA上允许用户删除点检单,并且同步到WEB端 修改提示信息 10 months ago
xiangwei.zhang b024cfd6d4 修复抛异常依然加工记录成功报工 10 months ago
王杰 5e4175614d 解决冲突 10 months ago
王杰 3a1ddfe318 武汉油漆线批量打印 10 months ago
王杰 49716d9adb Merge branch 'dev-temp-wj-2024150000-00000' into dev 10 months ago
王杰 ae286d8f20 Merge branch 'dev-temp-castle-2412131826-44281' into dev 10 months ago