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

Commit Graph

  • ce705abd20 刀具页面存档权限设置为只有超级管理员才能存档 yuxianghui 2024-10-14 16:03:21 +08:00
  • e2bd36ca16 工单异常处理 胡尧 2024-10-14 15:18:27 +08:00
  • e2dbd41e8f Accept Merge Request #1396: (feature/工单form视图优化 -> develop) 禹翔辉 2024-10-14 13:47:43 +08:00
  • 050a61f334 Merge branch 'feature/制造订单功能刀具状态优化' into feature/工单form视图优化 yuxianghui 2024-10-14 13:45:24 +08:00
  • 0fa7c1b2d7 Accept Merge Request #1395: (feature/制造功能优化 -> develop) 马广威 2024-10-14 13:45:17 +08:00
  • e1af6ba2f5 1、完成 工件装夹工单详情页版面优化需求 yuxianghui 2024-10-14 13:41:52 +08:00
  • 4a928735eb Accept Merge Request #1394: (feature/制造订单功能刀具状态优化 -> develop) 禹翔辉 2024-10-11 17:59:10 +08:00
  • fdc2af4a39 Merge branch 'feature/销售订单按钮优化' into feature/制造订单功能刀具状态优化 yuxianghui 2024-10-11 17:56:51 +08:00
  • 70b3daad73 1、删除功能刀具tree视图图片字段；2、修改货位看板关联展示字段；3、获取编程单接口调用cnc用刀校验方法添加报错处理； yuxianghui 2024-10-11 17:53:12 +08:00
  • d8bade64e1 优化质量：添加加工质检 jinling.yang 2024-10-11 17:52:33 +08:00
  • 71eefe7bc6 处理销售单不能创建的问题 release/release_2.4 胡尧 2024-10-11 15:19:03 +08:00
  • f779c492d8 Accept Merge Request #1393: (feature/流程用扫码完成 -> develop) 胡尧 2024-10-11 15:04:50 +08:00
  • a7b98f1e5e 解决销售单不能新增的bug 胡尧 2024-10-11 15:03:46 +08:00
  • 797eb9b159 Accept Merge Request #1392: (feature/临时分支 -> develop) 胡嘉莹 2024-10-11 10:10:57 +08:00
  • c3e40fd3aa 修改消息发送前已入库或已发货消息发送内容为null hujiaying 2024-10-11 09:52:42 +08:00
  • 39afc99b8f Merge branch 'release/release_2.4' master_sf_20241011_2.5 胡尧 2024-10-11 09:29:34 +08:00
  • 0ed07b024a Accept Merge Request #1391: (feature/临时分支 -> develop) 胡嘉莹 2024-10-11 08:54:03 +08:00
  • 22da51729b 修改项目升级初始化数据问题 hujiaying 2024-10-11 08:47:56 +08:00
  • c3be2894c9 Accept Merge Request #1386: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-10 17:55:49 +08:00
  • e08f968f1a Accept Merge Request #1390: (feature/临时分支 -> develop) 胡嘉莹 2024-10-10 17:53:57 +08:00
  • 351815ad91 优化销售订单+工单逾期预警和已1逾期代码 jinling.yang 2024-10-10 17:36:35 +08:00
  • 25a90f3966 1、获取mrs编程接口优化，重新编程接口优化，创建CAM方法优化，cnc用刀校验逻辑优化 yuxianghui 2024-10-10 17:31:56 +08:00
  • 50bb50f5ab 修改计划排程，超过小时产能提示产线的小时产能以及超出的件数 hujiaying 2024-10-10 16:47:25 +08:00
  • d1ff7c196d 解决合并冲突 hujiaying 2024-10-10 16:08:23 +08:00
  • 298d2391de Merge remote-tracking branch 'origin/develop' into feature/临时分支 hujiaying 2024-10-10 15:54:07 +08:00
  • 49cbeee261 编写sf生产完工入库提醒，订单发货提醒代码 hujiaying 2024-10-10 15:52:14 +08:00
  • b104b358ea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-10 14:01:56 +08:00
  • 786fca2937 调整“驾驶舱”的机床状态与工厂产线实际不一致的问题 mgw 2024-10-10 14:01:39 +08:00
  • ca6d1f51df Accept Merge Request #1388: (feature/制造功能优化 -> develop) 马广威 2024-10-10 11:49:22 +08:00
  • f324453351 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-10-10 11:36:35 +08:00
  • d0f5aca707 调整24h开机时长为0的问题；去掉x偏差角度的控制 mgw 2024-10-10 11:36:18 +08:00
  • f0cb047e8c Accept Merge Request #1387: (release/release_2.4 -> develop) 胡尧 2024-10-10 11:06:01 +08:00
  • b74bc62804 处理下发AGV小车任务报错的问题 胡尧 2024-10-10 10:49:16 +08:00
  • b6b92ab1da ftp文件下载适配开发环境 feature/增加适配开发环境 胡尧 2024-10-10 10:47:46 +08:00
  • 02467d5220 优化工单消息推送 jinling.yang 2024-10-09 17:58:47 +08:00
  • f18c0e3eaf 1、重构cnc用刀校验方法，优化下发编程单后校验cnc用刀的逻辑；2、优化CAM创建方法；3、优化获取mrs编程单接口、优化编程单更新接口； yuxianghui 2024-10-09 17:52:20 +08:00
  • c55f0b4c39 产品 qty_available字段名称修改为库存数量 liaodanlong 2024-10-09 17:45:57 +08:00
  • 94f57629e5 增加空料架配送菜单权限 胡尧 2024-10-09 17:23:03 +08:00
  • 2639a6ac6b 优化销售订单逾期和预警消息推送 jinling.yang 2024-10-09 16:42:53 +08:00
  • 52c1992814 Accept Merge Request #1383: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-10-09 16:35:27 +08:00
  • b1fbf4344e Accept Merge Request #1385: (feature/临时分支 -> develop) 胡嘉莹 2024-10-09 16:28:52 +08:00
  • a1b9f2dd3b 产品看板新增品牌字段，如果产品没有品牌字段则不展示品牌字段 hujiaying 2024-10-09 16:21:14 +08:00
  • 441cfaffce 优化代码 hujiaying 2024-10-09 16:01:27 +08:00
  • 75e1f5387d 修改coustom_many2many_checkboxes组件的展示方式，控制图片展示大小，修改点击预览图展示的样式优化 hujiaying 2024-10-09 16:01:12 +08:00
  • e4c845a9f6 解决空料架配送不能正常下发AGV任务的问题 胡尧 2024-10-09 14:08:38 +08:00
  • d239509299 解决空料架配送不能正常下发AGV任务的问题 胡尧 2024-10-09 13:53:49 +08:00
  • 3f0fda7aac Accept Merge Request #1384: (feature/制造功能优化 -> develop) 马广威 2024-10-09 10:50:58 +08:00
  • cc5452d14c 消息推送url链接逻辑修改 liaodanlong 2024-10-09 10:26:20 +08:00
  • 5aff8c1737 消息推送url链接逻辑修改 liaodanlong 2024-10-09 10:14:48 +08:00
  • a00f4af923 优化销售订单逾期 jinling.yang 2024-10-08 17:50:59 +08:00
  • 62a2aed7d9 销售订单按钮顺序优化为： 确认接单/拒绝接单/创建结算单/通过Email发送 yuxianghui 2024-10-08 14:26:12 +08:00
  • e99f01104e Accept Merge Request #1382: (release/release_2.4 -> develop) 胡尧 2024-10-08 09:20:31 +08:00
  • 457f0aa2ac 修复login页logo不显示的问题 胡尧 2024-10-08 09:19:06 +08:00
  • 1de4704046 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-30 10:51:54 +08:00
  • 0d65e67140 调整依赖 mgw 2024-09-30 10:48:40 +08:00
  • ccd01c9c75 优化合并多条发送销售订单逾期预警 jinling.yang 2024-09-29 17:51:50 +08:00
  • 84266364e3 Accept Merge Request #1381: (develop -> release/release_2.4) 胡嘉莹 2024-09-29 17:25:11 +08:00
  • 0b127ff419 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-29 17:12:25 +08:00
  • d4a01d9b8a 处理会计凭证生成重复名称报错问题 liaodanlong 2024-09-29 17:11:37 +08:00
  • ea88d8284a Accept Merge Request #1380: (feature/销售和排程添加消息推送 -> develop) 管欢 2024-09-29 17:09:47 +08:00
  • d2ec420f57 域名获取修改 guanhuan 2024-09-29 17:05:42 +08:00
  • 97d33adabd 域名获取修改 guanhuan 2024-09-29 17:03:49 +08:00
  • c11f3cc66c Merge branch 'develop' into release/release_2.4 胡尧 2024-09-29 16:51:41 +08:00
  • 6b4a7e35a9 Accept Merge Request #1375: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-29 16:48:53 +08:00
  • 11100c9260 域名获取修改 guanhuan 2024-09-29 16:47:35 +08:00
  • 941c3ca43a Accept Merge Request #1379: (feature/临时分支 -> develop) 胡嘉莹 2024-09-29 16:47:10 +08:00
  • 05f9528ca9 修改计划排程代码 hujiaying 2024-09-29 16:44:48 +08:00
  • b205945f65 Accept Merge Request #1378: (feature/修复待接单路径 -> develop) 杨金灵 2024-09-29 16:43:54 +08:00
  • c1dc28488a 修复待接单路径 jinling.yang 2024-09-29 16:42:32 +08:00
  • c6065653f0 优化逾期 jinling.yang 2024-09-29 16:40:52 +08:00
  • fd0de5ae09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送 jinling.yang 2024-09-29 15:43:19 +08:00
  • 547d6608e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-29 15:40:50 +08:00
  • dacb3cc076 Merge branch 'feature/消息模版初始化添加相关模版' into develop jinling.yang 2024-09-29 15:33:51 +08:00
  • 282657fbca Merge branch 'release/release_2.4' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_2.4 胡尧 2024-09-29 15:32:37 +08:00
  • 7e516c6f0b Accept Merge Request #1377: (feature/消息模版初始化添加相关模版 -> develop) 杨金灵 2024-09-29 15:31:28 +08:00
  • 34e2a49bef 注释部分不上的代码 jinling.yang 2024-09-29 15:30:18 +08:00
  • ff4bdd2f2d 还原代码 jinling.yang 2024-09-29 15:27:27 +08:00
  • b239fdf847 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-29 15:24:39 +08:00
  • 47feb4cf3c 消息模版初始化添加相关模版 jinling.yang 2024-09-29 15:24:28 +08:00
  • 83ca18d7d5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-29 14:02:04 +08:00
  • 11666b9ae1 静态数据时序库移位后的相应配置调整 mgw 2024-09-29 14:01:44 +08:00
  • 63b732ff42 Accept Merge Request #1376: (develop -> release/release_2.4) 胡嘉莹 2024-09-29 11:42:53 +08:00
  • 50d63c28d6 Accept Merge Request #1374: (feature/临时分支 -> develop) 胡嘉莹 2024-09-29 10:36:32 +08:00
  • 73b7ff7d1b 修改计划排程选择日期有生成量，不能排程问题 hujiaying 2024-09-29 10:33:19 +08:00
  • ccdcd01372 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-29 09:18:07 +08:00
  • 198296f0f8 价格计算 liaodanlong 2024-09-27 18:04:39 +08:00
  • f122343e31 Accept Merge Request #1373: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-27 18:02:25 +08:00
  • 82fa39f1a3 价格计算 liaodanlong 2024-09-27 18:00:34 +08:00
  • 841e1b4ce2 Accept Merge Request #1372: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-27 17:46:09 +08:00
  • 1ab62d7724 d刀具标准库数据同步 liaodanlong 2024-09-27 17:43:47 +08:00
  • 28a46d395b Accept Merge Request #1371: (feature/程序用刀异常提醒 -> develop) 胡尧 2024-09-27 15:19:21 +08:00
  • 64c66f1272 增加日志 feature/程序用刀异常提醒 胡尧 2024-09-27 15:18:27 +08:00
  • f8d957486b Accept Merge Request #1370: (feature/制造功能优化 -> develop) 马广威 2024-09-27 14:47:16 +08:00
  • 1866607967 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-27 14:41:41 +08:00
  • 40efdf6f3b 隐藏status字段 mgw 2024-09-27 14:41:23 +08:00
  • f910df3ce5 Accept Merge Request #1369: (feature/程序用刀异常提醒 -> develop) 胡尧 2024-09-27 14:39:55 +08:00
  • c99c96a9ea 去掉多余的无效刀异常推送 胡尧 2024-09-27 14:39:29 +08:00
  • 95cc557577 Accept Merge Request #1368: (feature/程序用刀异常提醒 -> develop) 胡尧 2024-09-27 14:38:10 +08:00
  • fa78389f47 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-27 14:31:39 +08:00
  • f7381c43aa 调整url的获取方式；暂时屏蔽历史日志部分 mgw 2024-09-27 14:31:22 +08:00