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

Commit Graph

  • 8946b44280 Accept Merge Request #1313: (feature/update_production_line -> develop) 胡嘉莹 2024-09-18 17:44:45 +08:00
  • f21d085462 Accept Merge Request #1314: (feature/tax_sync -> develop) 廖丹龙 2024-09-18 17:42:28 +08:00
  • 43f53197c4 优化消息模版 jinling.yang 2024-09-18 17:39:06 +08:00
  • ac43be1262 适用刀具物料类型字段 设置只能去选择。取消必填 liaodanlong 2024-09-18 16:36:52 +08:00
  • 8bf1c56efd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化消息模版 jinling.yang 2024-09-18 15:40:54 +08:00
  • d66791dc41 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-18 15:39:50 +08:00
  • ce6b36a77e 12 jinling.yang 2024-09-18 15:39:42 +08:00
  • 4acae01009 修改计划排程，新增处理排程计划订单交货时间为null数据处理的方法 hujiaying 2024-09-18 15:34:04 +08:00
  • 213b76a280 Accept Merge Request #1312: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-18 15:15:10 +08:00
  • c675e1d67c 解除装夹工单页面进入时失去焦点 胡尧 2024-09-18 15:13:20 +08:00
  • 8a9f6ab34f Accept Merge Request #1311: (feature/update_production_line -> develop) 胡嘉莹 2024-09-18 14:14:50 +08:00
  • 8aca6ce084 修改计划排程甘特图界面不显示已经排程的制造订单 hujiaying 2024-09-18 14:03:04 +08:00
  • cb0c093006 Accept Merge Request #1310: (feature/工单状态优化 -> develop) 禹翔辉 2024-09-18 11:56:37 +08:00
  • 1e7d7008b4 Merge branch 'feature/工单优化' into feature/工单状态优化 yuxianghui 2024-09-18 11:55:02 +08:00
  • ef453dbc1e 工单状态优化 yuxianghui 2024-09-18 11:53:46 +08:00
  • 9f1e635c8d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-18 10:23:51 +08:00
  • 92037f3f04 注释OCC代码 jinling.yang 2024-09-18 10:23:42 +08:00
  • 4ba0566d27 Accept Merge Request #1309: (feature/工单优化 -> develop) 禹翔辉 2024-09-18 09:46:36 +08:00
  • 5d870d53f6 Merge branch 'feature/刀具拆解单优化' into feature/工单优化 yuxianghui 2024-09-18 09:30:49 +08:00
  • 6a674cdb5b 工单状态优化 yuxianghui 2024-09-18 09:28:36 +08:00
  • fbce132173 Accept Merge Request #1308: (feature/update_production_line -> develop) 胡嘉莹 2024-09-14 17:45:18 +08:00
  • 98e13cba99 员工信息企微id同步 guanhuan 2024-09-14 17:45:00 +08:00
  • 7ce2f6c797 历史销售订单价格问题 liaodanlong 2024-09-14 17:40:45 +08:00
  • 7502792438 修改计划排程列表进入待排程的制造订单详情进行排程-报错 hujiaying 2024-09-14 17:26:24 +08:00
  • 9efb13cf01 修改排程计划开始时间修改 hujiaying 2024-09-14 16:34:47 +08:00
  • b14e263a2e Accept Merge Request #1306: (feature/优化设备维保标准 -> develop) 管欢 2024-09-14 14:40:58 +08:00
  • 6f41ef3047 Accept Merge Request #1307: (feature/优化制造功能 -> develop) 马广威 2024-09-14 14:34:02 +08:00
  • de29f0c938 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-14 14:32:55 +08:00
  • 589a24f595 增加拉取文件之前的检查 mgw 2024-09-14 14:32:40 +08:00
  • 85186f94f5 Accept Merge Request #1302: (feature/update_production_line -> develop) 胡嘉莹 2024-09-14 14:31:56 +08:00
  • ffc363a31c Accept Merge Request #1305: (feature/tax_sync -> develop) 廖丹龙 2024-09-14 14:30:59 +08:00
  • a047ad3bb6 Accept Merge Request #1304: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-14 14:09:29 +08:00
  • cc3289c834 将工件配送页面起点接驳站修改为当前接驳站 胡尧 2024-09-14 13:49:46 +08:00
  • e1093a3c69 去掉多余的js引用 胡尧 2024-09-14 13:42:38 +08:00
  • ba955ca658 快速订单上传模型文件检查文件后缀 feature/优化设备维保标准 guanhuan 2024-09-14 08:46:32 +08:00
  • 946abc5cf7 Accept Merge Request #1303: (feature/刀具拆解单优化 -> develop) 禹翔辉 2024-09-13 17:42:16 +08:00
  • 57ea9ed8f4 Merge branch 'feature/组装单重构_2' into feature/刀具拆解单优化 yuxianghui 2024-09-13 17:38:19 +08:00
  • f8a12b1fe3 优化计划开始时间默认往后延迟10分钟 hujiaying 2024-09-13 17:37:57 +08:00
  • 722f6257ae 1、优化刀具拆解单 yuxianghui 2024-09-13 17:37:20 +08:00
  • ccbe311c58 快速订单填写的零件图号和零件图纸传给制造订单 guanhuan 2024-09-13 10:45:08 +08:00
  • 0f6ca0876c Accept Merge Request #1300: (feature/优化设备维保标准 -> develop) 管欢 2024-09-13 10:41:19 +08:00
  • bb60fd0339 Accept Merge Request #1301: (feature/优化制造功能 -> develop) 马广威 2024-09-13 10:40:58 +08:00
  • eefbd5939b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-13 10:38:23 +08:00
  • 7c01196f17 修复“装夹预调工单没有测量数据时点击左上角的【完成】按钮直接完成工单了” mgw 2024-09-13 10:37:50 +08:00
  • 4c58f4d7f3 快速订单填写的零件图号和零件图纸传给制造订单 guanhuan 2024-09-13 10:22:14 +08:00
  • c741587341 Accept Merge Request #1299: (feature/update_production_line -> develop) 胡嘉莹 2024-09-13 10:21:11 +08:00
  • 6ad2fa80f1 修改销售，采购，制造，仓库产品设置产品类型为默认分组 hujiaying 2024-09-13 10:15:26 +08:00
  • 55694ae303 Merge branch 'develop' into feature/流程用扫码完成 胡尧 2024-09-13 08:53:16 +08:00
  • 8423b12119 Accept Merge Request #1298: (feature/组装单重构_2 -> develop) 禹翔辉 2024-09-12 17:27:42 +08:00
  • 5a7ba7f87e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-12 17:24:43 +08:00
  • d36da3df24 Merge branch 'feature/新增消息提醒模版' into develop jinling.yang 2024-09-12 17:24:35 +08:00
  • 302a5f0cf1 Accept Merge Request #1297: (feature/新增消息提醒模版 -> develop) 杨金灵 2024-09-12 17:24:18 +08:00
  • b4fef421dd Merge branch 'feature/功能刀具重构_1' into feature/组装单重构_2 yuxianghui 2024-09-12 17:24:13 +08:00
  • 5f5e991d33 优化页面 jinling.yang 2024-09-12 17:24:01 +08:00
  • 43a49242c5 1、组装单布局调整 yuxianghui 2024-09-12 17:21:37 +08:00
  • 2e5694cd1a 1、优化组装单扫描验证物料方法；2、对组装单物料批次进行调整，删除部分字段和方法；优化获取BOM并自动初始化物料数据方法；3、货位批次模型新增物料字段，新增tree视图，并且除刀柄外物料点击【更多】时跳转至不同的货位批次模型tree视图；4、添加刀柄和其他物料在点击【更多】按钮后选取新物料点击【确认】后回填物料信息到组装单并给出提示信息；5、添加组装物料信息校验功能，初始化或重新选取物料后需进行验证才能进行组装；6、组装单form视图布局调整； yuxianghui 2024-09-12 17:20:58 +08:00
  • 3c123a07ea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增消息提醒模版 jinling.yang 2024-09-12 17:06:33 +08:00
  • dec5ddd154 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-12 17:06:24 +08:00
  • 22864b9669 新增消息提醒模版 jinling.yang 2024-09-12 17:06:16 +08:00
  • 528fa483a2 Accept Merge Request #1296: (feature/优化设备维保标准 -> develop) 管欢 2024-09-12 16:48:28 +08:00
  • b5a3815f1f 设备维保标准筛选添加已归档 guanhuan 2024-09-12 16:43:54 +08:00
  • 1719e0394e 去掉run_time返回 mgw 2024-09-12 16:33:55 +08:00
  • eae902ee92 调整设备运行时长 mgw 2024-09-12 15:36:30 +08:00
  • 01c57a8691 去除无用代码添加描述信息 liaodanlong 2024-09-12 15:17:47 +08:00
  • 2808005ce9 错误处理 liaodanlong 2024-09-12 15:17:09 +08:00
  • 06c5f65df2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-12 11:08:41 +08:00
  • e0bad6ed40 优化当班计划量，完成量数据 mgw 2024-09-12 11:08:24 +08:00
  • 35c8b9316e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new feature/新增消息提醒 jinling.yang 2024-09-12 10:46:40 +08:00
  • 2ddfbb0dde Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-12 10:46:29 +08:00
  • 988c4a460d 2D加工图纸改为pdf guanhuan 2024-09-12 10:24:45 +08:00
  • c050e2f11a 供应商详情的采购员去掉必填 guanhuan 2024-09-12 10:14:38 +08:00
  • 95e49c7b0f 优化打印输出 mgw 2024-09-12 09:17:52 +08:00
  • e46a13889e Accept Merge Request #1295: (feature/优化设备维保标准 -> develop) 管欢 2024-09-12 08:38:01 +08:00
  • 335151f6ca Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-11 18:11:07 +08:00
  • 908e4a3df6 调整通过数量取值 mgw 2024-09-11 18:07:21 +08:00
  • 6b403f2c1e Accept Merge Request #1294: (feature/update_production_line -> develop) 胡嘉莹 2024-09-11 17:58:51 +08:00
  • da5e322229 1、组装单新增五种物料的【更多】按钮，点击按钮跳转至新的弹窗界面，根据功能刀具清单BOM的配置，搜索出全部满足条件的刀柄产品或者其他刀具物料对应的批次、货位，使用tree视图提供选择。2、新增产品tree、search视图 yuxianghui 2024-09-11 17:49:43 +08:00
  • 4f9ac16a07 修改计划排程，已取消的不占用小时或日产数量 hujiaying 2024-09-11 17:48:08 +08:00
  • 4342844845 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-11 17:41:49 +08:00
  • 8bc68e1edd 表面工艺参数取消必填 guanhuan 2024-09-11 17:40:28 +08:00
  • 763d64a1ca 增加设备运行时长效率接口 mgw 2024-09-11 14:57:42 +08:00
  • 8a10d18f37 Accept Merge Request #1293: (feature/update_production_line -> develop) 胡嘉莹 2024-09-11 12:15:17 +08:00
  • 181f490d47 修改计划排程时间范围内判断取值向上取整 hujiaying 2024-09-11 11:53:17 +08:00
  • 322718d19a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-11 11:45:36 +08:00
  • 96eeb1cab7 调整检测量、合格量 mgw 2024-09-11 11:45:14 +08:00
  • d5c82e4a28 修改代码问题 胡尧 2024-09-11 10:40:26 +08:00
  • 436adc5ff6 功能刀具清单 bom添加查询排序与清单明细行删除校验 liaodanlong 2024-09-11 10:39:27 +08:00
  • 97a5d91fce Accept Merge Request #1292: (feature/tax_sync -> develop) 廖丹龙 2024-09-11 10:30:08 +08:00
  • 9eee8557c2 功能刀具清单 bom添加查询排序与清单明细行删除校验 liaodanlong 2024-09-11 10:23:02 +08:00
  • 4394dd023e 增加交付准时率 mgw 2024-09-11 10:11:22 +08:00
  • d39bbe4f99 Accept Merge Request #1291: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-11 09:15:48 +08:00
  • b188c8adfe 修改异常提示 胡尧 2024-09-11 09:14:00 +08:00
  • ea6fd42b2e SF快速订单优化 guanhuan 2024-09-11 09:01:24 +08:00
  • 625499f758 SF快速订单优化 guanhuan 2024-09-11 08:59:44 +08:00
  • 0c2d6dd582 SF快速订单优化 guanhuan 2024-09-11 08:52:28 +08:00
  • f6a9c97e7f 优化产量部分 mgw 2024-09-11 08:51:01 +08:00
  • e2d741937e 1、实现功能刀具点击开始组装时，自动获取功能刀具清单BOM信息，并根据规则匹配刀具物料信息进行信息初始化；2、对组装单form界面进行调整，并隐藏夹头物料的所以信息； yuxianghui 2024-09-10 17:52:40 +08:00
  • 9a3404f4b8 去掉屏蔽的代码 胡尧 2024-09-10 17:51:27 +08:00
  • d000aa095f 对于测试用例进行修改 胡尧 2024-09-10 17:49:52 +08:00
  • 8945801db8 解决冲突 胡尧 2024-09-10 16:16:30 +08:00