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

Commit Graph

  • e7de773f28 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-24 17:31:52 +08:00
  • 4098dda5b8 修改设备日志列表展示 qihao.gong@jikimo.com 2023-10-24 17:31:42 +08:00
  • 2c67f7a286 Accept Merge Request #495: (feature/功能刀具组装和产品优化 -> develop) Merge Request: 1、优化产品模块下夹具类别下的零点托盘参数显示；2、调整功能刀具组装单的刀具物料字段布局。 禹翔辉 2023-10-24 17:12:28 +08:00
  • a953ca189e 1、优化产品模块下夹具类别下的零点托盘参数显示；2、调整功能刀具组装单的刀具物料字段布局。 JIKIMO-YXH\xianghui 2023-10-24 17:11:37 +08:00
  • 0a09c54690 Accept Merge Request #494: (feature/修复快速订单 -> develop) Merge Request: 修复销售方法的传参 杨金灵 2023-10-24 14:56:30 +08:00
  • 076c4a2bcb 修复销售方法的传参 jinling.yang 2023-10-24 14:55:45 +08:00
  • 0e2cbf06ca Accept Merge Request #493: (feature/修复创建销售订单 -> develop) Merge Request: 修复创建销售 杨金灵 2023-10-24 14:45:16 +08:00
  • 575c856f27 修复创建销售 jinling.yang 2023-10-24 14:43:11 +08:00
  • 103b00a635 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-24 14:39:45 +08:00
  • 38c77e7fbb 新增选择刀具规格基本参数 jinling.yang 2023-10-24 14:38:35 +08:00
  • 272ab8daa0 Accept Merge Request #492: (feature/添加日志 -> develop) Merge Request: 添加日志输出· 杨金灵 2023-10-24 11:24:26 +08:00
  • acff814e9b 添加注释 jinling.yang 2023-10-24 11:23:29 +08:00
  • 1bc3f756fe 新增按钮 jinling.yang 2023-10-24 11:18:33 +08:00
  • 99ea796f2e Accept Merge Request #491: (feature/快速订单 -> develop) Merge Request: 快速订单代码还原 杨金灵 2023-10-24 10:30:06 +08:00
  • 4ef82ee7cf 代码还原 jinling.yang 2023-10-24 10:29:10 +08:00
  • 4bed65d1df Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-24 09:59:11 +08:00
  • 2b9e768793 Accept Merge Request #490: (feature/注释自动报价 -> develop) Merge Request: 注释自动报价 杨金灵 2023-10-24 09:52:50 +08:00
  • f4a878ced9 注释自动报价 jinling.yang 2023-10-24 09:51:31 +08:00
  • 093724a277 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-24 09:45:35 +08:00
  • 8346f40b79 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-24 09:41:43 +08:00
  • a9ba65ec17 去除输入框居中的样式 qihao.gong@jikimo.com 2023-10-24 09:41:28 +08:00
  • 8f29696b64 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-10-24 09:41:23 +08:00
  • 2d32419a7d 修改计算方法 jinling.yang 2023-10-24 09:41:05 +08:00
  • 2c636c5e64 Accept Merge Request #489: (feature/功能刀具组装优化 -> develop) Merge Request: 1、完成刀具组装单扫描绑定刀具物料的功能；2、完成刀具组装单刀具物料绑定库存的刀具物料序列号 禹翔辉 2023-10-23 17:38:16 +08:00
  • 270338868b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化 yuxianghui 2023-10-23 17:36:44 +08:00
  • 845d606b36 完成刀具组装单扫描绑定刀具物料的功能 yuxianghui 2023-10-23 17:36:27 +08:00
  • 919a200750 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-10-23 17:36:15 +08:00
  • ad11f2ea63 Merge branch 'feature/注释自动报价方法' into develop jinling.yang 2023-10-23 14:32:54 +08:00
  • a414f7cd25 Accept Merge Request #487: (feature/注释自动报价方法 -> develop) Merge Request: 注释代码 杨金灵 2023-10-23 14:32:34 +08:00
  • 2a8558f5a2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/注释自动报价方法 jinling.yang 2023-10-23 14:31:23 +08:00
  • 13555d91e2 注释上色代码 jinling.yang 2023-10-23 14:30:46 +08:00
  • 5ccc186bd1 Accept Merge Request #486: (feature/注释自动报价方法 -> develop) Merge Request: 注释自动报价方法 杨金灵 2023-10-23 11:38:37 +08:00
  • 27259fb8f7 注释自动报价方法 jinling.yang 2023-10-23 11:34:56 +08:00
  • b733c4168f Accept Merge Request #485: (feature/自动报价代码释放 -> develop) Merge Request: 自动报价代码释放 杨金灵 2023-10-23 10:01:19 +08:00
  • 1e243e4500 代码释放 jinling.yang 2023-10-23 09:59:25 +08:00
  • ef2e84e411 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化 yuxianghui 2023-10-23 09:44:06 +08:00
  • 4f644b1e25 Accept Merge Request #484: (feature/制造-计划优化 -> develop) Merge Request: 解决sequence bug，增加“丢弃”二次确认模态框 马广威 2023-10-23 00:21:50 +08:00
  • a5cb2dc93b Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化 马广威 2023-10-23 00:21:20 +08:00
  • 749473f9dc form视图的丢弃按钮增加二次确认功能 mgw 2023-10-23 00:17:05 +08:00
  • dc8aecba93 产品新增刀具规格向导 jinling.yang 2023-10-20 18:41:58 +08:00
  • 2b7f4c3f06 看板样式修改 feature/sf看板样式统一 WEB许何哲\xuhez 2023-10-20 17:18:46 +08:00
  • 26de811174 看板样式修改 WEB许何哲\xuhez 2023-10-20 16:33:00 +08:00
  • d023848c70 Merge branch 'develop' into feature/sf看板样式统一 WEB许何哲\xuhez 2023-10-20 16:31:40 +08:00
  • a109c0fb39 看板样式修改 WEB许何哲\xuhez 2023-10-20 16:29:57 +08:00
  • 587e2a4e3e 修复sequence导致字段值移动位置的bug mgw 2023-10-20 10:50:35 +08:00
  • d83255cc67 优化同步刀具标准库接口（包含全部合并每日） jinling.yang 2023-10-19 17:23:53 +08:00
  • 14edbd85f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-19 10:53:03 +08:00
  • e7df6c14b1 同步刀具标准库 jinling.yang 2023-10-19 10:49:54 +08:00
  • e2c13a8194 1、功能刀具组装组装功能对象的六个刀具物料对象的序列号绑定库存的刀具物料序列号，2、优化功能刀具组装和功能刀具组装组装弹窗的刀具物料布局 yuxianghui 2023-10-18 17:34:19 +08:00
  • 9b5a0162ff Accept Merge Request #483: (feature/修改机床参数bug -> develop) Merge Request: 设备其他table增加参数 龚启豪 2023-10-17 15:11:40 +08:00
  • a57cdbe2f3 设备其他table增加参数 qihao.gong@jikimo.com 2023-10-17 15:10:25 +08:00
  • d02e0cf455 Accept Merge Request #482: (feature/修改机床参数bug -> develop) Merge Request: 修改设备table布局 龚启豪 2023-10-16 17:24:17 +08:00
  • e3bdf9409f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-16 17:23:21 +08:00
  • 93a6b4ccb4 修改设备table布局 qihao.gong@jikimo.com 2023-10-16 17:23:04 +08:00
  • d532ff8c05 Accept Merge Request #481: (feature/修改机床参数bug -> develop) Merge Request: 修改设备table布局 龚启豪 2023-10-16 17:12:28 +08:00
  • 0f15814916 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-16 17:11:37 +08:00
  • f02d1a0ace 修改设备table布局 qihao.gong@jikimo.com 2023-10-16 17:11:24 +08:00
  • cbc298f6ad Accept Merge Request #480: (feature/制造-计划优化 -> develop) Merge Request: tree视图记录左侧增加序号展示记录数 马广威 2023-10-16 15:19:08 +08:00
  • e02ab7fd95 tree视图记录左侧增加序号展示记录数 mgw 2023-10-16 15:18:18 +08:00
  • 9acdcc0429 新增同步cloud的刀具标准库接口 jinling.yang 2023-10-13 17:29:34 +08:00
  • dbbddfadab Accept Merge Request #479: (feature/修改机床参数bug -> develop) Merge Request: 修改设备table格式布局 龚启豪 2023-10-13 16:43:45 +08:00
  • 1f090fdd20 修改设备table格式布局 qihao.gong@jikimo.com 2023-10-13 16:42:16 +08:00
  • 0b72c59335 Accept Merge Request #415: (feature/修改机床参数bug -> develop) Merge Request: 修改机床注册接口 龚启豪 2023-10-13 14:28:06 +08:00
  • 7c6dd76464 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-13 14:26:49 +08:00
  • 01ad3e7d8c 修改机床注册接口 qihao.gong@jikimo.com 2023-10-13 14:26:38 +08:00
  • 53f7f75795 Accept Merge Request #414: (feature/修改机床参数bug -> develop) Merge Request: 设备过滤能力特征库只关联加工能力 龚启豪 2023-10-12 14:50:13 +08:00
  • a80ab33c50 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-12 14:49:41 +08:00
  • 3bd5c7efb3 设备过滤能力特征库只关联加工能力 qihao.gong@jikimo.com 2023-10-12 14:49:25 +08:00
  • aa2e9e8c1f Accept Merge Request #413: (feature/修改机床参数bug -> develop) Merge Request: 修改设备table的样式 修改关联品牌根据各不同类别展示 龚启豪 2023-10-12 14:11:26 +08:00
  • 8db9ed68c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-12 14:10:47 +08:00
  • 53e307cd55 修改设备table的样式 修改关联品牌根据各不同类别展示 qihao.gong@jikimo.com 2023-10-12 14:10:29 +08:00
  • c04e138d6b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-11 17:41:19 +08:00
  • 296efcc395 新增调取cloud的刀具标准库接口 jinling.yang 2023-10-11 17:39:46 +08:00
  • e4fb6edb05 Accept Merge Request #412: (feature/修改机床参数bug -> develop) Merge Request: 处理同步报错bug 龚启豪 2023-10-11 15:42:52 +08:00
  • 6724d0e0c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-11 15:42:06 +08:00
  • e505285a91 处理同步报错bug qihao.gong@jikimo.com 2023-10-11 15:41:55 +08:00
  • 2ecc130fd1 Accept Merge Request #411: (feature/修改机床参数bug -> develop) Merge Request: 设备参数根据不同类别修改必填项, 新增刀具库位table 龚启豪 2023-10-11 14:57:29 +08:00
  • ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-11 14:56:18 +08:00
  • b1d2cd1ceb 设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成 qihao.gong@jikimo.com 2023-10-11 14:45:35 +08:00
  • 0752ba9d2d Accept Merge Request #410: (feature/刀具产品调取Cloud刀具标准库 -> develop) Merge Request: 优化能力特征库 杨金灵 2023-10-10 17:27:39 +08:00
  • 6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 2.新增能力特征库的接口 jinling.yang 2023-10-10 17:19:11 +08:00
  • b9d6e0ea35 材料型号同步接口修改 新增国际标准和材料应用 qihao.gong@jikimo.com 2023-10-09 17:35:39 +08:00
  • 8f4eff6d1c Accept Merge Request #409: (feature/bug修复 -> develop) Merge Request: 同步cloud资源库静态资源Bug修复及代码优化 杨金灵 2023-10-09 15:23:57 +08:00
  • 708889b1ed 去掉不要的代码及刀具型号的定时器 jinling.yang 2023-10-09 15:21:41 +08:00
  • 59514cc433 去掉刀具型号的同步方法 jinling.yang 2023-10-09 15:15:52 +08:00
  • ea3dbb290f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-08 17:28:09 +08:00
  • 30cebea5a1 修改材料型号参数类型 qihao.gong@jikimo.com 2023-10-08 17:27:51 +08:00
  • e586ed8e3b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-10-08 17:19:22 +08:00
  • 7551bf38ef 销售模块新增依赖引用 jinling.yang 2023-10-08 17:19:02 +08:00
  • 34beb03a6a Accept Merge Request #408: (feature/修改机床参数bug -> develop) Merge Request: 新增设备AGV小车，机器人，检测设备参数 龚启豪 2023-10-08 09:11:39 +08:00
  • af05d3ec30 设备增加AGV小车,机械臂,检测设备参数 qihao.gong@jikimo.com 2023-10-07 17:26:09 +08:00
  • ac6315c76a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-28 16:20:24 +08:00
  • 960bea5bb0 设备新增参数 AGV小车table页 qihao.gong@jikimo.com 2023-09-28 16:20:03 +08:00
  • 69bae5b853 Accept Merge Request #407: (feature/修改机床参数bug -> develop) Merge Request: 故障日志bug 龚启豪 2023-09-27 14:33:03 +08:00
  • 6b375ee64d 修改故障日志bug qihao.gong@jikimo.com 2023-09-27 14:30:38 +08:00
  • 84b211911f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-26 17:29:37 +08:00
  • 22a4ccad6b 修改维保生成编码和名称的规则 qihao.gong@jikimo.com 2023-09-26 17:29:14 +08:00
  • f6fd70bb51 Accept Merge Request #406: (feature/制造-计划优化 -> develop) Merge Request: 测试背景图片在线上展示 马广威 2023-09-26 14:55:05 +08:00
  • 9c5900e4fe 测试背景图片在线上展示 mgw 2023-09-26 14:54:13 +08:00
  • 51f4c1787f Accept Merge Request #405: (feature/制造-计划优化 -> develop) Merge Request: 调整菜单顺序等，优化gantt显示 马广威 2023-09-26 14:26:29 +08:00