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

Commit Graph

  • 366e816268 1、优化货位变更接口、优化同步库存信息接口；2、隐藏已取消状态的销售订单的【确认接单】和【取消】按钮；3、处理功能刀具从线边刀库到刀具房没有生成移动历史问题； yuxianghui 2024-08-15 16:45:39 +08:00
  • 1532184008 Merge branch 'feature/agv_dispatch' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/agv_dispatch 胡尧 2024-08-15 15:02:16 +08:00
  • 9f180e307d agv调度开发 胡尧 2024-08-15 15:02:13 +08:00
  • f0a4cf1d0f 弹窗取消聚焦 hy 2024-08-15 15:01:10 +08:00
  • 6c734eead4 agv调度开发 胡尧 2024-08-15 11:34:38 +08:00
  • f7e4ce416a AGV任务调度开发 胡尧 2024-08-14 17:34:50 +08:00
  • 5a60eed5b1 联调加工订单从待确认到加工中，经过的内部管理系统，bfm,sf接口测试联调，修改对应接收的参数值改变。采购订单加工中同步到内部管理系统失败，则新增到同步表，由同步表定时发起接口重试 hujiaying 2024-08-14 12:48:40 +08:00
  • bf34de58fc 1、优化功能刀具预警记录跳转功能刀具拆解单链接方法；2、优化功能刀具预警界面及搜索等方法；3、优化拆解单功能及界面；4、处理功能刀具组装时，刀柄状态不实时变更问题 yuxianghui 2024-08-13 17:30:19 +08:00
  • cccc2f8493 优化报废 jinling.yang 2024-08-12 17:30:53 +08:00
  • 894d3b9ea3 1、功能刀具拆解单添加功能刀具唯一校验；2、功能刀具模型tree视图的状态字段根据不同状态添加不同颜色；当功能刀具状态为报警时，自动创建拆解单和预警记录，并添加拆解单链接按钮；添加tree视图按状态排序，将报警状态刀具记录显示在最前面；3、优化功能刀具预警模型字段及关联关系，添加预警记录跳转到对应由该功能刀具生成的拆解单链接； yuxianghui 2024-08-12 17:25:56 +08:00
  • 0b85f29262 修改agv调度 胡尧 2024-08-12 11:08:04 +08:00
  • 9dbea66b73 修改AGV调度系统 胡尧 2024-08-09 17:32:46 +08:00
  • 9a7ac4dfa6 优化制造订单报废向导 jinling.yang 2024-08-09 17:26:57 +08:00
  • e6ca4c27ac 1、库位变更接口、库位信息接口优化；2、功能刀具预警模型优化； yuxianghui 2024-08-09 17:19:03 +08:00
  • a8560a0684 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废 jinling.yang 2024-08-09 15:45:11 +08:00
  • 4f74996f24 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-09 15:44:48 +08:00
  • 5b26abc203 Merge branch 'feature/优化表面工艺外协' into develop jinling.yang 2024-08-09 15:43:52 +08:00
  • 49654f1ff6 Accept Merge Request #1218: (feature/优化表面工艺外协 -> develop) 杨金灵 2024-08-09 15:43:33 +08:00
  • a9b7f99944 修复表面工艺外协 jinling.yang 2024-08-09 15:39:58 +08:00
  • 34e858ffe4 添加表面工艺服务产品验证 jinling.yang 2024-08-09 11:31:30 +08:00
  • 41efe81119 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协 jinling.yang 2024-08-09 10:43:34 +08:00
  • 7cab8cd287 调拨单新增表面工艺参数字段 jinling.yang 2024-08-09 10:42:59 +08:00
  • 5f9c5961a5 报废 jinling.yang 2024-08-09 10:39:48 +08:00
  • a79500d0ad 增加agv调度系统 胡尧 2024-08-08 17:47:03 +08:00
  • 4399700c3d 优化报废向导 jinling.yang 2024-08-08 17:24:41 +08:00
  • 36fd17b6c7 1、处理 智能工厂，销售角色与采购角色权限更新 需求 yuxianghui 2024-08-08 17:03:36 +08:00
  • 9d52466f61 Accept Merge Request #1217: (feature/修复表面工艺外协采购 -> develop) 杨金灵 2024-08-08 16:24:06 +08:00
  • 112efccb7c 修复表面工艺外协采购 jinling.yang 2024-08-08 16:21:15 +08:00
  • 45b9177da4 优化工单 jinling.yang 2024-08-08 16:09:00 +08:00
  • 745658eff2 1.制造订单添加报废状态， 2.返工操作制造订单添加过滤条件：状态为报废 3.cnc工单完成检测结果添加报废 jinling.yang 2024-08-08 15:40:29 +08:00
  • ce8b0127b8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-08-08 15:08:17 +08:00
  • f58fb2ea13 Merge branch 'feature/优化表面工艺' into develop jinling.yang 2024-08-08 15:08:08 +08:00
  • d333621c7a Accept Merge Request #1216: (feature/优化表面工艺 -> develop) 杨金灵 2024-08-08 15:07:37 +08:00
  • 563023fa3c 中控接口身份验证放开 jinling.yang 2024-08-08 15:07:22 +08:00
  • 3d2c7425c4 还原代码 jinling.yang 2024-08-08 15:03:45 +08:00
  • aaa19b96fd 还原注释代码 jinling.yang 2024-08-08 14:57:55 +08:00
  • 5d8f0f83b2 增加AGV调度功能，工单页面增加自定义筛选字段 胡尧 2024-08-07 17:44:43 +08:00
  • 1547a6064f 优化表面工艺 jinling.yang 2024-08-07 17:30:29 +08:00
  • 55b2daa0a3 Accept Merge Request #1215: (feature/销售单优化 -> develop) 禹翔辉 2024-08-07 17:13:57 +08:00
  • d469c09f15 Merge branch 'feature/制造订单优化' into feature/销售单优化 yuxianghui 2024-08-07 17:11:57 +08:00
  • a03cb31b29 1、处理 SF销售单需求优化 需求 yuxianghui 2024-08-07 17:11:12 +08:00
  • d2b20761b5 Accept Merge Request #1214: (feature/tax_sync -> develop) 廖丹龙 2024-08-07 09:49:20 +08:00
  • 0f47b4b8c3 bom原材料查询限制只拿一条 liaodanlong 2024-08-07 09:44:04 +08:00
  • 0cfb16b9d9 Merge remote-tracking branch 'origin/develop' into develop liaodanlong 2024-08-06 09:09:59 +08:00
  • 8ec5e05739 Accept Merge Request #1213: (feature/tax_sync -> develop) 廖丹龙 2024-08-06 09:09:37 +08:00
  • 5393ef686a 优化表面工艺 jinling.yang 2024-08-05 17:28:48 +08:00
  • e92c9675b6 1、 处理 内部调拨单，在选择目标货位时，隐藏带循环货位标签的货位不进行展示 yuxianghui 2024-08-05 17:18:54 +08:00
  • e6bad80031 Merge branch 'refs/heads/feature/tax_sync' into develop liaodanlong 2024-08-05 17:12:37 +08:00
  • 070890e3b6 解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG yuxianghui 2024-08-05 16:26:54 +08:00
  • 6e50774b23 调整机床列表接口位置；增加机床品牌型号返回 mgw 2024-08-05 16:23:27 +08:00
  • fc18d34495 增加大屏用获取cnc机床列表接口 mgw 2024-08-05 16:04:53 +08:00
  • ed0d57c364 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺 jinling.yang 2024-08-02 14:41:42 +08:00
  • 3f27ae0f35 Accept Merge Request #1212: (feature/bug优化 -> develop) 禹翔辉 2024-08-02 11:22:06 +08:00
  • cec426920b Merge branch 'feature/优化工单状态' into feature/bug优化 yuxianghui 2024-08-02 11:19:45 +08:00
  • 09a6255d9c 去掉无用文件夹及未用po mgw 2024-08-02 09:57:52 +08:00
  • d187bb2bba Accept Merge Request #1211: (release/release_2.2 -> master) 马广威 2024-08-01 21:58:11 +08:00
  • 0a6cf74bc2 Accept Merge Request #1210: (feature/去掉工单输出 -> develop) release/release_2.2 杨金灵 2024-08-01 16:41:49 +08:00
  • c0202330f8 去掉工单输出 jinling.yang 2024-08-01 16:40:46 +08:00
  • 1dabdd157e Accept Merge Request #1209: (feature/注释及还原代码 -> develop) 杨金灵 2024-08-01 15:20:54 +08:00
  • 36dc8070fa 注释及还原代码 jinling.yang 2024-08-01 15:18:57 +08:00
  • a5da18bbc7 1、修改夹具重量单位为kg yuxianghui 2024-08-01 11:34:20 +08:00
  • 510e8d49fb 功能刀具拆解失败问题 liaodanlong 2024-08-01 10:46:14 +08:00
  • 051273017d Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync liaodanlong 2024-08-01 10:45:09 +08:00
  • f49557090a 1、优化刀具拆解单拆解时生成的调拨单单据验证出现数据缺失问题 yuxianghui 2024-08-01 10:40:25 +08:00
  • d1656278ea Accept Merge Request #1208: (feature/优化制造订单列表 -> develop) 杨金灵 2024-07-31 17:02:05 +08:00
  • 0675937588 优化制造订单列表 jinling.yang 2024-07-31 17:00:14 +08:00
  • c0d006d139 Accept Merge Request #1207: (feature/优化工单状态 -> develop) 马广威 2024-07-31 15:07:51 +08:00
  • 2fa47eae27 1 yuxianghui 2024-07-31 15:06:55 +08:00
  • cb2e1ecabe 1 yuxianghui 2024-07-31 15:06:14 +08:00
  • 9f1233d20e 1 yuxianghui 2024-07-31 15:04:37 +08:00
  • a783f7ec7b Accept Merge Request #1206: (feature/优化工单状态 -> develop) 禹翔辉 2024-07-31 15:02:31 +08:00
  • db50253100 Merge branch 'feature/优化工单_6' into feature/优化工单状态 yuxianghui 2024-07-31 15:00:48 +08:00
  • 5f7f905540 优化工单状态 yuxianghui 2024-07-31 14:59:57 +08:00
  • 1c86cc1421 Accept Merge Request #1205: (feature/优化ftp（pdf路径） -> develop) 杨金灵 2024-07-31 14:56:14 +08:00
  • 1ea6f649f0 优化ftp（pdf路径） jinling.yang 2024-07-31 14:54:15 +08:00
  • 115a3e0712 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync liaodanlong 2024-07-31 14:41:02 +08:00
  • f0421b873c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-31 11:55:55 +08:00
  • 913feea2a9 Merge branch 'feature/优化三次元检测报告' into develop jinling.yang 2024-07-31 11:55:46 +08:00
  • 5d36513e59 Accept Merge Request #1204: (feature/优化三次元检测报告 -> develop) 杨金灵 2024-07-31 11:54:40 +08:00
  • 94d6085f92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-31 11:51:31 +08:00
  • f361106c40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化三次元检测报告 jinling.yang 2024-07-31 11:51:16 +08:00
  • a46cd0f515 优化三次元检测报告 jinling.yang 2024-07-31 11:51:04 +08:00
  • 2c6e1a40f5 Accept Merge Request #1203: (feature/优化工单_6 -> develop) 禹翔辉 2024-07-31 11:49:10 +08:00
  • ffb775abb7 1、优化工单状态 yuxianghui 2024-07-31 11:45:59 +08:00
  • 2c15532c73 Merge branch 'feature/优化调拨单' into feature/优化工单_6 yuxianghui 2024-07-31 11:02:24 +08:00
  • 1980ee2a9a 优化三次元检测报告 jinling.yang 2024-07-31 10:59:35 +08:00
  • bba4e55770 1、刀具组装功能添加开始完成日志；2、库存概览看板按作业类型分组默认优化展示。 yuxianghui 2024-07-31 10:40:03 +08:00
  • a9bbe98e8f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-31 09:07:50 +08:00
  • 11e3bbddd8 Accept Merge Request #1202: (feature/修复返工-功能刀具 -> develop) 马广威 2024-07-30 17:47:59 +08:00
  • c01dfddfb4 修复返工-功能刀具 jinling.yang 2024-07-30 17:45:41 +08:00
  • 50dcc9f7ba Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new jinling.yang 2024-07-30 14:37:19 +08:00
  • 41a7aea01e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-30 14:37:07 +08:00
  • 066b256b0c Accept Merge Request #1201: (feature/优化制造功能 -> develop) 马广威 2024-07-30 11:09:20 +08:00
  • 754047bf02 同步修改引用位置 mgw 2024-07-30 11:08:27 +08:00
  • f5bf95ab6e Accept Merge Request #1200: (feature/优化调拨单 -> develop) 禹翔辉 2024-07-30 10:55:53 +08:00
  • 5ea25fae73 Merge branch 'feature/修复工单bug' into feature/优化调拨单 yuxianghui 2024-07-30 10:54:13 +08:00
  • c367e39d5f 修复当有功能刀具组装或拆解生成调拨单单据后，销售订单创建制造订单时报调拨单单号重复问题 yuxianghui 2024-07-30 10:53:25 +08:00
  • dfec70081b Accept Merge Request #1199: (feature/优化制造功能 -> develop) 马广威 2024-07-30 10:34:03 +08:00
  • d0c35695d5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-30 10:33:19 +08:00
  • 95eb6bd18b 修改制造订单状态翻译、修改配置字段类型 mgw 2024-07-30 10:33:03 +08:00