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

Commit Graph

  • e4d957523f 47122 PCN-成都发运单打印加载发运单明细 jason 2025-05-23 10:28:38 +0800
  • bb6e82d64f Merge branch 'mes-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-dev 王杰 2025-05-21 18:26:53 +0800
  • f6eee29e82 Merge branch 'mes-test-batch-report-bug' into mes-dev 王杰 2025-05-21 18:25:04 +0800
  • 641a8d5fbd Merge branch 'mes-test-batch-report-bug' into mes-test yfai-pcn-ext-v4.0 王杰 2025-05-21 18:22:58 +0800
  • 352221cceb Merge branch 'mes-uat-temp-47040' into mes-test 王杰 2025-05-21 18:22:47 +0800
  • 967cde9401 批量汇报未完成数计数不准bug mes-test-batch-report-bug 王杰 2025-05-21 18:18:19 +0800
  • 3f59ebf496 Merge remote-tracking branch 'origin/uat-temp-nht-2505210000-chengdu-custpart' into mes-dev jason 2025-05-21 14:15:20 +0800
  • 72ca534717 合并成都打印及条码生成客户零件号取待开票物料中的客户零件号 uat-temp-nht-2505210000-chengdu-custpart jason 2025-05-21 14:13:33 +0800
  • e3d5501b05 合并46894 MES PCN: 吉翔下线条码，客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 王杰 2025-05-21 12:57:35 +0800
  • ed99eb4389 合并46894 MES PCN: 吉翔下线条码，客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 王杰 2025-05-21 12:53:47 +0800
  • ce4fce0b7f Merge remote-tracking branch 'origin/uat-temp-nht-2505200000-47042' into mes-test 王杰 2025-05-21 12:04:16 +0800
  • 375ace3baa Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-test 王杰 2025-05-21 11:57:17 +0800
  • 059f00eca3 Merge branch 'mes-uat-temp-47040' into mes-dev 王杰 2025-05-21 11:56:49 +0800
  • 209911bbdb Merge remote-tracking branch 'origin/uat-temp-nht-2505160000-46987' into mes-dev 王杰 2025-05-21 11:56:35 +0800
  • 888275dd6b 选择产成零件按钮 mes-uat-temp-47040 王杰 2025-05-20 18:47:33 +0800
  • 438e4d88df Merge branch 'mes-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-dev 王杰 2025-05-20 16:58:24 +0800
  • b665ffbe66 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 王杰 2025-05-20 16:58:18 +0800
  • 5a8339521b 回头46981 电子化检验 NC判定 虚结构不可录入 需求总部不同意变更 王杰 2025-05-20 16:57:46 +0800
  • 6aa9febaad Merge branch 'uat-temp-nht-2505200000-47042' into mes-dev jason 2025-05-20 10:57:20 +0800
  • 73df0409ad 47042 MES: PCN发运校验：发运单明细，优先校验客户待开票物料中对应的零件关系主数据 uat-temp-nht-2505200000-47042 jason 2025-05-20 10:52:43 +0800
  • a159411fb1 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 王杰 2025-05-19 21:11:49 +0800
  • a10f9a69c5 Merge branch 'uat-temp-nht-2505160000-46987' into yfai-20250418-dev yfai-20250418-dev jason 2025-05-19 18:23:24 +0800
  • 7680553d4e 46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。 uat-temp-nht-2505160000-46987 jason 2025-05-19 18:22:55 +0800
  • a91d27ad85 合并 46981 电子化检验 NC判定 虚结构不可录入 解决冲突 王杰 2025-05-19 15:54:05 +0800
  • 25e185e1c8 46981 电子化检验 NC判定 虚结构不可录入（代码合并成通用方法） uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981 logic.fang 2025-05-19 15:51:02 +0800
  • eb7832cb40 Merge branch 'uat-temp-nht-2505160000-46987' into yfai-20250418-dev jason 2025-05-19 14:36:28 +0800
  • 1a2c6efd58 46987 MES&PCN-装箱防错功能，增加配置开关 “包装码中是否为客户零件号”，默认逻辑关闭，为是则包装条码中的零件号为客户零件号。 jason 2025-05-19 14:35:38 +0800
  • cd1232d7f2 46981 电子化检验 NC判定 虚结构不可录入 logic.fang 2025-05-19 14:16:28 +0800
  • c31d5e44c6 合并 46881 PCN：龙兴发运看板优化 解决冲突 yfai-pcn-ext-v3.9 王杰 2025-05-19 13:23:58 +0800
  • 566a91562e 合并 46881 PCN：龙兴发运看板优化 解决冲突 王杰 2025-05-19 13:23:13 +0800
  • f41ae22e28 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-test 王杰 2025-05-19 12:40:05 +0800
  • 4c89c16a09 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-test 王杰 2025-05-19 12:33:44 +0800
  • 0f576159dc Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-dev 王杰 2025-05-19 12:19:27 +0800
  • 20c13d6f82 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion' into mes-dev 王杰 2025-05-19 12:18:43 +0800
  • 300e73dbe2 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-dev 王杰 2025-05-19 12:18:15 +0800
  • 0c0cdd2465 第二天自动创建工单汇报 生产版本问题 逻辑调整 uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion 王杰 2025-05-19 10:55:43 +0800
  • be86d49216 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981' into yfai-20250418-dev logic.fang 2025-05-17 18:18:20 +0800
  • d7e5005860 46981 电子化检验 NC判定 虚结构不可录入 logic.fang 2025-05-17 18:13:30 +0800
  • 0cca6a1765 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak yfai-pcn-ext-v3.8 uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak mes-master 王杰 2025-05-16 20:12:18 +0800
  • 335dbb8e52 46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改 dev_temp_xw_202505150000_46970 xiangwei.zhang 2025-05-16 20:10:12 +0800
  • 3dbbf23a99 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak 王杰 2025-05-16 19:45:08 +0800
  • e608665df9 46970 返工拆解查询装配件条码，不能根据装配件条码而要根据id去查询并且修改 xiangwei.zhang 2025-05-16 17:59:03 +0800
  • 82f72e0bdd Merge branch 'uat-temp-nht-2505160000-46987' into yfai-20250418-dev jason 2025-05-16 13:27:24 +0800
  • dbf8e91547 46987 MES&PCN-装箱防错功能，增加配置开关 “是否校验工厂代码”，默认逻辑开启，需要校验，字段为空也为校验 jason 2025-05-16 13:26:38 +0800
  • 3a0a855584 46881 PCN：发运看板开启多个导致CPU很高，优化查询SQL jason 2025-05-15 22:47:15 +0800
  • 63a5484152 Merge branch 'uat-temp-nht-202505150000-46881' into yfai-20250418-dev jason 2025-05-15 22:38:21 +0800
  • beee1d6277 46881 PCN：发运看板开启多个导致CPU很高，优化查询SQL uat-temp-nht-202505150000-46881 jason 2025-05-15 22:31:30 +0800
  • bee1c8e17c 合并46970礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动 解决冲突 王杰 2025-05-15 22:02:24 +0800
  • 2a0cb8222a 46970 礼嘉测试环境批量返工报废不需要从责任人库位移到正常库位，保持不动 uat-temp-wj-chongqingdaqu-prod dev_temp_xw_202505150000_46950 xiangwei.zhang 2025-05-15 19:06:51 +0800
  • 82556d70a1 46824 [PCN] 1. 增加校验电子化检验次数功能需求; 2. 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 xiangwei.zhang 2025-05-15 18:57:38 +0800
  • 7576219ed8 合并宁德发运 uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-15 15:46:51 +0800
  • b0f2c2cc61 Merge remote-tracking branch 'origin/uat-temp-nht-2504020000-3520' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-15 15:21:16 +0800
  • a7e48f928c Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-publish0415' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-15 15:15:09 +0800
  • 6daaf09684 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-15 15:11:15 +0800
  • d44dfd6771 Merge branch 'uat-temp-nht202505120000-46757' into yfai-20250418-dev jason 2025-05-15 13:19:22 +0800
  • f1f8f0b68b Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 uat-temp-wj-chongqingdaqu-prod-temp-publish0415 王杰 2025-05-15 11:26:30 +0800
  • 2284e39a86 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 王杰 2025-05-15 11:22:54 +0800
  • f13c1b960a Merge remote-tracking branch 'origin/dev_temp_xw_202505120000_46850' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 王杰 2025-05-15 11:16:22 +0800
  • 5b67c38b3a Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 王杰 2025-05-15 10:58:10 +0800
  • 974664a879 Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev jason 2025-05-14 16:10:02 +0800
  • b20698f63c Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 uat-temp-nht-2504270000-46499 jason 2025-05-14 16:09:38 +0800
  • a181c3c0d9 修复宁德二次发运写入JIS_SHIPPING表逻辑 jason 2025-05-14 15:02:12 +0800
  • 475c2ee94c Merge remote-tracking branch 'origin/yfai-20250418-dev' into yfai-20250418-dev jason 2025-05-14 15:03:08 +0800
  • 30985d1b05 Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev jason 2025-05-14 15:02:46 +0800
  • c3657bd3c6 修复宁德二次发运写入JIS_SHIPPING表逻辑 jason 2025-05-14 15:02:12 +0800
  • a572836ee9 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into yfai-20250418-dev 王杰 2025-05-13 21:21:49 +0800
  • 373dd1e038 大小写问题 uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-05-13 21:21:19 +0800
  • 2e08809199 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-05-13 15:45:05 +0800
  • a2d756cb40 大小写问题 王杰 2025-05-13 15:44:44 +0800
  • 8448f4e832 代码回退 王杰 2025-05-13 10:28:01 +0800
  • 6b67fa78df 46757 代开票业务支持条码打印 uat-temp-nht202505120000-46757 jason 2025-05-12 21:26:10 +0800
  • 6a83990a70 Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev jason 2025-05-12 18:14:38 +0800
  • 4fb98f07a6 修复替换装配件后的查询问题 uat-temp-nht-202505090001-46746 jason 2025-05-12 18:14:17 +0800
  • cbb9eace0e Merge branch 'yfai-20250418-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into yfai-20250418-dev 王杰 2025-05-12 15:53:21 +0800
  • 6627fb368d Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428' into yfai-20250418-dev 王杰 2025-05-12 15:53:13 +0800
  • 7742daad31 46428 PCN：龙兴条码打印直接从数据库里取，不走redis uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428 王杰 2025-05-12 13:49:14 +0800
  • a1a73ef2b4 Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev jason 2025-05-12 13:34:37 +0800
  • a26d6fb90a Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev jason 2025-05-12 13:33:16 +0800
  • eeacec72bf 修复条码强过后，检验这个条码是不是扫过了 jason 2025-05-12 13:08:57 +0800
  • edb53d3384 修复替换装配件后的查询问题 jason 2025-05-12 11:20:06 +0800
  • 2d06f12771 46850 排序报工慢的问题 dev_temp_xw_202505120000_46850 xiangwei.zhang 2025-05-12 09:39:07 +0800
  • b880272e7d Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev jason 2025-05-09 18:13:08 +0800
  • 5f88ad674a 46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能 jason 2025-05-09 18:12:19 +0800
  • ebaebe449e 46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能 jason 2025-05-09 16:22:07 +0800
  • ca4b45c9f7 解决冲突 王杰 2025-05-09 13:03:45 +0800
  • cfab2095ad Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601' into yfai-20250418-dev 王杰 2025-05-09 12:29:12 +0800
  • a7bb6ae289 解决冲突 王杰 2025-05-09 12:27:47 +0800
  • ce0e486efb Merge branch 'uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-05-09 12:26:04 +0800
  • 8d4ac268c6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-05-09 12:25:03 +0800
  • 1d18681b40 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 王杰 2025-05-09 12:15:13 +0800
  • 24395a9b58 Merge branch 'uat-temp-nht-2504270000-46499' into yfai-20250418-dev jason 2025-05-09 11:49:19 +0800
  • e1f8bca3c6 修复宁德二次发运问题 jason 2025-05-09 11:48:24 +0800
  • 851df7994c Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-08 20:14:14 +0800
  • 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 王杰 2025-05-08 20:12:43 +0800
  • 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601 logic.fang 2025-05-08 19:54:42 +0800
  • ce7e467540 礼嘉缝纫批量汇报 uat-temp-wj-chongqingdaqu-prod-lijiabatchreport 王杰 2025-05-08 19:29:30 +0800
  • d8186cb52f 礼嘉缝纫批量汇报 王杰 2025-05-08 16:55:37 +0800
  • b83ea0c0e2 Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev jason 2025-05-07 18:50:31 +0800
  • 86619bd6b5 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708 uat-temp-nht-2504300000-46708 jason 2025-05-07 18:50:00 +0800
  • ace1efd6d9 46708 PCN-龙兴发运看板增加折线图，和现有看板页面定时翻页显示 jason 2025-05-07 10:51:58 +0800