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

Commit Graph

  • bdef852b98 调整当日在线时长取值为今天之前最后一次开机时长 mgw 2025-04-25 10:13:42 +08:00
  • 1d5fb747d4 Accept Merge Request #2059: (feature/6609 -> develop) 胡尧 2025-04-25 10:09:21 +08:00
  • 8116e4f97d 解决更新出现字段未找到的问题 胡尧 2025-04-25 10:08:03 +08:00
  • e3e5fcc378 调整当日故障时长 mgw 2025-04-25 09:42:45 +08:00
  • 879b5492db Accept Merge Request #2058: (feature/6609 -> develop) 胡尧 2025-04-25 09:19:17 +08:00
  • 27b9a4f982 解决冲突 胡尧 2025-04-25 09:19:00 +08:00
  • 94007bae2b 产品详情增加只有成品类型才显示模型ID 胡尧 2025-04-25 09:16:40 +08:00
  • bf92028027 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-24 17:27:40 +08:00
  • 2b47e566d3 调整周期字段为当日0时间 mgw 2025-04-24 17:27:20 +08:00
  • 5aa2f1aa18 Accept Merge Request #2057: (feature/6694 -> develop) 胡尧 2025-04-24 17:08:10 +08:00
  • b7128ba81a 解决排程报错的问题 胡尧 2025-04-24 17:07:30 +08:00
  • 49546f9d08 Accept Merge Request #2056: (feature/6694 -> develop) 胡尧 2025-04-24 15:13:40 +08:00
  • 6959bd9a09 修改参数类型判断 胡尧 2025-04-24 15:13:21 +08:00
  • 3a2babf2d5 Accept Merge Request #2055: (feature/工单排序_1 -> develop) 禹翔辉 2025-04-24 15:11:23 +08:00
  • d7d094c84d Merge branch 'feature/工单排序' into feature/工单排序_1 yuxianghui 2025-04-24 15:05:57 +08:00
  • a06e24583d 添加工单先按工序排序，再按创建时间排序 yuxianghui 2025-04-24 15:04:04 +08:00
  • 0cbd830901 Accept Merge Request #2053: (feature/6694 -> develop) 胡尧 2025-04-24 14:59:12 +08:00
  • 4b29def105 修改模型id为模型ID，增加机台判断 胡尧 2025-04-24 14:58:50 +08:00
  • 582abb3f2e Accept Merge Request #2052: (feature/6694 -> develop) 胡尧 2025-04-24 14:38:07 +08:00
  • 40137ba69c 去掉产品form重复的字段 胡尧 2025-04-24 14:31:22 +08:00
  • 804f6a82b4 Accept Merge Request #2051: (feature/6694 -> develop) 胡尧 2025-04-24 14:15:58 +08:00
  • d16d47dfbe 销售订单，制造订单视图中加入模型id 胡尧 2025-04-24 14:13:10 +08:00
  • 41cf9d5474 Accept Merge Request #2050: (feature/6694 -> develop) 胡尧 2025-04-24 11:42:52 +08:00
  • 59aa6b4f10 修改扫码报错信息 胡尧 2025-04-24 11:42:16 +08:00
  • a759106fdc Accept Merge Request #2049: (feature/6694 -> develop) 胡尧 2025-04-24 11:08:45 +08:00
  • 8bb101c6b2 调整打印代码结构 胡尧 2025-04-24 11:08:02 +08:00
  • f02044b513 Accept Merge Request #2048: (feature/6694 -> develop) 胡尧 2025-04-24 09:59:29 +08:00
  • 3d937b85c9 调整机台二维码使用A4打印机 胡尧 2025-04-24 09:59:05 +08:00
  • 5a61b3b459 调整机台二维码使用A4打印机 胡尧 2025-04-24 09:58:27 +08:00
  • afccb5ee6a Accept Merge Request #2047: (feature/6694 -> develop) 胡尧 2025-04-24 09:19:13 +08:00
  • 2b0648d9bc 修改机台二维码为ID 胡尧 2025-04-24 09:18:49 +08:00
  • 8ea3487044 Accept Merge Request #2046: (feature/6694 -> develop) 胡尧 2025-04-24 08:59:38 +08:00
  • b24ed5fe4c 增加import 胡尧 2025-04-24 08:59:07 +08:00
  • b801b265c3 Accept Merge Request #2045: (feature/6694 -> develop) 胡尧 2025-04-23 17:51:41 +08:00
  • 27a67167fe 增加日志界面 胡尧 2025-04-23 17:51:09 +08:00
  • 8fa9534b4e 增加接口请求日志，修改报工接口获取机台id 胡尧 2025-04-23 17:39:42 +08:00
  • db745e46b6 Accept Merge Request #2044: (feature/6609 -> develop) 胡尧 2025-04-23 16:59:51 +08:00
  • f598b6c71c 解决从制造订单跳转到产品无法显示模型id的问题 胡尧 2025-04-23 16:58:59 +08:00
  • dccb0b3fb0 Accept Merge Request #2043: (feature/6763 -> develop) 胡尧 2025-04-23 16:16:50 +08:00
  • 83feb78f43 修改机台二维码为机台ID feature/6763 胡尧 2025-04-23 16:16:25 +08:00
  • ac09794b10 Accept Merge Request #2042: (feature/6763 -> develop) 胡尧 2025-04-23 16:00:13 +08:00
  • 3f88b11a18 解决模块更新报错问题 胡尧 2025-04-23 15:59:37 +08:00
  • b97acfb181 Accept Merge Request #2041: (feature/6684 -> develop) 胡尧 2025-04-23 14:24:00 +08:00
  • 6767b693f5 取消线上解决bug的改动 feature/6684 胡尧 2025-04-23 14:22:50 +08:00
  • 7b77d846c3 Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop) 胡尧 2025-04-23 14:21:27 +08:00
  • 5e3bce1931 Accept Merge Request #2038: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-23 11:25:04 +08:00
  • ef5c2649c9 【sf.t-计划】在排程单详情页选择时间段进行排程时未校验日历有效工作时间 liaodanlong 2025-04-23 11:24:38 +08:00
  • 5400c9ec69 Accept Merge Request #2039: (feature/工单排序 -> develop) 禹翔辉 2025-04-23 11:22:47 +08:00
  • 7c7876e96f 工单添加默认按工序排序 yuxianghui 2025-04-23 11:19:08 +08:00
  • 5438ff6df1 排程产能限制问题 liaodanlong 2025-04-23 11:06:03 +08:00
  • 05b5e9cfd9 解决创建采购申请报错 hotfix/解决采购申请bug 胡尧 2025-04-23 10:32:39 +08:00
  • 86dfd437cc 解决创建采购申请报错 胡尧 2025-04-23 10:31:30 +08:00
  • 3a92e4cfd8 解决创建采购申请报错 胡尧 2025-04-23 10:22:20 +08:00
  • bff0ff9401 增加日志 胡尧 2025-04-23 10:18:49 +08:00
  • 9b3fe5c070 Accept Merge Request #2036: (feature/页面显示优化 -> develop) 管欢 2025-04-23 09:48:26 +08:00
  • 92d593bf24 Accept Merge Request #2037: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-23 09:38:27 +08:00
  • dc6fb4ddda 采购申请单查询条件同一 liaodanlong 2025-04-23 09:34:02 +08:00
  • a84f8636a4 Accept Merge Request #2035: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-23 09:12:59 +08:00
  • 7c26045377 工艺确认报错问题处理 liaodanlong 2025-04-23 09:12:20 +08:00
  • da579a15b3 Accept Merge Request #2034: (feature/6694 -> develop) 胡尧 2025-04-23 08:53:23 +08:00
  • c9ee0af25a 修复bug 胡尧 2025-04-23 08:52:49 +08:00
  • 151bc5da4f 报价菜单修改 guanhuan 2025-04-22 15:43:14 +08:00
  • 1015af483c Accept Merge Request #2033: (feature/6694 -> develop) 胡尧 2025-04-22 15:23:29 +08:00
  • bb3971c93e 修改ftp传输代码 胡尧 2025-04-22 15:23:02 +08:00
  • aa9efe932e Accept Merge Request #2032: (feature/制造功能优化 -> develop) 马广威 2025-04-22 15:13:28 +08:00
  • 8e09e9715c Accept Merge Request #2031: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-22 15:05:42 +08:00
  • 30a55658de 处理浮点型增0问题 mgw 2025-04-22 15:02:38 +08:00
  • 7ecdc31db4 空值处理 liaodanlong 2025-04-22 15:00:54 +08:00
  • 4234a6bbd9 Accept Merge Request #2030: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-22 14:28:29 +08:00
  • 8fcc436ce5 设置字段必填 liaodanlong 2025-04-22 14:24:10 +08:00
  • 53a676bc93 查询条件修改 liaodanlong 2025-04-22 14:22:31 +08:00
  • c6f625fe44 Accept Merge Request #2027: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-22 13:49:59 +08:00
  • 397c35867b 产品设置默认供应商数据 liaodanlong 2025-04-22 13:41:22 +08:00
  • f843610872 采购申请处理 liaodanlong 2025-04-22 13:40:15 +08:00
  • 41e4d2656a 采购申请单 liaodanlong 2025-04-22 13:39:57 +08:00
  • 4272d2855f 坯料自动勾选工艺路线 liaodanlong 2025-04-22 13:38:50 +08:00
  • e63a12cbc1 Accept Merge Request #2029: (feature/制造功能优化 -> develop) 马广威 2025-04-22 13:17:03 +08:00
  • 2867264e88 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-22 13:16:34 +08:00
  • 7c2ddd8a0c 调整上传文件名 mgw 2025-04-22 13:16:15 +08:00
  • 4daddcff61 Accept Merge Request #2028: (feature/制造功能优化 -> develop) 马广威 2025-04-22 11:51:29 +08:00
  • 666c0167d7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-22 11:50:33 +08:00
  • 6b7f1aedbe 调整适配零件图号为数字 mgw 2025-04-22 11:50:15 +08:00
  • 4234494f08 调整可用率 mgw 2025-04-22 10:55:21 +08:00
  • cbc73ee8e3 工艺相关展示调整 liaodanlong 2025-04-21 16:04:36 +08:00
  • ec3d2a9239 Accept Merge Request #2026: (feature/前端样式修改 -> develop) 黄焱 2025-04-21 16:04:32 +08:00
  • a55da93dc4 修复样式问题 hyyy 2025-04-21 16:01:04 +08:00
  • 73dce5e75e Accept Merge Request #2025: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-21 15:00:30 +08:00
  • 9b009ec5a3 外协工单采购申请查询问题 liaodanlong 2025-04-21 14:55:52 +08:00
  • 7d70184a5d 外协工单采购申请查询问题 liaodanlong 2025-04-21 14:55:20 +08:00
  • 9f9c08b1f0 制造订单采购申请查询问题 liaodanlong 2025-04-21 14:35:57 +08:00
  • 5886b4e132 Accept Merge Request #2024: (feature/tool_standard_library_process -> develop) 廖丹龙 2025-04-21 13:18:49 +08:00
  • 77478fd173 制造订单报错问题 liaodanlong 2025-04-21 13:16:15 +08:00
  • 2154533ad5 Accept Merge Request #2023: (feature/6694 -> develop) 胡尧 2025-04-21 13:15:22 +08:00
  • eab7bf04c3 去掉打印模块的type字段 胡尧 2025-04-21 13:15:02 +08:00
  • ba910f011e Accept Merge Request #2022: (feature/制造功能优化 -> develop) 马广威 2025-04-21 12:22:20 +08:00
  • c43d8ee280 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-04-21 12:20:56 +08:00
  • acc04f396d sf-质量检查-上传报告校验必填，及上传时检查图号跟产品的零件图号是否一致 mgw 2025-04-21 12:20:37 +08:00
  • 3425376705 Accept Merge Request #2021: (feature/6763 -> develop) 胡尧 2025-04-21 11:26:29 +08:00
  • 7849ce6342 工单列表增加模型ID搜索 胡尧 2025-04-21 11:25:37 +08:00
  • 69e8bf67d1 sf-制造-表面工艺可选参数-从cloud同步过来的数据，获取方式方式=外协 liaodanlong 2025-04-21 10:04:59 +08:00