jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • ba9ce1f0ee 刀具标准库图片相关的参数更新 liaodanlong 2024-11-05 10:58:46 +08:00
  • 41cd76ad14 Accept Merge Request #1486: (feature/部分警告信息处理 -> develop) 禹翔辉 2024-11-05 09:53:48 +08:00
  • e20510bc4f Merge branch 'feature/工单优化_返工' into feature/部分警告信息处理 yuxianghui 2024-11-05 09:52:07 +08:00
  • 1d14ab27af 警告信息处理 yuxianghui 2024-11-05 09:50:24 +08:00
  • 0575d89227 Merge branch 'release/release_2.5' master_sf_20241104_2.6 胡尧 2024-11-04 19:49:05 +08:00
  • 7d6699fe7a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-11-01 16:00:53 +08:00
  • c5dfb50da5 修改模块名字 feature/plan_slow 胡尧 2024-10-31 14:42:28 +08:00
  • 1f938292f5 解决异常报错的问题 胡尧 2024-10-31 14:34:53 +08:00
  • fd55abec72 Accept Merge Request #1485: (release/release_2.5 -> develop) 胡尧 2024-10-31 11:34:46 +08:00
  • 76597f6ccb 在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错 release/release_2.5 胡尧 2024-10-31 11:15:06 +08:00
  • d7779e969d Accept Merge Request #1483: (feature/weid_sync_update -> develop) 管欢 2024-10-29 15:55:39 +08:00
  • 9d28eccd1b 用户创建员工同时修改用户的企微id feature/weid_sync_update guanhuan 2024-10-29 15:50:38 +08:00
  • 27339afaae Accept Merge Request #1482: (feature/weid_sync_update -> develop) 管欢 2024-10-29 15:05:59 +08:00
  • 8dc3f2698b 修改员工绑定用户同时修改用户的企微id guanhuan 2024-10-29 14:50:00 +08:00
  • 4fd7ad8d03 Accept Merge Request #1481: (feature/制造功能优化 -> develop) 马广威 2024-10-29 14:30:06 +08:00
  • 3bc33fe2fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-29 14:28:44 +08:00
  • c21319a127 rfid手动输入推送 mgw 2024-10-29 14:28:24 +08:00
  • 02e21a8fde Accept Merge Request #1480: (feature/weid_sync_update -> develop) 管欢 2024-10-29 11:10:47 +08:00
  • 2cf578de65 Accept Merge Request #1479: (feature/message_update -> develop) 管欢 2024-10-29 09:02:03 +08:00
  • 9665cdfc84 发送消息添加权限 feature/message_update guanhuan 2024-10-29 08:58:33 +08:00
  • bef7376827 Accept Merge Request #1478: (feature/plan_slow -> develop) 胡尧 2024-10-28 17:43:21 +08:00
  • e73e9d6960 增加日志 胡尧 2024-10-28 17:42:44 +08:00
  • 892f5d0e70 Accept Merge Request #1477: (feature/plan_slow -> develop) 胡尧 2024-10-28 17:26:58 +08:00
  • 61339da204 增加销售订单确认日志 胡尧 2024-10-28 17:26:27 +08:00
  • 25db392864 Accept Merge Request #1476: (feature/plan_slow -> develop) 胡尧 2024-10-28 17:23:00 +08:00
  • 745fd429c2 增加销售订单确认日志 胡尧 2024-10-28 17:21:51 +08:00
  • 5c59a27a81 增加采购总监消息推送权限 胡尧 2024-10-28 16:30:46 +08:00
  • 9bac3675f6 Accept Merge Request #1475: (feature/message_update -> develop) 管欢 2024-10-28 11:54:04 +08:00
  • b4fbbd48fb 精度显示修改 guanhuan 2024-10-28 11:46:36 +08:00
  • 3559d67c05 精度显示修改 guanhuan 2024-10-28 11:43:10 +08:00
  • 816623b1fe Accept Merge Request #1474: (feature/工单优化_返工 -> develop) 禹翔辉 2024-10-28 11:00:03 +08:00
  • 91b913a7bd Merge branch 'feature/维保请求优化' into feature/工单优化_返工 yuxianghui 2024-10-28 10:58:04 +08:00
  • ba8393a8c7 返工操作时工单状态优化 yuxianghui 2024-10-28 10:55:18 +08:00
  • 06d061165b Accept Merge Request #1473: (feature/message_update -> develop) 管欢 2024-10-28 10:30:02 +08:00
  • 18a7dbbff9 辅助文件上传 guanhuan 2024-10-28 10:21:33 +08:00
  • dc545e6d49 Accept Merge Request #1472: (feature/plan_slow -> develop) 胡尧 2024-10-28 09:45:24 +08:00
  • 1467dbf88c 修改排程逻辑 胡尧 2024-10-28 09:44:52 +08:00
  • e9caf78b81 Accept Merge Request #1471: (feature/plan_slow -> develop) 胡尧 2024-10-28 09:43:42 +08:00
  • aa1353cf99 修改排程逻辑 胡尧 2024-10-28 09:38:50 +08:00
  • 14d49f2944 Accept Merge Request #1469: (feature/message_update -> develop) 管欢 2024-10-25 17:41:02 +08:00
  • 8560069b19 Accept Merge Request #1470: (feature/去掉注释 -> develop) 杨金灵 2024-10-25 17:24:07 +08:00
  • 8dc23a638f 去掉注释 jinling.yang 2024-10-25 17:21:45 +08:00
  • 537fbf7e14 添加注释 jinling.yang 2024-10-25 17:19:10 +08:00
  • 5363557faf 快速订单创建报错 guanhuan 2024-10-25 16:36:54 +08:00
  • 3e684a308c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-10-25 15:52:32 +08:00
  • 3c026004f3 Accept Merge Request #1468: (feature/修复CNC工单消息提醒跳转 -> develop) 杨金灵 2024-10-25 15:42:56 +08:00
  • 651c8f266b 修复CNC工单消息提醒跳转 jinling.yang 2024-10-25 15:41:23 +08:00
  • a3bfbe66c4 Accept Merge Request #1467: (feature/修复工单链接跳转 -> develop) 杨金灵 2024-10-25 15:18:25 +08:00
  • 563e40adc6 修复工单链接跳转 jinling.yang 2024-10-25 15:15:11 +08:00
  • f88a784a87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-25 14:58:44 +08:00
  • 7227e1e59c 注释occ代码 jinling.yang 2024-10-25 14:58:29 +08:00
  • 01df5e86cd Accept Merge Request #1466: (feature/machining_accuracy_sync -> develop) 廖丹龙 2024-10-25 14:42:12 +08:00
  • 41f853b6c9 Accept Merge Request #1465: (feature/message_update -> develop) 管欢 2024-10-25 14:27:06 +08:00
  • 906a0ea767 采购按钮位置修改 feature/machining_accuracy_sync liaodanlong 2024-10-25 14:25:47 +08:00
  • 6162c731f2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-25 14:11:56 +08:00
  • 4f1d518ef3 加工精度修改 guanhuan 2024-10-25 14:02:37 +08:00
  • 06eaebd098 产品类别过滤缺陷 liaodanlong 2024-10-25 14:02:37 +08:00
  • 8578a9a538 Merge remote-tracking branch 'origin/feature/machining_accuracy_sync' into feature/machining_accuracy_sync liaodanlong 2024-10-25 14:01:52 +08:00
  • b9039ef466 刀具标准库page样式问题 liaodanlong 2024-10-25 14:01:38 +08:00
  • a97f581c99 Accept Merge Request #1464: (feature/工单消息提醒添加已排过滤 -> develop) 杨金灵 2024-10-25 13:52:15 +08:00
  • 036179ec4d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单消息提醒添加已排过滤 jinling.yang 2024-10-25 13:50:28 +08:00
  • d33188dedf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-25 13:50:07 +08:00
  • 7033f95273 工单消息提醒添加已排过滤 jinling.yang 2024-10-25 13:49:55 +08:00
  • 00689d76cc Accept Merge Request #1463: (feature/message_update -> develop) 管欢 2024-10-25 13:38:25 +08:00
  • 86d97ef331 2D加工图纸和质检标准位置调整 guanhuan 2024-10-25 11:55:43 +08:00
  • 05a183f46f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-25 11:36:12 +08:00
  • 50959d2e9c Merge branch 'feature/修复消息提醒时区问题' into develop jinling.yang 2024-10-25 11:35:56 +08:00
  • 519ce0d5bb 工单下发调整 guanhuan 2024-10-25 11:29:13 +08:00
  • f06842cdcb Accept Merge Request #1461: (feature/修复消息提醒时区问题 -> develop) 杨金灵 2024-10-25 11:28:41 +08:00
  • d5a1caad10 还原代码 jinling.yang 2024-10-25 11:26:18 +08:00
  • e51fff4120 修复消息提醒时区问题 jinling.yang 2024-10-25 11:25:37 +08:00
  • 2fe8e0e356 工单下发调整 guanhuan 2024-10-25 11:11:24 +08:00
  • bbe2e5792f Merge branch 'refs/heads/develop' into feature/machining_accuracy_sync guanhuan 2024-10-25 09:58:45 +08:00
  • a1a520ec39 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复消息提醒时区问题 jinling.yang 2024-10-25 09:55:12 +08:00
  • 1b714a9962 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-25 09:54:51 +08:00
  • 9d133096c7 修复消息提醒时区问题 jinling.yang 2024-10-25 09:54:37 +08:00
  • 69f3453134 加工精度修改 guanhuan 2024-10-25 09:48:57 +08:00
  • ab10271b4d Accept Merge Request #1460: (feature/machining_accuracy_sync -> develop) 管欢 2024-10-25 09:04:47 +08:00
  • 516a98e102 Merge remote-tracking branch 'origin/feature/machining_accuracy_sync' into feature/machining_accuracy_sync guanhuan 2024-10-25 08:58:34 +08:00
  • 390213881a 加工精度修改 guanhuan 2024-10-25 08:58:05 +08:00
  • ac2eba4734 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 17:39:36 +08:00
  • b64893436b Merge branch 'feature/修复销售订单和工单消息提醒' into develop jinling.yang 2024-10-24 17:36:00 +08:00
  • ee148239d2 Accept Merge Request #1459: (feature/修复销售订单和工单消息提醒 -> develop) 杨金灵 2024-10-24 17:35:44 +08:00
  • 4cc03aee9b 优化模版 jinling.yang 2024-10-24 17:35:21 +08:00
  • 31a703952c 修复销售订单和工单消息提醒 jinling.yang 2024-10-24 17:32:40 +08:00
  • 69c63f708d 修改和新增员工时根据邮箱获取企微id guanhuan 2024-10-24 17:06:31 +08:00
  • ae08c5b56e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 16:55:43 +08:00
  • dc76dcdc2f Merge branch 'feature/修复销售订单完成时效' into develop jinling.yang 2024-10-24 16:52:08 +08:00
  • 6a040d16ea Accept Merge Request #1458: (feature/修复销售订单完成时效 -> develop) 杨金灵 2024-10-24 16:51:52 +08:00
  • 30e8d04b70 添加销售订单是否完成并恢复正常时效定时器 jinling.yang 2024-10-24 16:50:27 +08:00
  • 2b3375ad41 修复销售订单完成时效 jinling.yang 2024-10-24 16:40:25 +08:00
  • 8a059a5520 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 16:20:38 +08:00
  • 49a2f02b54 Merge branch 'feature/修复工单提醒' into develop jinling.yang 2024-10-24 16:20:09 +08:00
  • ef92f24d35 Accept Merge Request #1456: (feature/维保请求优化 -> develop) 禹翔辉 2024-10-24 16:18:08 +08:00
  • 0207914592 Accept Merge Request #1457: (feature/修复工单提醒 -> develop) 杨金灵 2024-10-24 16:17:54 +08:00
  • 5776c97744 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单提醒 jinling.yang 2024-10-24 16:16:11 +08:00
  • 180cdf2a08 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-10-24 16:15:51 +08:00
  • 47720948ff 修复工单提醒 jinling.yang 2024-10-24 16:15:30 +08:00
  • 7814a2b622 Merge branch 'feature/工单状态优化' into feature/维保请求优化 yuxianghui 2024-10-24 16:12:57 +08:00
  • 06981fb894 1、添加维保请求的相关权限；2、优化维保请求tree视图、form视图和搜索视图； yuxianghui 2024-10-24 16:12:09 +08:00