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

Commit Graph

  • cf7e6ea33d 隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。 yuxianghui 2023-09-11 17:21:32 +08:00
  • 49d41539b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-09-08 17:28:58 +08:00
  • 0d40171f13 Merge branch 'feature/刀柄和夹头反注册到Cloud生成动态刀具物料' into develop jinling.yang 2023-09-08 17:28:41 +08:00
  • e919858e63 Accept Merge Request #375: (feature/刀柄和夹头反注册到Cloud生成动态刀具物料 -> develop) Merge Request: 整体式刀具，刀柄和夹头反注册到Cloud生成动态刀具物料 杨金灵 2023-09-08 17:28:21 +08:00
  • c1be9a90fe 采购刀具产品反注册接口新增图片字段，3d模型代码放开 jinling.yang 2023-09-08 17:14:57 +08:00
  • 26db256336 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 jinling.yang 2023-09-08 17:06:02 +08:00
  • aa17de3384 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 jinling.yang 2023-09-08 17:05:44 +08:00
  • 9cbc1428e9 Accept Merge Request #374: (feature/sf品牌页面表格样式的修改 -> develop) Merge Request: many2many图文展示及点击交互效果 许何哲 2023-09-08 16:34:56 +08:00
  • 857a26231d Merge branch 'develop' into feature/sf品牌页面表格样式的修改 WEB许何哲\xuhez 2023-09-08 16:32:19 +08:00
  • b76c192f33 many2many图文展示及点击交互效果 WEB许何哲\xuhez 2023-09-08 16:31:06 +08:00
  • e50f0c4465 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 jinling.yang 2023-09-08 14:10:48 +08:00
  • 41641f69fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 jinling.yang 2023-09-08 14:08:08 +08:00
  • 5802c55ab3 Accept Merge Request #373: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 放开OCC相关的代码 禹翔辉 2023-09-08 10:41:09 +08:00
  • b12880da50 放开OCC相关的代码 yuxianghui 2023-09-08 10:39:47 +08:00
  • a23fe9942d Accept Merge Request #372: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 禹翔辉 2023-09-08 10:25:41 +08:00
  • 5e9b376721 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 yuxianghui 2023-09-08 10:23:01 +08:00
  • 35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； yuxianghui 2023-09-08 10:20:52 +08:00
  • 00dd03bb2c Accept Merge Request #371: (feature/参考web模块将widget统一管理 -> develop) Merge Request: custom_many2many widget整合到前端包中 马广威 2023-09-07 17:57:49 +08:00
  • 121217d70f custom_many2many widget整合到前端包中 mgw 2023-09-07 17:54:07 +08:00
  • 3225916629 1.优化产品页面： ①“产品类别”字段放在开票策略后面；“内部编码”和“条码”字段放在产品标签后面；当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面； ②当“产品类别”为“刀具”时，且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时，页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示 2.采购产品时，产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时，在收货单进行验证操作时，优化实时注册到Cloud的动态资源里的工厂刀具物料的接口 3.优化“产品模板"模型的部分字段 jinling.yang 2023-09-07 17:46:22 +08:00
  • 75fabfb63d Accept Merge Request #370: (feature/生产排程 -> develop) Merge Request: 调整“程序下载”按钮位置，更新本地代码 马广威 2023-09-07 17:02:51 +08:00
  • 255786325b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 mgw 2023-09-07 15:38:28 +08:00
  • 797a7207e9 调整“程序下载”按钮位置 mgw 2023-09-07 15:32:15 +08:00
  • f49f63a32a Accept Merge Request #369: (feature/生产排程 -> develop) Merge Request: 实现Many2many的图文展示，并增加图片方法功能 马广威 2023-09-07 15:17:22 +08:00
  • e0bfea40e1 增加点击图片放大图片的功能 mgw 2023-09-07 15:16:03 +08:00
  • 78e3a0f24f 自定义widget显示many2many图文基本实现 mgw 2023-09-07 12:33:35 +08:00
  • 408a5c72c8 Accept Merge Request #368: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 禹翔辉 2023-09-07 09:35:35 +08:00
  • ae3f7c9c0c 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 yuxianghui 2023-09-06 17:24:08 +08:00
  • 093badd3a7 Accept Merge Request #367: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 禹翔辉 2023-09-06 16:49:08 +08:00
  • 9331a22a10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 yuxianghui 2023-09-06 16:48:43 +08:00
  • 5353630975 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 yuxianghui 2023-09-06 16:48:07 +08:00
  • ecc9bd446f 材料等同步Bug修复 jinling.yang 2023-09-06 16:32:25 +08:00
  • 1983271a9b Accept Merge Request #366: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 禹翔辉 2023-09-06 11:11:55 +08:00
  • 0b8042f07a 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 yuxianghui 2023-09-06 11:02:55 +08:00
  • 1f5cabad1a Accept Merge Request #365: (feature/生产排程 -> develop) Merge Request: 生产计划优化 马广威 2023-09-06 09:23:50 +08:00
  • 48e30865af 生产计划优化 mgw 2023-09-06 09:22:58 +08:00
  • fe78d91fa9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 yuxianghui 2023-09-06 09:12:11 +08:00
  • 4ac95c20ad Accept Merge Request #364: (feature/sf品牌页面表格样式的修改 -> develop) Merge Request: 对sf样式进行集中管理 许何哲 2023-09-05 17:24:19 +08:00
  • 4a712ff9f1 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 WEB许何哲\xuhez 2023-09-05 17:22:58 +08:00
  • f8c5553837 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 yuxianghui 2023-09-05 17:22:45 +08:00
  • 7ea997219b 对sf的css样式进行集中管理 WEB许何哲\xuhez 2023-09-05 17:22:37 +08:00
  • a6ddfa22a1 对产品的整体式刀具能力参数进行补充，对参数字段进行优化；对刀具物料查询的字段类型进行调整。 yuxianghui 2023-09-05 17:21:39 +08:00
  • b6a071d33a Accept Merge Request #363: (feature/sf品牌页面表格样式的修改 -> develop) Merge Request: 修改tree视图样式bug 许何哲 2023-09-05 16:46:42 +08:00
  • 26f07a00c3 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 WEB许何哲\xuhez 2023-09-05 16:45:32 +08:00
  • b47dbe29c0 修改tree视图样式bug WEB许何哲\xuhez 2023-09-05 16:44:42 +08:00
  • dbeb975cf6 Accept Merge Request #362: (feature/生产排程 -> develop) Merge Request: 创建制造订单时同步创建排程单 马广威 2023-09-05 10:41:22 +08:00
  • e5213d06ae 创建制造订单时同步创建排程单 mgw 2023-09-05 10:40:25 +08:00
  • a0affba407 Accept Merge Request #361: (feature/生产排程 -> develop) Merge Request: 基本排程功能合并 马广威 2023-09-05 09:33:01 +08:00
  • 940d2cead8 Accept Merge Request #360: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。 禹翔辉 2023-09-04 17:38:39 +08:00
  • c8129478d5 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。 yuxianghui 2023-09-04 17:29:20 +08:00
  • 4342a2a175 Accept Merge Request #359: (feature/整体式刀具能力参数补充 -> develop) Merge Request: 整体式刀具基本参数补充，float类型字段增加非零验证，增加相关字段必填属性。 禹翔辉 2023-09-01 17:18:50 +08:00
  • 19f19d5fd0 整体式刀具基本参数补充，float类型字段增加非零验证，增加相关字段必填属性。 yuxianghui 2023-09-01 17:17:56 +08:00
  • 18259c73a2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-01 16:57:24 +08:00
  • 32b773c486 设备新增图文展示table qihao.gong@jikimo.com 2023-09-01 16:57:04 +08:00
  • 699728963c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-31 17:39:15 +08:00
  • d66d320e7d Merge branch 'feature/快速订单Bug修复' into develop jinling.yang 2023-08-31 17:38:55 +08:00
  • c56be1641e Accept Merge Request #358: (feature/快速订单Bug修复 -> develop) Merge Request: 快速订单Bug修复 杨金灵 2023-08-31 17:38:39 +08:00
  • 7351ea675b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复 jinling.yang 2023-08-31 17:37:27 +08:00
  • e51fc8a68e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-31 17:36:59 +08:00
  • 4ec6e7c7a4 Merge branch 'feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复' into develop jinling.yang 2023-08-31 17:36:44 +08:00
  • 44872d4c9f Accept Merge Request #357: (feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 -> develop) Merge Request: 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 杨金灵 2023-08-31 17:36:32 +08:00
  • 8bf726382d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 jinling.yang 2023-08-31 17:35:05 +08:00
  • d07098bae1 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 jinling.yang 2023-08-31 17:32:42 +08:00
  • c575ea51cd Accept Merge Request #356: (feature/sf品牌页面表格样式的修改 -> develop) Merge Request: sf品牌页面表格的样式修改 许何哲 2023-08-31 10:18:26 +08:00
  • 2b22215853 sf品牌页面表格的样式修改 WEB许何哲\xuhez 2023-08-31 10:16:16 +08:00
  • b4eb57f3df 修改原生gantt图样式（日期格式等去符合国内习惯） mgw 2023-08-30 17:52:13 +08:00
  • 41566a4d74 基础排程基本完成 mgw 2023-08-30 17:50:43 +08:00
  • e64cf88809 1.加工工艺去掉form表单展示 2.机床型号页面优化 jinling.yang 2023-08-30 16:26:19 +08:00
  • 2fdcd3a009 快速订单页面优化 jinling.yang 2023-08-30 16:19:38 +08:00
  • 76af8c6f2d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-29 17:44:03 +08:00
  • eae06ccdd7 Merge branch 'feature/获取cnc工单Bug修复' into develop jinling.yang 2023-08-29 17:43:51 +08:00
  • d322754798 Accept Merge Request #355: (feature/获取cnc工单Bug修复 -> develop) Merge Request: 获取cnc工单Bug修复 杨金灵 2023-08-29 17:43:23 +08:00
  • 908e8b3ff2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复 jinling.yang 2023-08-29 17:41:23 +08:00
  • e9afce298d SF点击后获取cnc程序按钮，cloud生成的编程单的编号未显示Bug修复 jinling.yang 2023-08-29 17:40:16 +08:00
  • f373c69430 Accept Merge Request #354: (feature/自建模块日志警告信息处理 -> develop) Merge Request: 库存模块日志警告信息处理 禹翔辉 2023-08-29 17:29:26 +08:00
  • 8ece696775 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 yuxianghui 2023-08-29 17:28:49 +08:00
  • 5ea6158e8d 库存模块日志警告信息处理 yuxianghui 2023-08-29 17:28:20 +08:00
  • a799793ca8 Accept Merge Request #353: (feature/修改机床参数bug -> develop) Merge Request: 修改设备table，品牌图片改成图片 龚启豪 2023-08-29 15:50:08 +08:00
  • 27571942c9 增肌OCC qihao.gong@jikimo.com 2023-08-29 15:49:14 +08:00
  • e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-29 15:48:48 +08:00
  • b7f2c4a000 sf修改设备table，品牌图片改成图片 qihao.gong@jikimo.com 2023-08-29 15:47:58 +08:00
  • 3e922df2f8 Accept Merge Request #352: (feature/必填字段label添加星号 -> develop) Merge Request: sf品牌页面表格样式的修改 许何哲 2023-08-29 15:15:20 +08:00
  • 7713ade077 sf品牌页面表格样式的修改 WEB许何哲\xuhez 2023-08-29 15:13:59 +08:00
  • 12ead3579e Accept Merge Request #351: (feature/自建模块日志警告信息处理 -> develop) Merge Request: 智能工厂所有自建模块日志警告信息处理 禹翔辉 2023-08-29 11:22:16 +08:00
  • be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 yuxianghui 2023-08-29 11:21:13 +08:00
  • 5ccd754261 所有自建模块日志警告信息处理 yuxianghui 2023-08-29 11:06:59 +08:00
  • dea565f8c6 Accept Merge Request #350: (feature/去掉警告 -> develop) Merge Request: 去掉警告 杨金灵 2023-08-29 10:31:28 +08:00
  • 6e6b0b66d3 去掉警告 jinling.yang 2023-08-29 10:22:12 +08:00
  • ed96f8dc0e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-28 17:44:46 +08:00
  • 8f6bfa2a9b Merge branch 'feature/快速订单Bug修复' into develop jinling.yang 2023-08-28 17:43:45 +08:00
  • d92dcbd4e6 Accept Merge Request #349: (feature/快速订单Bug修复 -> develop) Merge Request: 快速订单Bug修复 杨金灵 2023-08-28 17:43:22 +08:00
  • c765682311 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复 jinling.yang 2023-08-28 17:41:31 +08:00
  • fb717c22ad 1.模型为上色Bug修复（cloud代码注释引起） 2.创建产品和订单未成功Bug修复 jinling.yang 2023-08-28 17:40:19 +08:00
  • 39feda07e5 自建模块日志警告信息处理 yuxianghui 2023-08-28 17:31:41 +08:00
  • 5d30dae189 Accept Merge Request #348: (feature/刀具管理加粗字段调整及界面布局优化 -> develop) Merge Request: 刀具管理加粗字段调整， zpl_print,web_widget模块添加 'license': 'LGPL-3' 禹翔辉 2023-08-28 10:02:47 +08:00
  • 19b4cfd078 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化 yuxianghui 2023-08-28 10:00:57 +08:00
  • 1e1ed20231 刀具管理加粗字段调整， zpl_print,web_widget模块添加 'license': 'LGPL-3' yuxianghui 2023-08-28 10:00:14 +08:00
  • df650edefd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-25 15:54:20 +08:00
  • 7cb94f79a0 Merge branch 'feature/产品模板优化' into develop jinling.yang 2023-08-25 15:51:43 +08:00
  • cd3ad6f975 Accept Merge Request #347: (feature/产品模板优化 -> develop) Merge Request: 产品模板优化 杨金灵 2023-08-25 15:51:13 +08:00