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

Commit Graph

  • 0082a308fa 修改屏蔽登录页footer feature/wechat_message 胡尧 2024-09-23 16:37:36 +08:00
  • b5f5826c80 Accept Merge Request #1342: (feature/wechat_message -> develop) 胡尧 2024-09-23 16:10:00 +08:00
  • 5024a9254d 删除皮肤文件 胡尧 2024-09-23 16:08:49 +08:00
  • 2a14a630d5 Accept Merge Request #1341: (feature/制造功能优化 -> develop) 马广威 2024-09-23 14:30:57 +08:00
  • ef8ea2599f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-23 14:30:09 +08:00
  • e9ab4270a9 调整记录匹配条件；优化排程单状态变化 mgw 2024-09-23 14:29:52 +08:00
  • a99d651509 Accept Merge Request #1340: (feature/销售和排程添加消息推送 -> develop) 廖丹龙 2024-09-23 14:25:01 +08:00
  • c54a5b36d4 Accept Merge Request #1339: (feature/update_production_line -> develop) 胡嘉莹 2024-09-23 14:24:03 +08:00
  • ae844cf203 Merge branch 'develop' into feature/wechat_message 胡尧 2024-09-23 14:03:18 +08:00
  • ec66ea76ba Accept Merge Request #1330: (feature/org_info_synchronous -> develop) 管欢 2024-09-23 13:36:06 +08:00
  • 8643c41193 代码还原 liaodanlong 2024-09-23 13:33:05 +08:00
  • bed0483496 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/销售和排程添加消息推送 liaodanlong 2024-09-23 13:31:52 +08:00
  • a648208656 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 liaodanlong 2024-09-23 13:31:46 +08:00
  • 98af6d0530 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/销售和排程添加消息推送 liaodanlong 2024-09-23 13:31:27 +08:00
  • 5af1953e04 坯料采购提醒 guanhuan 2024-09-23 13:20:31 +08:00
  • b1a08be57b bfm加工订单隐藏字段 ，待发货明细中，接单日期、发货日期顺序改变，欠单如果没有发货不要显示发货时间 、更改逾期状态逻辑。 feature/update_production_line hujiaying 2024-09-23 12:27:31 +08:00
  • 15981aadf1 Accept Merge Request #1338: (feature/制造功能优化 -> develop) 马广威 2024-09-23 12:09:20 +08:00
  • e19cb52e70 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-23 12:08:30 +08:00
  • 5269d09d0e 去掉工单明细处删除按钮；已完成工单取24小时内 mgw 2024-09-23 12:08:02 +08:00
  • e7e64720c6 消息推送 liaodanlong 2024-09-23 11:55:28 +08:00
  • a6701a842e 刀尖r角字段修改 liaodanlong 2024-09-23 11:55:11 +08:00
  • d697bd13a1 Accept Merge Request #1337: (feature/修改网站标题 -> develop) 胡尧 2024-09-23 11:21:58 +08:00
  • 6e20a466ce 修改网站标题写死的问题 feature/修改网站标题 胡尧 2024-09-23 11:21:17 +08:00
  • dd5c9775fc 去掉修改网页标题的代码 胡尧 2024-09-23 11:18:40 +08:00
  • 82c274591c Accept Merge Request #1336: (feature/前端样式修改 -> develop) 黄焱 2024-09-23 11:00:15 +08:00
  • 4f73f57ddf 漏提交代码 hy 2024-09-23 10:59:10 +08:00
  • 269141dfb2 Accept Merge Request #1335: (feature/前端样式修改 -> develop) 黄焱 2024-09-23 10:56:37 +08:00
  • cab0e1ce0b 顶部菜单支持多级菜单 hy 2024-09-23 10:54:37 +08:00
  • d4ff7ffaa9 Accept Merge Request #1334: (feature/产品优化 -> develop) 禹翔辉 2024-09-23 10:51:00 +08:00
  • d238d09cc3 Merge branch 'feature/刀具优化' into feature/产品优化 yuxianghui 2024-09-23 10:49:36 +08:00
  • 4cee5213bb 产品字段值优化 yuxianghui 2024-09-23 10:48:48 +08:00
  • 759e4a481d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-23 10:32:27 +08:00
  • 1213afe834 Merge branch 'feature/销售和排程添加消息推送' into develop jinling.yang 2024-09-23 10:32:18 +08:00
  • 35fda7106a Accept Merge Request #1333: (feature/销售和排程添加消息推送 -> develop) 杨金灵 2024-09-23 10:32:05 +08:00
  • b8baa84270 还原代码 jinling.yang 2024-09-23 10:30:51 +08:00
  • 6591e663b6 修复待排程的消息推送 jinling.yang 2024-09-23 10:26:53 +08:00
  • bad5c8d489 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售和排程添加消息推送 jinling.yang 2024-09-23 08:56:59 +08:00
  • 68f8c94332 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-23 08:55:40 +08:00
  • ddfb233452 修复按钮固定条件显示问题 mgw 2024-09-23 08:55:23 +08:00
  • bbf62d2302 消息模块添加权限 jinling.yang 2024-09-20 17:32:02 +08:00
  • 17b09c1f6d Merge branch 'feature/wechat_message' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售和排程添加消息推送 jinling.yang 2024-09-20 16:57:19 +08:00
  • e0fc70ec60 Accept Merge Request #1332: (feature/刀具优化 -> develop) 禹翔辉 2024-09-20 16:55:14 +08:00
  • 4558fc0336 Merge branch 'feature/库存优化' into feature/刀具优化 yuxianghui 2024-09-20 16:51:39 +08:00
  • 4609ec442a 1、刀具标准库优化，整体式刀具物料产品优化；刀具同步接口优化；2、新增组装单扫描确认组装和获取测量值功能；组装单更换物料弹窗信息优化； yuxianghui 2024-09-20 16:50:55 +08:00
  • eb7d9e4168 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-09-20 16:38:30 +08:00
  • 8706e25b0d 增加24h与历史日志的数据拿取 mgw 2024-09-20 16:33:56 +08:00
  • 85fea64f49 Accept Merge Request #1331: (feature/前端样式修改 -> develop) 黄焱 2024-09-20 16:31:57 +08:00
  • f74215c9f6 修改顶部下拉菜单 hy 2024-09-20 16:27:12 +08:00
  • cc8906980c 销售和排程添加消息推送 jinling.yang 2024-09-20 15:42:07 +08:00
  • 56f1ba0f25 用户新增企业微信id feature/org_info_synchronous guanhuan 2024-09-20 14:24:50 +08:00
  • 0990d73075 Accept Merge Request #1329: (feature/制造功能优化 -> develop) 马广威 2024-09-20 11:46:38 +08:00
  • 7d877a0cbb 处理提示词制造订单重复问题；处理获取数据按钮显隐问题 mgw 2024-09-20 11:45:23 +08:00
  • e13bad8483 Merge branch 'develop' into feature/wechat_message 胡尧 2024-09-20 10:43:41 +08:00
  • 22ebb1bbe1 增加扩展 胡尧 2024-09-20 10:43:13 +08:00
  • bc888d7984 Accept Merge Request #1328: (feature/tax_sync -> develop) 廖丹龙 2024-09-20 10:42:55 +08:00
  • c92d4f7868 增加扩展 胡尧 2024-09-20 10:41:41 +08:00
  • 667a2a81fb Accept Merge Request #1327: (feature/org_info_synchronous -> develop) 管欢 2024-09-20 10:40:26 +08:00
  • 4a22071f94 Merge branch 'refs/heads/develop' into feature/tax_sync feature/tax_sync liaodanlong 2024-09-20 10:35:47 +08:00
  • ec2075c874 刀具岗权限调整 liaodanlong 2024-09-20 10:32:30 +08:00
  • ebc9716019 agv 配置调整位置 liaodanlong 2024-09-20 10:32:08 +08:00
  • d067c5b8c4 左侧图标修改 guanhuan 2024-09-20 09:49:13 +08:00
  • 72c9c9872e Accept Merge Request #1326: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-20 09:39:21 +08:00
  • 2b541fe041 修复扫码确认后接驳站点被清除的bug 胡尧 2024-09-20 09:38:32 +08:00
  • f6e371f223 Merge branch 'feature/wechat_message' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new jinling.yang 2024-09-20 09:25:00 +08:00
  • 0aefe9e656 修改目录结构 胡尧 2024-09-20 09:19:34 +08:00
  • 4f8f29e41a 新增消息通知模块 胡尧 2024-09-19 17:56:00 +08:00
  • ffb32c7ce2 Accept Merge Request #1325: (feature/tax_sync -> develop) 廖丹龙 2024-09-19 17:38:32 +08:00
  • 3cacca80e9 隐藏新建字段 liaodanlong 2024-09-19 17:35:57 +08:00
  • a3356fe195 Accept Merge Request #1324: (feature/库存优化 -> develop) 禹翔辉 2024-09-19 17:29:29 +08:00
  • 3c70e1623e Merge branch 'feature/工单状态优化' into feature/库存优化 yuxianghui 2024-09-19 17:27:44 +08:00
  • 51628c081a 1、禁用超级管理员之外的角色通过库存概览跳转到调拨单界面的调拨单创建按钮，隐藏制造作业类型的单据；2、优化移动历史记录。 yuxianghui 2024-09-19 17:27:02 +08:00
  • 18ebe6bcb4 Accept Merge Request #1323: (feature/优化返工 -> develop) 杨金灵 2024-09-19 17:25:05 +08:00
  • 63ac4f2b44 返工工单添加标签字段 jinling.yang 2024-09-19 17:23:01 +08:00
  • 1b6ca170c0 bom组装默认值 liaodanlong 2024-09-19 15:15:30 +08:00
  • 2966260f51 Accept Merge Request #1322: (feature/优化制造功能 -> develop) 马广威 2024-09-19 15:03:30 +08:00
  • c4069995e0 解除装夹处，扫码同步打印成品条码 mgw 2024-09-19 14:38:24 +08:00
  • 54920982a2 Accept Merge Request #1319: (feature/org_info_synchronous -> develop) 管欢 2024-09-19 13:52:30 +08:00
  • f947a3ed58 Accept Merge Request #1321: (feature/tax_sync -> develop) 廖丹龙 2024-09-19 13:50:43 +08:00
  • 5e86d67316 bom清单问题修复 liaodanlong 2024-09-19 13:42:52 +08:00
  • 7354a19696 Accept Merge Request #1320: (feature/优化制造功能 -> develop) 马广威 2024-09-19 10:51:20 +08:00
  • 78e3d77000 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-19 10:50:06 +08:00
  • 47ad2410cf 调整agv参数位置 mgw 2024-09-19 10:16:09 +08:00
  • fa2eb7b3cf 增加是否获取文件判断 mgw 2024-09-19 10:07:26 +08:00
  • 0cee6ebd77 员工信息同步 guanhuan 2024-09-19 09:48:01 +08:00
  • 73f161ffa4 Accept Merge Request #1318: (feature/消息模版添加时间节点 -> develop) 杨金灵 2024-09-19 09:34:41 +08:00
  • ff06d5c3be 消息模版添加时间节点 jinling.yang 2024-09-19 09:32:04 +08:00
  • 78cb177ac5 Merge remote-tracking branch 'origin/develop' into develop liaodanlong 2024-09-19 09:14:33 +08:00
  • 9601502360 视图菜单与action顺序调整 liaodanlong 2024-09-19 09:12:38 +08:00
  • 739b7e600c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-09-19 09:04:20 +08:00
  • 27da7639b2 增加扫码点击按钮功能 mgw 2024-09-19 09:04:05 +08:00
  • 258e3bdb9f 一般设置页增加重新获取检测文件配置项目 mgw 2024-09-19 09:03:07 +08:00
  • 7f3e9927d5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-19 08:52:34 +08:00
  • 927f726030 Merge branch 'feature/优化消息模版' into develop jinling.yang 2024-09-19 08:52:25 +08:00
  • 7576200fc4 Accept Merge Request #1315: (feature/优化消息模版 -> develop) 杨金灵 2024-09-19 08:52:10 +08:00
  • 4ffb9d636f Accept Merge Request #1316: (feature/流程用扫码完成 -> develop) 胡尧 2024-09-19 08:51:03 +08:00
  • 24f0547343 消息模块添加销售依赖 jinling.yang 2024-09-19 08:50:24 +08:00
  • 402a323673 修改扫码判断起点接驳站逻辑 胡尧 2024-09-19 08:49:23 +08:00
  • 5e1685417f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-09-19 08:46:01 +08:00
  • 9dfe34ce9a 还原注释代码 jinling.yang 2024-09-19 08:45:50 +08:00
  • 190d6da217 还原代码 jinling.yang 2024-09-18 17:59:08 +08:00