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

Commit Graph

  • c17d1fb871 Merge branch 'dev_temp_xw_202503310000_45843' into uat-temp-wj-chongqingdaqu-dev xiangwei.zhang 2025-04-08 09:23:49 +0800
  • 2ef7005f16 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev xiangwei.zhang 2025-04-08 09:20:32 +0800
  • a553f8f955 Merge branch 'uat-temp-wj-chongqingdaqu-dev-bak' into uat-temp-wj-chongqingdaqu-prod-temp-rfid 王杰 2025-04-07 12:48:18 +0800
  • ba8dd50989 读条码记录日志 去重复 王杰 2025-04-05 22:31:09 +0800
  • 98cfd3847a 排序线 拍照 工位允许完成状态的工单通过 王杰 2025-04-05 11:32:57 +0800
  • 4ab3775e0d Merge branch 'uat-temp-nht-2504040000-lx' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-04 19:32:48 +0800
  • 9265f4db7e 修复龙兴发运校验问题 uat-temp-nht-2504040000-lx jason 2025-04-04 19:31:24 +0800
  • 121c55a82f 修复龙兴发运校验问题 jason 2025-04-04 19:22:41 +0800
  • c04b47f955 排序装配件显示列表 增加显示规则逻辑 王杰 2025-04-03 21:29:37 +0800
  • 1594454f9d Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-04-03 21:09:00 +0800
  • 1b531af014 平行工位问题 uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei 王杰 2025-04-03 21:07:02 +0800
  • a873f9aeb3 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-03 19:09:21 +0800
  • 5d6ea10abf 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 uat-temp-wj-45787 王杰 2025-04-03 19:06:59 +0800
  • dbbd6e5f0a 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 王杰 2025-04-03 19:01:18 +0800
  • b6f3a10c3d 45787 PDA 点检界面，工单排序顺序：新工单需要显示最前面 王杰 2025-04-03 18:56:44 +0800
  • 4e31c06716 装配件前道防错 王杰 2025-04-03 17:05:39 +0800
  • cf2f4fa9af 拍照工位 增加参数 王杰 2025-04-03 16:48:05 +0800
  • 946d82a776 平行工位 王杰 2025-04-03 15:06:59 +0800
  • e9eb65ae58 Merge remote-tracking branch 'origin/uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-prod-chengdu 王杰 2025-04-03 13:47:58 +0800
  • 6dfcc536ef 平行工位的问题处理 王杰 2025-04-03 13:46:28 +0800
  • c88a23f8dd Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-03 13:23:35 +0800
  • 94c1a6145e 修改类名及后装车未完全卡住发运单状态为已发运问题 jason 2025-04-03 13:22:25 +0800
  • 638ac2b921 Merge branch 'dev_temp_xw_202503260000_45858' into uat-temp-wj-chongqingdaqu-dev xiangwei.zhang 2025-04-03 10:02:28 +0800
  • 541ce42f21 45858 MES：电子化检验初判和终判批量导入 xiangwei.zhang 2025-04-03 10:01:36 +0800
  • 07a5eccdaf Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev uat-temp-nht-2503200000-volvo-print 王杰 2025-04-02 17:21:55 +0800
  • f5129a84f3 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-02 17:19:29 +0800
  • 93a72bfb3a Merge branch 'uat-temp-wj-chongqingdaqu-dev-craft-check' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-02 17:19:21 +0800
  • f26fe123e3 发运单打印 标题 王杰 2025-04-02 17:03:47 +0800
  • c430761019 工艺验证 王杰 2025-04-02 16:50:09 +0800
  • f26be6835a Merge branch 'uat-temp-wj-chongqingdaqu-dev-craft-check' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-04-02 16:35:43 +0800
  • 2391694fee 工艺路线验证bug 王杰 2025-04-02 16:19:04 +0800
  • 11ffcf1174 宁德二次装箱防错 jason 2025-04-02 15:17:48 +0800
  • d9b6aa7ff3 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-01 19:36:41 +0800
  • ea5f94a2c2 修复成都发运扫条码报错问题 jason 2025-04-01 19:35:58 +0800
  • 5afdecb062 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 王杰 2025-04-01 17:19:53 +0800
  • 3651a52f31 装配件前道防错 王杰 2025-04-01 17:19:44 +0800
  • fb854d7aaa Merge remote-tracking branch 'origin/uat-temp-nht-2503250001-twoshippingcheck' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-01 15:34:54 +0800
  • 29a4dc74aa 修复装车单校验未按扫描顺序卡控问题 jason 2025-04-01 15:17:12 +0800
  • ea375e468b Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev jason 2025-04-01 13:23:00 +0800
  • 558d50f47a 修改发运单打印重复打印问题 jason 2025-04-01 13:16:11 +0800
  • 3684f7bbf5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-craft-check uat-temp-wj-chongqingdaqu-dev-craft-check 王杰 2025-04-01 09:26:21 +0800
  • 1bc8002b88 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-31 21:33:56 +0800
  • b920d30445 重庆 显示前道所有装配件 配置 考虑平行与后端的数据过滤 王杰 2025-03-31 21:33:45 +0800
  • 11285c597c Merge branch 'dev_temp_xw_202503310000_45843' into dev dev xiangwei.zhang 2025-03-31 18:44:31 +0800
  • 40ad390f91 45843 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在 dev_temp_xw_202503310000_45843 xiangwei.zhang 2025-03-31 18:43:58 +0800
  • 444e98dc7e Merge branch 'dev_temp_xw_202503310000_45843' into dev xiangwei.zhang 2025-03-31 17:14:12 +0800
  • f70b94e327 45843 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在 xiangwei.zhang 2025-03-31 17:11:36 +0800
  • 1887c4e4d2 Merge branch 'dev_temp_xw_202503310000_45843' into dev xiangwei.zhang 2025-03-31 16:16:56 +0800
  • 282e8a6b99 45843 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在 xiangwei.zhang 2025-03-31 16:16:14 +0800
  • d416319260 解决合并冲突 xiangwei.zhang 2025-03-31 15:52:36 +0800
  • db65d2b1d8 修改发运单打印返回前端提示 jason 2025-03-31 15:52:23 +0800
  • 5e486a0b5b Merge branch 'dev_temp_xw_202503310000_45843' into dev xiangwei.zhang 2025-03-31 15:49:13 +0800
  • 5673649ce4 45843 1 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 2 无工单报工，根据产线物料号为一个事务去校验生产版本是否存在 xiangwei.zhang 2025-03-31 15:34:06 +0800
  • 4584525a70 Merge branch 'dev_temp_xw_202503280000_45843' into dev xiangwei.zhang 2025-03-31 15:06:37 +0800
  • b599fa1d87 45843 无工单补报工JOB针对多生产版本场景，默认使用SAP 主数据0001进行补报工 dev_temp_xw_202503280000_45843 xiangwei.zhang 2025-03-31 15:03:26 +0800
  • 151b4ab534 前道防错 王杰 2025-03-30 18:52:32 +0800
  • 0d94fd8a9d 文件备份 uat-temp-wj-chongqingdaqu-dev-equcontext 王杰 2025-03-29 22:38:55 +0800
  • 27c3d4ca55 Merge branch 'uat-temp-wj-chongqingdaqu-dev-bak' into uat-temp-wj-chongqingdaqu-dev-equcontext 王杰 2025-03-29 16:57:57 +0800
  • c4154e0696 修复成都排序工单打印问题 jason 2025-03-29 12:10:08 +0800
  • 4248e91bb2 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-29 10:18:57 +0800
  • 22e987369d 赛力斯报表部分迁移至工位端-添加查询条件 uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport logic.fang 2025-03-29 10:18:03 +0800
  • 6fb94e98e0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-29 07:47:40 +0800
  • 29f053bfb3 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-29 00:21:07 +0800
  • 367cfa8964 赛力斯报表部分迁移至工位端-优化 logic.fang 2025-03-29 00:20:43 +0800
  • e88ea56493 修复成都排序工单打印问题 uat-temp-nht-2503280000-cdpartsprint jason 2025-03-29 00:18:28 +0800
  • 6a101a1183 Merge remote-tracking branch 'origin/uat-temp-nht-2503280000-cdpartsprint' into uat-temp-nht-2503280000-cdpartsprint jason 2025-03-29 00:16:23 +0800
  • 079a8aad8e 修复成都排序工单打印问题 jason 2025-03-28 23:44:33 +0800
  • ee4b2496ce Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-28 23:49:31 +0800
  • 77ef72b2f4 赛力斯报表部分迁移至工位端 logic.fang 2025-03-28 23:47:46 +0800
  • 77a4eee9d4 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-28 23:45:41 +0800
  • c91f8efba6 修复成都排序工单打印问题 jason 2025-03-28 23:44:33 +0800
  • 5e6bd2e36e 排序工单验证工步 bug 王杰 2025-03-27 23:42:51 +0800
  • b07c046e4e 排序目视单打印 王杰 2025-03-27 20:56:51 +0800
  • 27e636b1e5 小鹏新编码规则 yfai-pcn-ext-v3.4 uat-dev test 王杰 2025-03-27 12:31:10 +0800
  • 03f0b24ac2 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev-bak yfai-pcn-ext-v3.5 uat-temp-wj-chongqingdaqu-dev-bak 王杰 2025-03-27 11:42:51 +0800
  • aad17d9964 宁德二次发运防错 jason 2025-03-26 22:08:13 +0800
  • efc977e0b9 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-03-26 20:37:37 +0800
  • 3083598cf1 设备上下文逻辑变更 王杰 2025-03-26 20:23:19 +0800
  • 126a694f00 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-26 09:45:52 +0800
  • bd105b0c8b Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-26 09:45:30 +0800
  • 6e5173aaab Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-26 09:06:22 +0800
  • a3c5d923d9 修复成都Volvo发运单打印PCN端问题 jason 2025-03-26 09:05:42 +0800
  • d61f098384 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 王杰 2025-03-25 19:51:54 +0800
  • d0ca6a26eb Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev-bak 王杰 2025-03-25 19:35:26 +0800
  • b5c9523665 外库问题 王杰 2025-03-25 19:34:40 +0800
  • d677eef35b 45822 库位与责任关系增加责任关系（拆分优化） uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822 logic.fang 2025-03-25 15:09:20 +0800
  • 9647eac5cc Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-25 11:39:56 +0800
  • 4d6b8b5be6 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-25 11:39:34 +0800
  • 6e877925b6 45822 库位与责任关系增加责任关系 logic.fang 2025-03-25 11:37:15 +0800
  • 51e4f3663d 45820 电子化检验-NC处理界面（检验人查询优化） uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820 logic.fang 2025-03-25 10:15:12 +0800
  • 362dafa25e 扫描可回用包装条码工步 王杰 2025-03-24 20:55:27 +0800
  • bf1030accf Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-24 16:54:17 +0800
  • 8f1aa79ea0 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev logic.fang 2025-03-24 16:54:05 +0800
  • 23bbd63a4b Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-24 15:18:57 +0800
  • 463bdf1a40 工位队列接收工步 王杰 2025-03-24 15:18:48 +0800
  • 7c9a93154d Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-24 13:46:23 +0800
  • 5d1633b833 成都Volvo标签打印修改 jason 2025-03-24 13:42:31 +0800
  • 14a601a1c4 深汕工单 王杰 2025-03-23 00:25:00 +0800
  • 766fe359bd 45859:龙兴发运看板无法根据发运组保存数据问题修复 uat-temp-nht-2503220000-45859 jason 2025-03-23 00:08:35 +0800
  • d19d75cb54 Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-21 23:16:34 +0800