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

Commit Graph

  • 5ce006087f 弹框输入工单数量 王杰 2025-06-24 15:13:02 +0800
  • ae07960da1 常熟站点绑定功能 jason 2025-06-23 16:51:43 +0800
  • 619a3d72b5 容器扣减匹配装配件站点工步 王杰 2025-06-23 15:05:39 +0800
  • a6a28ab4fb 容器扣减匹配装配件站点工步 王杰 2025-06-23 15:04:41 +0800
  • 5b8a5e5d84 常熟站点绑定功能 jason 2025-06-23 09:12:36 +0800
  • 6fdba66cfb 常熟站点绑定功能 jason 2025-06-22 21:20:49 +0800
  • 7acf815e9b Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-logic-20250613-3533' into uat-temp-nht-2506120000-jialiao jason 2025-06-21 17:13:57 +0800
  • 19732c623c 常熟站点绑定功能 mes-uat-changshu0609-temp-logic-20250613-3533 jason 2025-06-21 17:10:49 +0800
  • 411af468eb 常熟上料功能 jason 2025-06-20 18:14:17 +0800
  • e4b6bab2de Merge remote-tracking branch 'origin/mes-dev' into mes-dev xiangwei.zhang 2025-06-20 17:31:51 +0800
  • 5d7fc38fb9 Merge remote-tracking branch 'origin/dev_temp_xw_20250610_46906' into mes-dev xiangwei.zhang 2025-06-20 17:31:13 +0800
  • 8245fb2112 nc处理更新质检单的责任方 uat_temp_xw_2050619_nc xiangwei.zhang 2025-06-19 17:44:51 +0800
  • 3506bf92bf Merge remote-tracking branch 'origin/uat-temp-nht-2506190000-47758' into mes-dev jason 2025-06-19 17:07:35 +0800
  • 27ab9ec39b 47758 武汉裁片工单上需要显示对应的裁片代码 uat-temp-nht-2506190000-47758 jason 2025-06-19 17:03:43 +0800
  • 49cee1361f 常熟上料功能 jason 2025-06-19 16:49:09 +0800
  • dca41636a8 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev logic.fang 2025-06-19 10:50:30 +0800
  • f0cd2ca1e3 47700 MES-PCN：站点容器绑定问题汇总：（优化） logic.fang 2025-06-19 10:50:10 +0800
  • 6233a5f31a 大包套小包逻辑 xiangwei.zhang 2025-06-19 10:37:35 +0800
  • ce178a01ef 大包套小包逻辑 xiangwei.zhang 2025-06-19 09:42:14 +0800
  • 3c80aa7d99 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev logic.fang 2025-06-18 17:04:08 +0800
  • 9f0b69405c 47700 MES-PCN：站点容器绑定问题汇总：（优化） logic.fang 2025-06-18 17:03:35 +0800
  • 7a0c88a975 大包套小包逻辑 xiangwei.zhang 2025-06-18 17:03:19 +0800
  • 37af94c1f2 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev logic.fang 2025-06-18 16:59:53 +0800
  • 1a60f3cdca 47700 MES-PCN：站点容器绑定问题汇总： logic.fang 2025-06-18 16:59:30 +0800
  • d62cc785c8 大包套小包逻辑 xiangwei.zhang 2025-06-18 09:12:43 +0800
  • 5aa5c776af 大包套小包逻辑 xiangwei.zhang 2025-06-17 20:45:50 +0800
  • 3231d46ea5 常熟上料功能 jason 2025-06-17 19:08:01 +0800
  • 92856e6ccf 修复spotbugs检测的问题 uat-temp-nht-2506050000-spotbugs jason 2025-06-17 09:52:02 +0800
  • 9bc0945a11 temp commit 王杰 2025-06-16 14:47:51 +0800
  • 0327f63828 Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev logic.fang 2025-06-16 14:39:00 +0800
  • 8c3a6b9f10 3533 主数据表设计与开发（容器条码与站点关系表-接口变更） logic.fang 2025-06-16 14:38:33 +0800
  • 0408c2ef84 Revert "3533 主数据表设计与开发（容器条码与站点关系表-接口变更）" logic.fang 2025-06-16 14:36:00 +0800
  • eaf858b684 3533 主数据表设计与开发（容器条码与站点关系表-接口变更） logic.fang 2025-06-16 14:35:44 +0800
  • a5fc0bbeef Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev logic.fang 2025-06-16 14:08:58 +0800
  • d91200dad9 3533 主数据表设计与开发（容器条码与站点关系表-软删除接口请求方式变更） logic.fang 2025-06-16 14:00:11 +0800
  • 7886c85e1c 3533 主数据表设计与开发（容器条码与站点关系表） logic.fang 2025-06-16 11:35:53 +0800
  • e181519b04 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改（扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”） logic.fang 2025-06-13 09:11:15 +0800
  • f4aedad179 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-47592' into mes-dev jason 2025-06-12 17:20:16 +0800
  • 59290bbedc 47592 MES-PCN: 装箱防错，未操作一个小时会自动退出 uat-temp-nht-2506120000-47592 jason 2025-06-12 14:07:01 +0800
  • 5129cddb77 46906 PCN: DM202504180005 电子化检验步骤优化 dev_temp_xw_20250610_46906 xiangwei.zhang 2025-06-12 13:38:38 +0800
  • 6d9cdebdc0 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-dataMatrix' into mes-dev jason 2025-06-12 11:12:26 +0800
  • ece6e4f88d 修复成都工位端打印DataMatrix格式问题 uat-temp-nht-2506120000-dataMatrix jason 2025-06-12 11:02:42 +0800
  • 1f2bf0a276 Merge branch 'mes-test' into mes-uat-changshu0609 王杰 2025-06-12 10:17:31 +0800
  • e73b501e70 打包 编码规则 策略变更 流水号递增不使用零件维度 王杰 2025-06-12 10:17:03 +0800
  • c95012370f Merge branch 'dev_temp_xw_20250610_46906' into mes-dev xiangwei.zhang 2025-06-10 15:12:44 +0800
  • 2b94d171b9 Merge branch 'dev_temp_xw_202506090000_47023' into mes-dev xiangwei.zhang 2025-06-10 15:12:32 +0800
  • ad24b7f21e 46906 PCN: DM202504180005 电子化检验步骤优化 xiangwei.zhang 2025-06-10 11:47:15 +0800
  • a84d2dbb0e 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] dev_temp_xw_202506090000_47023 xiangwei.zhang 2025-06-09 14:13:34 +0800
  • 411e5f4b93 Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev jason 2025-06-09 11:34:21 +0800
  • 60b5ea30d8 47389 成都零件标签打印模板修改 uat-temp-nht-2506050000-47389 jason 2025-06-09 11:33:02 +0800
  • 7bf163abde Merge remote-tracking branch 'origin/uat-temp-nht-2506050000-47389' into mes-dev jason 2025-06-05 10:24:45 +0800
  • 3f4e77dec4 47389 成都零件标签打印模板修改 jason 2025-06-05 10:19:00 +0800
  • 4589dd6fcf Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-06-05 09:22:24 +0800
  • 406063bfbe DM202504230012 mes-test-temp-DM202504230012 王杰 2025-06-04 17:28:31 +0800
  • b1f6ded5e6 修复电子化检验演示问题 jason 2025-06-04 16:30:18 +0800
  • 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie mes-test-merge-daxiaoxie 王杰 2025-06-03 13:48:33 +0800
  • 94fedf1bbf Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-06-03 13:47:25 +0800
  • 640d87bc3b 47318 电子化检验其他工位不良需报错提示，质检单赋值选择的产线 jason 2025-06-03 13:41:46 +0800
  • c4729819a8 Merge branch 'mes-test' into mes-dev 王杰 2025-06-03 13:23:40 +0800
  • 20c3601ae9 Merge branch 'mes-uat' into mes-test yfai-pcn-ext-v4.2 mes-uat 王杰 2025-06-03 13:23:02 +0800
  • aace498cfb 生产线开班逻辑调整 王杰 2025-06-03 09:19:06 +0800
  • 122214e896 Merge remote-tracking branch 'origin/dev_temp_xw_202505230000_47023' into mes-test 王杰 2025-05-30 12:26:26 +0800
  • eb900174e5 Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-test yfai-pcn-ext-v4.1 王杰 2025-05-30 12:08:04 +0800
  • ab6dd22282 Merge remote-tracking branch 'origin/uat-temp-nht-2505210000-chengdu-custpart' into mes-test 王杰 2025-05-30 12:06:47 +0800
  • e462e1e5b3 t : Merge branch 'mes-test' into mes-dev 王杰 2025-05-30 11:58:39 +0800
  • ef6b9ee270 第二天报工取错生产版本问题修复 xiangwei.zhang 2025-05-30 11:39:43 +0800
  • e3ed2f3ce3 Merge remote-tracking branch 'origin/mes-uat' into mes-uat xiangwei.zhang 2025-05-30 11:38:05 +0800
  • 92fa3eb930 第二天报工取错生产版本问题修复 xiangwei.zhang 2025-05-30 11:37:53 +0800
  • 8fe860f2a3 Merge branch 'mes-test' into mes-dev 王杰 2025-05-29 17:52:11 +0800
  • 0feb2ac82a Merge branch 'mes-uat' into mes-test 王杰 2025-05-29 17:51:55 +0800
  • 575038e5c0 第二天报工取错生产版本问题修复 xiangwei.zhang 2025-05-29 17:51:18 +0800
  • 618209785e Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-test 王杰 2025-05-29 15:38:01 +0800
  • bd756babdb Merge branch 'refs/heads/mes-uat-temp-logic-20250529-47241' into mes-dev logic.fang 2025-05-29 15:02:25 +0800
  • 7cc05f616f 47241 PCN：赛力斯jis队列接收和赛力斯JIS单接收，增加取消订单按钮，按钮需要权限管控 mes-uat-temp-logic-20250529-47241 logic.fang 2025-05-29 15:01:49 +0800
  • 0c01f5fef9 Merge remote-tracking branch 'origin/mes-dev' into mes-dev xiangwei.zhang 2025-05-27 17:30:20 +0800
  • 8c567de79a Merge branch 'dev_temp_xw_202505230000_47023' into mes-dev xiangwei.zhang 2025-05-27 17:29:35 +0800
  • c2d9e2207e 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] dev_temp_xw_202505230000_47023 xiangwei.zhang 2025-05-27 17:29:19 +0800
  • 9ae050a020 Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev logic.fang 2025-05-27 17:24:17 +0800
  • 6fa7d7dc2c 47187 PCN-电子化返工拆解功能问题（优化） mes-uat-temp-logic-20250526-47187 logic.fang 2025-05-27 17:23:38 +0800
  • df532b43d2 Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev logic.fang 2025-05-27 14:57:22 +0800
  • 4a66446687 47187 PCN-电子化返工拆解功能问题 logic.fang 2025-05-27 14:45:38 +0800
  • 34658be192 Merge branch 'dev_temp_xw_202505230000_47023' into mes-dev xiangwei.zhang 2025-05-27 14:00:37 +0800
  • 32c647ec66 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-05-27 11:43:23 +0800
  • 5c1c222e2a 修改工位类型的枚举，避免名称重复 jason 2025-05-27 11:42:29 +0800
  • 41d63d1beb 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] xiangwei.zhang 2025-05-27 11:04:08 +0800
  • ca64d811ed Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-05-27 10:10:52 +0800
  • 6390c6b7b5 修改工位类型的枚举，避免名称重复 jason 2025-05-27 10:05:54 +0800
  • a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] xiangwei.zhang 2025-05-26 21:28:24 +0800
  • 92d28e9baa Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-dev jason 2025-05-26 14:26:42 +0800
  • 7e7ef291a8 47177 PCN-装箱放错，扫描已经封箱的箱条码，目前只能显示十行已扫描的明细，没有按照实际扫描数量显示 uat-temp-nht-2505260000-47177 jason 2025-05-26 14:26:04 +0800
  • a4d30a11d9 Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev jason 2025-05-26 14:13:08 +0800
  • b268c7804e 47122 PCN-成都发运单打印加载发运单明细，增加按位置号排序 uat-temp-nht-2505230000-47122 jason 2025-05-26 14:11:55 +0800
  • 0766d4e2c6 Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev jason 2025-05-23 19:15:43 +0800
  • d731205471 47122 PCN-成都发运单打印加载发运单明细 jason 2025-05-23 19:14:36 +0800
  • 1b6728d26f Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-05-23 17:23:40 +0800
  • 57fa03f81f 46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 jason 2025-05-23 17:20:02 +0800
  • 958edd3435 46824 客退电子化检验，NC处理拆解需按照pisces功能按工序退回 jason 2025-05-23 13:57:30 +0800
  • bbdd17796b Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev jason 2025-05-23 11:22:54 +0800
  • 39bf71aa89 Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into uat-temp-nht-2505230000-47122 jason 2025-05-23 11:17:10 +0800
  • 083baffc93 47122 PCN-成都发运单打印加载发运单明细 jason 2025-05-23 10:28:38 +0800