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

Commit Graph

  • 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 臧学普 2025-02-24 11:47:48 +0800
  • 96e5b5ca58 不可用规则, 排序线 工位设备一对多关系, 代码对应调整 王杰 2025-02-24 11:39:13 +0800
  • 203ac5a768 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-24 09:59:22 +0800
  • 95af0ecaca 排序推单 王杰 2025-02-22 11:54:25 +0800
  • da002b26d0 yfai-pcn-ext-v3.1 增加custPartSnNumberRuleStrategyService pojo增加枚举DAY_SHORT 王杰 2025-02-21 17:53:24 +0800
  • a6c556fd17 排序推单 王杰 2025-02-21 17:44:55 +0800
  • 83ecd84119 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev jason 2025-02-21 15:35:26 +0800
  • ee8360f5fe 修复工步打印问题 dev-temp-nht-202502180000-customprint jason 2025-02-21 15:34:11 +0800
  • d765e02a4b 新增龙兴发运看板 jason 2025-02-21 15:18:02 +0800
  • 4583b5e931 Merge branch 'dev-temp-xw-202502170000-45135' into dev xiangwei.zhang 2025-02-21 13:42:01 +0800
  • a276255718 45135 武汉待排序总成问题 xiangwei.zhang 2025-02-21 13:41:29 +0800
  • 0a8a7287dc Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-21 13:37:41 +0800
  • de53859b0c Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into dev jason 2025-02-21 13:32:33 +0800
  • b30a42946a 新增礼嘉标签模板打印策略 uat-temp-nht-2502200000-lijia-sn-print jason 2025-02-21 13:31:50 +0800
  • 39bbfb44fe Merge branch 'test' into uat 王杰 2025-02-21 11:26:26 +0800
  • 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test yfai-pcn-ext-v3.11 王杰 2025-02-21 10:12:52 +0800
  • 9548dc2a5b 合并工单类 冲突 王杰 2025-02-20 20:29:22 +0800
  • b5f2a06b49 新增礼嘉条码打印策略 jason 2025-02-20 19:07:19 +0800
  • 7027284179 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-20 18:19:30 +0800
  • fdba01de69 裁片包装模版维护 报错提示信息修改 yfai-pcn-ext-v3.1 王杰 2025-02-20 14:58:30 +0800
  • 54413462d8 裁片包装模版维护 报错提示信息修改 王杰 2025-02-20 13:42:24 +0800
  • 26b923b3ca 合并 45034 45035 解决冲突 王杰 2025-02-20 11:58:48 +0800
  • 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 王杰 2025-02-20 11:51:41 +0800
  • 20451aafcc Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev jason 2025-02-19 22:21:54 +0800
  • 01bdfa295b 修复自定义打印补打问题 jason 2025-02-19 19:02:13 +0800
  • 07f55b5967 排序工单显示 优化 王杰 2025-02-19 17:42:56 +0800
  • 7c0951c37b Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-19 16:28:32 +0800
  • cb3d4821a3 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-19 16:28:07 +0800
  • 54ce53f638 新增龙兴发运看板 jason 2025-02-19 13:18:17 +0800
  • 34eed4efe4 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-19 10:04:41 +0800
  • f15bcc4d74 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-19 10:03:23 +0800
  • 7d44248a45 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev jason 2025-02-18 22:03:35 +0800
  • 0038093c07 修复自定义打印问题 jason 2025-02-18 22:03:00 +0800
  • cacbf941b3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2025-02-18 16:58:56 +0800
  • 526cdc2bb0 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-18 16:58:48 +0800
  • 808f999454 打包 王杰 2025-02-18 16:58:14 +0800
  • 0dc4d80053 修复自定义打印问题 jason 2025-02-18 16:04:19 +0800
  • 53c609b4c2 Merge branch 'uat-temp-castle-250209-kitting' into dev 臧学普 2025-02-18 15:13:34 +0800
  • 11348964e4 45151 PCN:电子化检验操作会突然退出登录 王杰 2025-02-18 14:07:31 +0800
  • d706a2ed4c 合并解决冲突 王杰 2025-02-18 09:16:34 +0800
  • 456ecfe23d Merge branch 'dev-temp-xw-202502170000-45135' into dev xiangwei.zhang 2025-02-17 20:22:29 +0800
  • def2ab6318 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-17 20:22:19 +0800
  • f55285ef76 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-17 20:21:45 +0800
  • f2bc641b5f 45135 PCN：武汉待排序总成问题 xiangwei.zhang 2025-02-17 20:19:50 +0800
  • 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 王杰 2025-02-17 17:53:06 +0800
  • 5ec10ea186 Merge branch 'dev-temp-xw-202502170000-111111' into dev xiangwei.zhang 2025-02-17 16:22:48 +0800
  • 0ea05632ed 待排序发运 dev-temp-xw-202502170000-111111 xiangwei.zhang 2025-02-17 16:19:47 +0800
  • 03d835ab7b Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-17 10:03:43 +0800
  • 7526830899 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-17 10:00:25 +0800
  • a005f627d8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-17 09:48:11 +0800
  • 48423a2f67 新增产品二维码生成策略 jason 2025-02-17 09:44:38 +0800
  • 44a3b7c7de 新增产品二维码生成策略 jason 2025-02-17 09:37:36 +0800
  • 0ef0cbb325 待排序发运 xiangwei.zhang 2025-02-17 09:23:05 +0800
  • 6a833dd6a3 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-16 16:52:00 +0800
  • 601e1b1b05 根据读取条码生成条码工步 王杰 2025-02-16 16:51:40 +0800
  • 6caf273050 Mt:erge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-16 15:21:51 +0800
  • 8b701a9620 打包 空指针异常修复 王杰 2025-02-16 15:21:38 +0800
  • ddbc3f2978 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-16 10:37:44 +0800
  • cc84bd5b50 演示 问题修复 王杰 2025-02-16 10:37:27 +0800
  • 9fe72b45f9 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-15 23:55:30 +0800
  • b8ad4d5a8b 发运写入发运队列 王杰 2025-02-15 23:55:17 +0800
  • d6e646c26e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-15 23:24:53 +0800
  • b768efd78d 零件打包 缺少工单号字段值 王杰 2025-02-15 23:01:55 +0800
  • 70648bb380 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-14 17:32:19 +0800
  • 098688f669 打包进度 王杰 2025-02-14 17:31:11 +0800
  • b6940676b1 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 王杰 2025-02-14 13:48:28 +0800
  • 43780c26d2 电子化检验弹框提示信息 王杰 2025-02-14 13:48:12 +0800
  • 08aa170d99 同步dev 工单类 因为存在冲突 王杰 2025-02-13 20:01:56 +0800
  • 94c675700a 解决冲突 王杰 2025-02-13 19:20:06 +0800
  • 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 王杰 2025-02-13 19:05:06 +0800
  • f936c32dc8 Merge branch 'test-temp-wj-2501170000-44435' into dev 王杰 2025-02-13 18:02:02 +0800
  • f21eb3380c 44435 PCN：排序下线条码打印配置follow Pisces 王杰 2025-02-13 18:01:48 +0800
  • e2fc1a5acb Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 王杰 2025-02-13 16:18:30 +0800
  • 4b92608fc5 修复bug 44248 https图片问题 uat_temp_castle_250213_44248 臧学普 2025-02-13 16:15:47 +0800
  • 4c85ebc1b4 Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into dev 王杰 2025-02-13 15:41:19 +0800
  • c67e6c85b2 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 王杰 2025-02-13 15:23:47 +0800
  • 13066579fa 修复bug 44248 https图片问题 臧学普 2025-02-13 15:15:33 +0800
  • ddab9dd2f7 合并重庆大区功能: 发运rfid; 工步批次防错; 工单零件级别顺序防错; 王杰 2025-02-13 15:06:26 +0800
  • 922cffab1c Merge branch 'test-temp-wj-2501170000-44435' into dev 王杰 2025-02-13 15:00:37 +0800
  • 62683d21c4 Merge branch 'test' into uat 王杰 2025-02-13 14:18:07 +0800
  • 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test yfai-pcn-ext-v2.9 王杰 2025-02-13 13:49:32 +0800
  • 383f8b3886 Merge branch 'test' into uat 王杰 2025-02-13 13:25:39 +0800
  • 1c147d44fc Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-45028' into dev Janson 2025-02-13 13:24:34 +0800
  • 3fed32bc15 revert 57d8fbab91 王杰 2025-02-13 13:20:04 +0800
  • 4721c5e1ba 批次防错 王杰 2025-02-13 13:10:59 +0800
  • 7afdc57541 Merge remote-tracking branch 'origin/uat' into uat 臧学普 2025-02-13 11:46:23 +0800
  • dd0cf7f1b1 修复bug 44248 https图片问题 uat-temp-castle-250211-44248 臧学普 2025-02-12 17:56:30 +0800
  • cdf657f6d0 发运单数据发送到发运队列 Janson 2025-02-11 18:44:25 +0800
  • 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 Janson 2025-02-11 16:53:55 +0800
  • 4241dcd230 shipping rfid 王杰 2025-02-11 15:48:02 +0800
  • bdfa78da4f Merge branch 'uat_temp-xw-202502110000-45034' into dev xiangwei.zhang 2025-02-11 13:54:19 +0800
  • 8612803152 45034 PCN：排序报工数据边端汇报了，云端显示未汇报 45035 PCN：前一天汇总报工job，日志提示错误后，没有将错误原因放在加工记录表备注列 xiangwei.zhang 2025-02-11 13:51:55 +0800
  • 2f55883343 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-10 19:49:31 +0800
  • 628c219cfe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-10 19:49:01 +0800
  • 306e3acc70 Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-10 19:37:25 +0800
  • e4a812ecf8 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-10 19:36:53 +0800
  • c6c20e07c2 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-10 19:36:23 +0800
  • 26e464b84b Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-10 19:12:22 +0800
  • fd5ceb1cbe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 xiangwei.zhang 2025-02-10 19:11:57 +0800
  • 5766c6eebf Merge branch 'uat_temp_xw_202502100000_44424' into dev xiangwei.zhang 2025-02-10 18:52:39 +0800