jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 王杰 2025-02-07 17:43:58 +0800
  • cbffd69ac3 Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev Janson 2025-02-07 10:38:32 +0800
  • 90c099d055 44953 新增条码打印模板的字段支持自定义配置 uat-temp-nht-2502060000-44953 Janson 2025-02-07 10:25:47 +0800
  • 3967b7acfd merge 红外焊超差预警 解决冲突 王杰 2025-02-06 20:49:03 +0800
  • 72998c5878 Merge branch 'test-temp-wj-250117-pack' into uat-temp-wj-2502060000-chongqing-step 王杰 2025-02-06 18:54:36 +0800
  • a5788a338a 合并解决冲突 王杰 2025-02-06 09:39:59 +0800
  • 1a5c2272e7 红外焊超差预警 uat-temp-wj-250124-equ-check-step 王杰 2025-02-05 21:21:59 +0800
  • bee36e00ec Merge branch 'dev-temp-xw-202502050000-44881' into dev xiangwei.zhang 2025-02-05 16:16:29 +0800
  • 4fb5c3d50b 44881 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-02-05 16:13:16 +0800
  • 1f3820687d dev分支修改pcn核心包版本为1.0.2-yfai 王杰 2025-02-05 11:41:36 +0800
  • de73649c13 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-01-25 10:43:09 +0800
  • 8a55afc42c Merge branch 'uat-temp-xw-202501250000-44863' into dev xiangwei.zhang 2025-01-25 10:41:02 +0800
  • 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 uat-temp-xw-202501250000-44863 xiangwei.zhang 2025-01-25 10:40:30 +0800
  • 21e3ad07d4 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-24 10:00:08 +0800
  • fcd7d440c5 包装补打印 test-temp-wj-250117-pack 王杰 2025-01-24 09:59:53 +0800
  • be895cc23a Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-24 09:28:17 +0800
  • dca4d89330 包装补打印 王杰 2025-01-24 09:28:04 +0800
  • 4c8f46dd44 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-24 09:24:00 +0800
  • c59e47601d 包装补打印 王杰 2025-01-24 09:23:42 +0800
  • 27fb491e3e Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 18:24:42 +0800
  • 712a6603d9 打包 王杰 2025-01-23 18:24:29 +0800
  • 61f6b12119 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 16:23:00 +0800
  • 5bfed2ca8e 打包 王杰 2025-01-23 16:22:44 +0800
  • 6f5b1e5de0 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 16:11:27 +0800
  • bc39704375 打包 王杰 2025-01-23 16:11:13 +0800
  • ba025d2f01 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 14:59:00 +0800
  • 32b9447a35 打包 王杰 2025-01-23 14:58:47 +0800
  • 941b979c49 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 13:54:40 +0800
  • 17818f5ea2 打包 王杰 2025-01-23 13:54:29 +0800
  • b75e9198d9 revert c9e1ee1024 王杰 2025-01-23 13:53:03 +0800
  • c9e1ee1024 打包 王杰 2025-01-23 13:51:10 +0800
  • 3b060d3496 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 10:44:48 +0800
  • 91fbdbed6a 打包 王杰 2025-01-23 10:44:26 +0800
  • ebdb79e7bc Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 09:36:06 +0800
  • d8fd96cf28 Merge branch 'uat-temp-wj-250122-44937' into dev 王杰 2025-01-22 21:03:26 +0800
  • 548ba84f08 44937 PCN：批量手动报工页面，排序方式按照工单号升序 yfai-pcn-ext-v2.82 王杰 2025-01-22 21:01:25 +0800
  • bd4f18ed84 重庆打包 王杰 2025-01-22 20:30:11 +0800
  • 1f6fe5e4a0 零件打包 王杰 2025-01-21 20:43:14 +0800
  • 96f0278f47 Merge remote-tracking branch 'origin/uat-temp-xw-202501170000-44873' into uat yfai-pcn-ext-v2.81 王杰 2025-01-20 16:17:22 +0800
  • f241329b41 Merge remote-tracking branch 'origin/dev-temp-xw-202501160000-44858' into uat 王杰 2025-01-20 16:07:11 +0800
  • e5cb750081 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into uat 王杰 2025-01-20 16:06:28 +0800
  • 7ea9817b27 打包 王杰 2025-01-20 14:19:14 +0800
  • a7b4f79a5f Merge branch 'test-temp-wj-2501170000-00000' into test 王杰 2025-01-20 13:38:27 +0800
  • 6893124d4c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2025-01-20 13:37:59 +0800
  • 561e4c9c54 Merge branch 'test-temp-wj-2501170000-00000' into dev 王杰 2025-01-20 13:37:51 +0800
  • 6d4ed9fe69 44887 离线数据回传问题修复 王杰 2025-01-20 13:37:38 +0800
  • 5aacd09a61 打包 王杰 2025-01-20 13:18:21 +0800
  • 908910e446 Merge branch 'test-demp-ljs-202501181621-44904' into dev jun 2025-01-20 10:26:34 +0800
  • 6747c5f14b 44904 PCN-发运异常处理 test-demp-ljs-202501181621-44904 jun 2025-01-20 10:25:42 +0800
  • 2759a1c621 Merge remote-tracking branch 'origin/test-demp-ljs-202501081531-44896' into test 王杰 2025-01-20 09:41:41 +0800
  • 025d7c5f5c Merge branch 'test-demp-ljs-202501181531-44896' into dev jun 2025-01-18 16:19:11 +0800
  • 15c86109d5 44896 生产汇报边端同步云端问题修复 jun 2025-01-18 15:33:03 +0800
  • 6892759782 44435 PCN：排序下线条码打印配置follow Pisces 王杰 2025-01-17 16:08:40 +0800
  • 0c74c405de 重庆打包 王杰 2025-01-17 15:13:50 +0800
  • bc088ff4a1 Merge branch 'uat-temp-xw-202501170000-44873' into dev xiangwei.zhang 2025-01-17 10:51:34 +0800
  • 2acd70ca6a 44873 PCN-批量报工页面，工单展示顺序基于工单序号正序排列显示 44883 MES:PCN-批量报工，写入报工表中未写入bom_code xiangwei.zhang 2025-01-17 10:50:21 +0800
  • 03645c13f3 Merge branch 'test-temp-wj-2501170000-00000' into dev 王杰 2025-01-17 09:30:10 +0800
  • 5349353ca8 44887 离线数据回传问题修复 王杰 2025-01-17 09:29:44 +0800
  • e548feffd9 Merge branch 'dev-temp-nht-202501160000-44744' into dev xiangwei.zhang 2025-01-16 18:30:47 +0800
  • 8413458661 Merge branch 'dev-temp-xw-202501160000-44858' into dev xiangwei.zhang 2025-01-16 17:18:14 +0800
  • db924c2dfa 44858 PCN:设备报废的数据在mes_part_inspection修改人为空，并且数据自动由可疑转正常，同时没有产生初判的移库 44805 PCN：电子化检验选零件的页面增加单位 xiangwei.zhang 2025-01-16 17:16:08 +0800
  • e1bc7f21a0 44744 修复同一条码完成返工后完成质检成功，后续无法再次操作电子化检验问题 dev-temp-nht-202501160000-44744 Jason 2025-01-16 15:25:40 +0800
  • 51ba9f967f Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into test yfai-pcn-ext-v2.8 王杰 2025-01-15 23:50:26 +0800
  • 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 王杰 2025-01-15 23:45:21 +0800
  • d8ca52a932 Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-15 23:45:01 +0800
  • 712fb6b943 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-15 23:41:23 +0800
  • fb81e4726d Merge branch 'uat-temp-wj-2501090000-44517-bak' into dev 王杰 2025-01-15 21:44:36 +0800
  • 86a6b595fd 44517 装箱防错后吐条码需求（芜湖）临时保存提交 王杰 2025-01-15 21:43:24 +0800
  • 5300afd180 Merge remote-tracking branch 'origin/dev-temp-nht-202501150000-44584' into dev 王杰 2025-01-15 20:24:22 +0800
  • b695fc1742 44517 装箱防错后吐条码需求（芜湖）临时保存提交 王杰 2025-01-15 20:21:59 +0800
  • df7ac14ebe 44584 修复排序工单发运完成后，条码状态未更新为发运问题。 Jason 2025-01-15 20:04:01 +0800
  • 1d756afd7c Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-01-15 18:11:50 +0800
  • b7020bb6f4 44838 MES:裁片补片逻辑更新＆裁片报表 dev-temp-xw-202501150000-44838 xiangwei.zhang 2025-01-15 18:11:02 +0800
  • 3707bea56e Merge branch 'test-temp-wj-2501140000-44828' into test 王杰 2025-01-15 13:12:41 +0800
  • f1f5a07862 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into test 王杰 2025-01-15 13:09:16 +0800
  • a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 王杰 2025-01-15 13:04:54 +0800
  • 92014561a3 Merge branch 'test-temp-wj-2501140000-44828' into dev 王杰 2025-01-14 21:22:07 +0800
  • 315703f41d 44828 PCN: 装箱防错需要校验条码的状态 王杰 2025-01-14 21:19:57 +0800
  • 88f4e451d1 Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-14 16:51:06 +0800
  • 96900f5e7b 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-14 16:50:52 +0800
  • dcb468ec1f Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-14 16:25:04 +0800
  • 5e5e2b4de8 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-14 16:22:31 +0800
  • ff4cdedf63 Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-14 13:03:28 +0800
  • 8daaa603bf 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-14 13:03:15 +0800
  • 5a5b759b3a Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-14 10:24:54 +0800
  • f9c6b5e81b 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-14 10:24:46 +0800
  • 20944bc9e6 Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-14 09:41:06 +0800
  • 3bdc59534c 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-14 09:40:50 +0800
  • d27ace0cce Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-13 19:23:18 +0800
  • 4a9dabfbf3 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-13 19:22:52 +0800
  • 603adecdd4 Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into dev 王杰 2025-01-13 10:30:08 +0800
  • 47e87b8fe1 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-13 09:59:04 +0800
  • d1fbcb8ee7 Merge branch 'uat-temp-castle-2501090929-44791' into dev 臧学普 2025-01-09 17:42:59 +0800
  • 8d8d54eafb 44791 迁移线末大屏看板到 pcn 臧学普 2025-01-09 17:39:24 +0800
  • fd82011fab 该类改加工记录毫秒 回退版本 xiangwei.zhang 2025-01-09 17:04:45 +0800
  • f848b4bcbf Merge branch 'uat' into uat-temp-copydevorderservice xiangwei.zhang 2025-01-09 16:35:44 +0800
  • b549b024ab Merge remote-tracking branch 'origin/uat-temp-castle-2501090929-44791' into dev 王杰 2025-01-09 10:03:47 +0800
  • c76ac1649a Merge remote-tracking branch 'origin/test-temp-wj-2501060000-44729' into dev 王杰 2025-01-09 10:02:19 +0800
  • eee50bfcdf 44791 迁移线末大屏看板到 pcn 臧学普 2025-01-09 09:38:44 +0800
  • 057f5f0bb1 44729 PDA: 可疑转正常的条码，可以进行发运扫描。 yfai-pcn-ext-v2.76 xiangwei.zhang 2025-01-06 13:39:17 +0800