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

Commit Graph

  • 88ffc34a68 程序用刀异常提醒 胡尧 2024-09-27 14:00:56 +08:00
  • 4f65b34aeb Accept Merge Request #1367: (feature/无效刀校验优化 -> develop) 禹翔辉 2024-09-27 13:36:44 +08:00
  • 4a26d18b46 Merge branch 'feature/下发编程优化' into feature/无效刀校验优化 yuxianghui 2024-09-27 13:34:10 +08:00
  • 664ac8128a cnc校验刀无效刀创建检测结果时先检测是否已经存在待处理记录 yuxianghui 2024-09-27 13:32:55 +08:00
  • ce285818cf Accept Merge Request #1366: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-27 11:55:16 +08:00
  • 6f7811a843 调拨入库、刀具组装，拆解消息推送模板预置数据 liaodanlong 2024-09-27 11:53:55 +08:00
  • 54ed90e892 Accept Merge Request #1365: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-27 10:32:56 +08:00
  • f8060113d9 产品关联数据字段修改 liaodanlong 2024-09-27 10:14:13 +08:00
  • 48ab891991 调整设备oee结构，去掉设备运行日志 mgw 2024-09-27 10:07:02 +08:00
  • 7f384c3f56 消息模板初始数据 guanhuan 2024-09-27 09:36:51 +08:00
  • 01a2771dfb Revert "消息模板初始数据" guanhuan 2024-09-27 09:35:18 +08:00
  • 45b6214ddd 消息模板初始数据 guanhuan 2024-09-27 09:33:17 +08:00
  • c96ff3f5b4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-27 09:20:36 +08:00
  • d84758232e 优化值为空时的逻辑 mgw 2024-09-27 09:20:19 +08:00
  • 479953e082 Accept Merge Request #1364: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-27 09:12:03 +08:00
  • 7235f242b2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送 jinling.yang 2024-09-27 09:11:56 +08:00
  • 27881589d4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-27 09:10:19 +08:00
  • 79ec3f2c91 r角默认值 liaodanlong 2024-09-27 09:09:48 +08:00
  • 715b4181be Accept Merge Request #1363: (feature/销售和排程添加消息推送 -> develop) 管欢 2024-09-26 18:05:49 +08:00
  • 0ccda10c65 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-26 17:58:20 +08:00
  • 5b4376b5f9 r角默认值 liaodanlong 2024-09-26 17:58:04 +08:00
  • 1050f7616b 删除重复we_employee_id guanhuan 2024-09-26 17:57:17 +08:00
  • 3a9cc0c09c Accept Merge Request #1362: (feature/下发编程优化 -> develop) 禹翔辉 2024-09-26 16:38:07 +08:00
  • 4d63b90373 屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法 yuxianghui 2024-09-26 16:36:49 +08:00
  • 43c4614650 Accept Merge Request #1361: (feature/程序用刀异常提醒 -> develop) 胡尧 2024-09-26 15:34:46 +08:00
  • eba9ccf083 屏蔽title写死JIKIMO的代码 胡尧 2024-09-26 15:33:39 +08:00
  • 947100a9d4 Accept Merge Request #1360: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-26 14:57:11 +08:00
  • ed4924651a Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-26 14:55:32 +08:00
  • 3cc2bb94fe 刀具拆解消息推送 liaodanlong 2024-09-26 14:54:43 +08:00
  • 8ecb3eb50a Accept Merge Request #1358: (feature/销售和排程添加消息推送 -> develop) 管欢 2024-09-26 14:09:10 +08:00
  • 819d89c278 Accept Merge Request #1359: (feature/刀具标准库同步接口优化 -> develop) 禹翔辉 2024-09-26 14:06:53 +08:00
  • 66d47c60bc Merge branch 'feature/CAM优化' into feature/刀具标准库同步接口优化 yuxianghui 2024-09-26 14:05:09 +08:00
  • 0340563749 筛选加工时间不为空的24h数据 mgw 2024-09-26 14:04:35 +08:00
  • 271e23a67f 1、刀具标准库数据同步接口优化 yuxianghui 2024-09-26 14:01:03 +08:00
  • de42382f58 Merge branch 'refs/heads/feature/程序用刀异常提醒' into feature/销售和排程添加消息推送 guanhuan 2024-09-26 13:54:28 +08:00
  • 3728809d10 消息通知url修改 guanhuan 2024-09-26 13:43:47 +08:00
  • d4e2ace8a6 消息通知url修改 guanhuan 2024-09-26 12:36:00 +08:00
  • 1d4188df7e 增加24h的故障时间返回 mgw 2024-09-26 11:11:46 +08:00
  • a2323293ca Accept Merge Request #1357: (feature/程序用刀异常提醒 -> develop) 胡尧 2024-09-26 10:31:26 +08:00
  • 29bd1c2968 解决冲突 胡尧 2024-09-26 10:30:40 +08:00
  • 6c35ec13fd 无效刀判断后调用cloud发送消息推送接口 胡尧 2024-09-26 10:28:38 +08:00
  • 83107b05e2 Accept Merge Request #1356: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-26 09:38:52 +08:00
  • 5fb7165306 调拨入库消息推送 liaodanlong 2024-09-26 09:22:02 +08:00
  • c569b60d5c 手动创建的拆解单不生成消息推送 liaodanlong 2024-09-26 09:21:04 +08:00
  • bd2748659a 去掉关机率 mgw 2024-09-25 17:57:24 +08:00
  • 7fef8f4c77 添加业务节点 jinling.yang 2024-09-25 17:50:00 +08:00
  • 3ee233c0bc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-25 17:45:34 +08:00
  • d63081dffa 优化销售订单+工单逾期 jinling.yang 2024-09-25 17:45:15 +08:00
  • 0932ec95bf Accept Merge Request #1355: (feature/制造功能优化 -> develop) 马广威 2024-09-25 16:32:12 +08:00
  • 7361da0e5d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-25 16:29:05 +08:00
  • 2dbddf532c 增加24小时的运行数据 mgw 2024-09-25 16:28:45 +08:00
  • eb867e62d8 Accept Merge Request #1354: (feature/销售和排程添加消息推送 -> develop) 管欢 2024-09-25 14:39:12 +08:00
  • d75504960a Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-25 14:37:05 +08:00
  • 93efbf742e 产品刀具参数物料与物料号数据关联 liaodanlong 2024-09-25 14:36:32 +08:00
  • 7c3ac138b5 工单已下发通知 guanhuan 2024-09-25 14:31:31 +08:00
  • 63444d3dd1 调整默认值 mgw 2024-09-25 14:10:11 +08:00
  • 2fcad742b8 调整alarm logs的返回数据 mgw 2024-09-25 14:08:05 +08:00
  • f341ef5e83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-25 13:51:09 +08:00
  • d488824e3d 增加分页接口；合并日志状态相同数据 mgw 2024-09-25 13:50:50 +08:00
  • 0c28700f75 Accept Merge Request #1353: (feature/修复销售+排程消息推送 -> develop) 杨金灵 2024-09-25 13:35:56 +08:00
  • 48d97f3e57 Accept Merge Request #1352: (feature/CAM优化 -> develop) 禹翔辉 2024-09-25 12:27:10 +08:00
  • ef17c9920c 修复销售+排程消息推送 jinling.yang 2024-09-25 12:00:46 +08:00
  • ef643a5a72 Merge branch 'feature/程序用刀校验优化' into feature/CAM优化 yuxianghui 2024-09-25 11:53:10 +08:00
  • b7ff8d0bd5 添加CNC缺刀创建CAM日志 yuxianghui 2024-09-25 11:52:29 +08:00
  • 1e721d68bf 调整视图与增加字段 mgw 2024-09-25 11:41:23 +08:00
  • 7454297dcd 调整设备故障日志 mgw 2024-09-25 11:24:01 +08:00
  • 2e3a9a8b80 添加提醒时间 jinling.yang 2024-09-25 11:18:37 +08:00
  • 4e0a023c36 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 guanhuan 2024-09-25 10:49:10 +08:00
  • 155c5eb329 坯料采购提醒 guanhuan 2024-09-25 10:48:35 +08:00
  • 45718ab925 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-25 09:49:43 +08:00
  • 562c8dda8d Accept Merge Request #1350: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-24 17:59:43 +08:00
  • 84a37a970f 调拨入库消息推送 liaodanlong 2024-09-24 17:57:03 +08:00
  • 37cc02e97a Accept Merge Request #1349: (feature/销售和排程添加消息推送 -> develop) 管欢 2024-09-24 16:33:23 +08:00
  • 7a8753408b 连接跳转 guanhuan 2024-09-24 16:23:45 +08:00
  • eb853d0be9 Accept Merge Request #1345: (feature/前端样式修改 -> develop) 黄焱 2024-09-24 15:37:33 +08:00
  • 52438733d7 Accept Merge Request #1348: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-24 15:04:58 +08:00
  • b986dd8473 刀具组装与拆解信息推送 liaodanlong 2024-09-24 14:58:32 +08:00
  • 98fdb581fb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-24 13:57:01 +08:00
  • ea7380288c Accept Merge Request #1347: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-24 11:43:54 +08:00
  • 9beecab21d 修改任务下发逻辑 胡尧 2024-09-24 11:42:58 +08:00
  • 2e6932e054 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-24 11:39:33 +08:00
  • 5ca9e028d8 Accept Merge Request #1346: (feature/删除不要的模块 -> develop) 杨金灵 2024-09-24 11:19:11 +08:00
  • 64e2b71a34 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 hy 2024-09-24 11:15:10 +08:00
  • 8d52c94aed Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-24 11:15:04 +08:00
  • 9d91a1c99f 删除不要的模块 jinling.yang 2024-09-24 11:14:55 +08:00
  • d6fdeafef6 制造-刀具标准库界面样式显示有问题 hy 2024-09-24 11:14:08 +08:00
  • 371b3a9d65 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 guanhuan 2024-09-24 10:57:02 +08:00
  • 36c1c7b170 单已下发通知 guanhuan 2024-09-24 10:56:23 +08:00
  • 38d3a7901d 刀具组装与拆解信息推送 liaodanlong 2024-09-24 10:23:09 +08:00
  • 2223259d13 Accept Merge Request #1344: (feature/程序用刀校验优化 -> develop) 禹翔辉 2024-09-24 09:53:35 +08:00
  • aba270182d Merge branch 'feature/产品优化' into feature/程序用刀校验优化 yuxianghui 2024-09-24 09:51:42 +08:00
  • c9378fc9fe CAM用刀添加编程单号字段，优化CNC程序用刀校验缺刀生成的CAM用刀计划记录的判断条件，优化tree和form视图； yuxianghui 2024-09-24 09:50:44 +08:00
  • 378850682d 错误日志信息调整 liaodanlong 2024-09-23 17:50:25 +08:00
  • 02c35803da Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-23 17:47:30 +08:00
  • 75b60c1ec8 bom清单整体式刀具匹配条件修改 liaodanlong 2024-09-23 17:47:03 +08:00
  • 2cd4424ba1 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 guanhuan 2024-09-23 17:12:26 +08:00
  • d52f0aed6e 坯料发料提醒 guanhuan 2024-09-23 17:11:53 +08:00
  • d197fc5b9e 保留小数点后两位 liaodanlong 2024-09-23 16:58:58 +08:00
  • 34280fe24b 坯料发料提醒 guanhuan 2024-09-23 16:43:29 +08:00
  • fd88a37aec Accept Merge Request #1343: (feature/wechat_message -> develop) 胡尧 2024-09-23 16:38:19 +08:00