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

Commit Graph

  • 50b0204cc6 Accept Merge Request #817: (feature/制造代码优化 -> develop) 马广威 2024-02-21 11:33:18 +08:00
  • 72df0aa640 修复物流方式导致的分配工厂失败问题 mgw 2024-02-21 11:32:06 +08:00
  • 02bf6a6764 Accept Merge Request #816: (feature/制造代码优化 -> develop) 马广威 2024-02-20 20:17:50 +08:00
  • 64581abeb1 测试异常问题修复 mgw 2024-02-20 20:17:00 +08:00
  • 82f80f1d15 Accept Merge Request #815: (feature/制造代码优化 -> develop) 马广威 2024-02-20 17:40:01 +08:00
  • f324a9d471 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-02-20 17:37:52 +08:00
  • 6103bca698 货架货位对象拆分 mgw 2024-02-20 17:35:31 +08:00
  • 9a4477de8b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单 jinling.yang 2024-02-20 17:34:52 +08:00
  • 5646cc492e 1.快速订单新增特征识别路径字段 2.修复销售经理和销售总监看不到快速订单菜单 3.优化系统设置页面，新增特征识别路径展示，去掉重复的业务平台参数配置展示 4.快速订单去掉老版本的特征识别的代码及包，新增最新的特征识别方法 jinling.yang 2024-02-20 17:33:06 +08:00
  • d5c748db78 Accept Merge Request #814: (feature/序列号添加二维码 -> develop) 禹翔辉 2024-02-20 16:05:00 +08:00
  • 9c08021773 Merge branch 'feature/自动生成二维码' into feature/序列号添加二维码 yuxianghui 2024-02-20 16:01:52 +08:00
  • cf3ec1b6ae 1、序列号模型添加二维码字段，添加自动根据序列号名称生成二维码的功能，新增打印二维码功能； yuxianghui 2024-02-20 15:59:58 +08:00
  • df89f40a24 Accept Merge Request #813: (feature/功能刀具组装优化 -> develop) 禹翔辉 2024-02-20 14:51:18 +08:00
  • 5c24cec4f6 Merge branch 'feature/刀具物料查询模型重构' into feature/功能刀具组装优化 yuxianghui 2024-02-20 14:40:28 +08:00
  • 4379854b89 Accept Merge Request #812: (feature/删除库存部分代码 -> develop) 杨金灵 2024-02-20 14:39:18 +08:00
  • 3a076bbdd1 删除库存部分代码 jinling.yang 2024-02-20 14:37:50 +08:00
  • bb519b8ab8 1、序列号模型自动跟具序列号名称生成二维码（未完成） yuxianghui 2024-02-20 14:35:28 +08:00
  • de26109ccc Accept Merge Request #809: (feature/产品的加工参数的权限修复 -> develop) 杨金灵 2024-02-20 14:35:03 +08:00
  • 53e5aa2017 优化刀具组接口 yuxianghui 2024-02-20 14:32:13 +08:00
  • 0183a5ab2b 1、删除功能刀具组装模型的打印二维码按钮，隐藏组装单打印按钮；2、添加功能刀具组装时的rfid验重功能； yuxianghui 2024-02-20 14:27:43 +08:00
  • 54c5259ed9 Accept Merge Request #811: (feature/制造代码优化 -> develop) 马广威 2024-02-20 13:11:39 +08:00
  • efdde5aef0 分配序列号时增加二维码生成及编码打印 mgw 2024-02-20 13:09:25 +08:00
  • 584dd11c61 Accept Merge Request #810: (feature/制造代码优化 -> develop) 马广威 2024-02-19 17:25:00 +08:00
  • 635583826f 物流处bug修复 mgw 2024-02-19 17:23:57 +08:00
  • cbd7b561de 产品的加工参数的权限修复 jinling.yang 2024-02-19 17:07:42 +08:00
  • 9c080e0cb4 权限控制增补 mgw 2024-02-19 15:26:36 +08:00
  • 1c61a8ef1c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-02-19 14:36:13 +08:00
  • 07ed60e8a7 刀具管理权限优化 mgw 2024-02-19 14:35:51 +08:00
  • 7207d7eb36 Accept Merge Request #808: (feature/重构刀具物料查询 -> develop) 禹翔辉 2024-02-18 17:26:47 +08:00
  • 9ede024710 Merge branch 'feature/刀具物料查询模型重构' into feature/重构刀具物料查询 yuxianghui 2024-02-18 17:23:44 +08:00
  • cb8285d0ca 1、重构刀具物料查询模型；2、新增产品创建时产品类别为刀具时，创建刀具物料查询模型记录；3、新增序列号和刀具物料查询模型的关联字段，新增刀具物料是否可用状态字段；并在新增序列号记录时，如果关联的产品的产品类别为刀具时，对对应刀具物料查询记录进行关联； yuxianghui 2024-02-18 17:22:06 +08:00
  • 3e3f49f8aa Accept Merge Request #807: (feature/制造代码优化 -> develop) 马广威 2024-02-18 15:43:32 +08:00
  • 35cc1ce6dc Accept Merge Request #806: (feature/优化驾驶舱 -> develop) 禹翔辉 2024-02-18 10:32:36 +08:00
  • b4b70e3cf0 Merge branch 'feature/生产线驾驶舱优化' into feature/优化驾驶舱 yuxianghui 2024-02-18 10:28:40 +08:00
  • 39a2b1035a 优化生产线驾驶舱，将功能刀具组装中心的按键改成组装单的跳转按键 yuxianghui 2024-02-18 10:24:21 +08:00
  • b370e34dca Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-17 16:38:03 +08:00
  • a6b5a823b8 Merge branch 'feature/产品相关岗位权限的修复' into develop jinling.yang 2024-02-17 16:37:33 +08:00
  • 24bcec8646 Accept Merge Request #805: (feature/产品相关岗位权限的修复 -> develop) 杨金灵 2024-02-17 16:37:11 +08:00
  • 5a74c346a7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品相关岗位权限的修复 jinling.yang 2024-02-17 16:35:16 +08:00
  • 1c64ee9b90 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-17 16:34:50 +08:00
  • c867b3c7bc 产品相关岗位权限的修复 jinling.yang 2024-02-17 16:34:32 +08:00
  • a4413af2f3 优化排程单与制造订单生产线状态联动的问题 mgw 2024-02-17 15:35:40 +08:00
  • f726bbaef6 Accept Merge Request #804: (feature/刀具物料扫码录入验证 -> develop) 禹翔辉 2024-02-05 14:13:37 +08:00
  • 53ce27d623 Merge branch 'feature/功能刀具组装扫录入数据功能优化' into feature/刀具物料扫码录入验证 yuxianghui 2024-02-05 14:11:14 +08:00
  • b88e4af4e2 优化刀具物料扫码录入验证 yuxianghui 2024-02-05 14:09:06 +08:00
  • a12c81e60d Merge branch 'feature/修复同步刀具标准库相关接口' into develop jinling.yang 2024-02-05 11:05:56 +08:00
  • 13415dd771 Accept Merge Request #803: (feature/修复同步刀具标准库相关接口 -> develop) 杨金灵 2024-02-05 11:05:33 +08:00
  • 7ea6a78fbd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复同步刀具标准库相关接口 jinling.yang 2024-02-05 10:59:20 +08:00
  • d5aaa70013 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-05 10:59:03 +08:00
  • f05d0461c3 1.修复同步刀具标准库相关接口2.修复产品存档权限问题 jinling.yang 2024-02-05 10:57:57 +08:00
  • b525a45107 优化功能刀具组装的刀具物料验证 yuxianghui 2024-02-04 17:30:26 +08:00
  • 6ab0bf7b5d Accept Merge Request #802: (feature/制造代码优化 -> develop) 马广威 2024-02-04 17:25:29 +08:00
  • f1335e8252 Merge branch 'feature/修复产品权限问题' into develop jinling.yang 2024-02-04 16:57:44 +08:00
  • f0c8a82b43 控制oee对计划人员只读 mgw 2024-02-04 16:57:39 +08:00
  • f435fe3577 Accept Merge Request #801: (feature/修复产品权限问题 -> develop) 杨金灵 2024-02-04 16:56:05 +08:00
  • 9bae3a4e5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品权限问题 jinling.yang 2024-02-04 16:53:28 +08:00
  • e7808216ca Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-04 16:53:12 +08:00
  • e48c5e39ac 修复产品页面部分一对多字段的访问权限 jinling.yang 2024-02-04 16:52:57 +08:00
  • 0d2e043449 Accept Merge Request #799: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-04 16:07:25 +08:00
  • f2a822aeda Accept Merge Request #800: (feature/制造代码优化 -> develop) 马广威 2024-02-04 16:06:27 +08:00
  • 6cdc547da5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-04 15:57:16 +08:00
  • c11dc4f9c4 修改权限相关缺陷 qihao.gong@jikimo.com 2024-02-04 15:56:53 +08:00
  • f6c121771f 机企猫 隐藏项目模块修改接入（可隐藏导出、新建等项目） mgw 2024-02-04 15:32:25 +08:00
  • db77b0b3ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-04 14:26:23 +08:00
  • 9565927ba6 Merge branch 'feature/修改客户编辑权限' into develop jinling.yang 2024-02-04 14:25:33 +08:00
  • 18d8212c3f Accept Merge Request #798: (feature/修改客户编辑权限 -> develop) 杨金灵 2024-02-04 14:25:17 +08:00
  • 1ca5817379 客户页面优化编辑 jinling.yang 2024-02-04 14:22:53 +08:00
  • 0185a3bc2b 修复客户页面除销售员和采购员字段可编辑，其余不可编辑 jinling.yang 2024-02-02 17:27:08 +08:00
  • 0c4407ce8e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-02 15:59:13 +08:00
  • f11c88cf1b Merge branch 'feature/修复工件配送及权限' into develop jinling.yang 2024-02-02 15:59:00 +08:00
  • 7e025e7ca1 Accept Merge Request #797: (feature/修复工件配送及权限 -> develop) 杨金灵 2024-02-02 15:58:45 +08:00
  • 4da7114655 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送及权限 jinling.yang 2024-02-02 15:52:35 +08:00
  • e3bac55346 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-02 15:52:19 +08:00
  • 8c52c42074 1.修复来自业务平台的自动生产的采购单状态 2.修复所有同步cloud的数据 jinling.yang 2024-02-02 15:52:06 +08:00
  • ab9fcf97e0 1.修复工件配送扫描工件（坯料）时，同运工件显示的是坯料对应的制造订单号，修改配送时长字段类型及对应的时长方法，修复工件装夹岗不能修改配送工件 2.修复产品中计划总监岗和调度总监岗不能访问切削速度的权限 jinling.yang 2024-02-01 17:37:41 +08:00
  • f270f683de Accept Merge Request #796: (feature/功能刀具组装扫录入数据功能优化 -> develop) 禹翔辉 2024-02-01 17:11:10 +08:00
  • 8e806225d0 添加功能刀具组装时扫描录入刀具物料时进行物料是否已入库和是否已经使用的判断 yuxianghui 2024-02-01 17:07:19 +08:00
  • 56847c7a22 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-01 11:44:57 +08:00
  • 9973370fd6 Merge branch 'feature/优化工件配送列表' into develop jinling.yang 2024-02-01 11:44:39 +08:00
  • 3cb71a8017 Accept Merge Request #795: (feature/优化工件配送列表 -> develop) 杨金灵 2024-02-01 11:44:16 +08:00
  • cc72ddfad7 释放注释代码 jinling.yang 2024-02-01 11:35:08 +08:00
  • 527ab396ee 1.新增工件配送向导2.修复采购审核按钮不可见3.配置中新增agv路径字段4.优化工单上按钮显示条件 jinling.yang 2024-01-30 17:40:05 +08:00
  • 1c90c97b92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-30 11:55:38 +08:00
  • d70d3a9254 Merge branch 'feature/修改admin的访问权限' into develop jinling.yang 2024-01-30 11:55:03 +08:00
  • 2d4ae18e64 Accept Merge Request #794: (feature/修改admin的访问权限 -> develop) 杨金灵 2024-01-30 11:54:21 +08:00
  • 92850fe34f 采购页面新增审核状态字段 jinling.yang 2024-01-30 11:52:29 +08:00
  • 17bbe1414b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改admin的访问权限 jinling.yang 2024-01-30 11:43:56 +08:00
  • 7f56a75722 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-30 11:43:39 +08:00
  • 51a9b55782 修改admin在同步模型的访问权限 jinling.yang 2024-01-30 11:43:18 +08:00
  • addc68ed5a Accept Merge Request #793: (feature/制造代码优化 -> develop) 马广威 2024-01-30 09:49:25 +08:00
  • 5e9d541239 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-30 09:48:38 +08:00
  • 642a93c449 优化货位颜色及启用货位 mgw 2024-01-30 09:48:14 +08:00
  • ff7151399f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-30 09:45:28 +08:00
  • a67f45f9d5 Merge branch 'feature/新增工件装夹预调工单任务' into develop jinling.yang 2024-01-30 09:45:07 +08:00
  • 98ef86866a Accept Merge Request #791: (feature/新增工件装夹预调工单任务 -> develop) 杨金灵 2024-01-30 09:44:40 +08:00
  • f2c70fa167 Accept Merge Request #792: (feature/制造代码优化 -> develop) 马广威 2024-01-30 09:13:12 +08:00
  • 1c0187d55b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-30 09:12:27 +08:00
  • 04244dd17a 修复货位问题 mgw 2024-01-30 09:12:02 +08:00
  • da63b0b7ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 jinling.yang 2024-01-29 19:45:46 +08:00
  • a088ee9ed5 1.制造模块内配置下的所有模型增加管理员（admin）权限 2.工单上的工件配送优化验证及对应的页面上新增工件配送按钮 jinling.yang 2024-01-29 19:43:57 +08:00