Commit Graph
Select branches
Hide Pull Requests
develop
feature/10月迭代优化
feature/20250604_chenye
feature/6679
feature/6684
feature/6686
feature/6694
feature/6711
feature/6763
feature/6973
feature/7119_lxbTest
feature/7134
feature/7141
feature/7151
feature/7154
feature/7229
feature/7230
feature/7231
feature/7248
feature/7249
feature/7253
feature/7254
feature/7254_new
feature/7277
feature/7277_7280
feature/7280
feature/auxiliary_files_upload
feature/backup-develop
feature/commercially_launched
feature/customer_material_optimization
feature/customer_supply
feature/delivery_status
feature/machining_accuracy_sync
feature/manufactur_order
feature/merge-6694
feature/message_update
feature/model_type_update
feature/mrp_bug_fixed
feature/new
feature/new1
feature/new111
feature/org_info_synchronous
feature/part_number
feature/plan_slow
feature/pre-three-elment
feature/process_outsourcing_code_stripping
feature/sale_order_route_pick
feature/sf-master1.0
feature/sf看板样式统一
feature/sync-develop-with-master
feature/tax_sync
feature/tool_standard_library_process
feature/update_process_start_time
feature/update_production_line
feature/wechat_message
feature/weid_sync_update
feature/workorder_exceptions
feature/临时分支
feature/主题logo添加中文
feature/产品的权限优化
feature/仓库发货下发bfm
feature/优化工件配送及AGV
feature/优化报废和返工
feature/优化设备维保标准
feature/优化调拨列表
feature/修改产品名称
feature/修改制造订单列表显示
feature/修改机床参数bug
feature/修改网站标题
feature/制造功能优化
feature/前端样式修改
feature/加工能力显示重叠
feature/取消加工订单
feature/合同审批
feature/坯料尺寸显示修改
feature/增加模块完整性验证
feature/增加质检模块
feature/增加适配开发环境
feature/工单返工优化
feature/打印配置优化
feature/报废优化
feature/搜索优化
feature/新增plm模块
feature/新增坯料类型
feature/新增消息提醒
feature/根据项目组区分sf代码
feature/消息提醒优化
feature/物料需求计划管理
feature/禁止负库存
feature/程序用刀异常提醒
feature/请购明细
feature/调拨单质检
feature/还原产品页面代码
feature/逾期工单批量重新安排
feature/采购申请优化
feature/销售和排程添加消息推送
feature/零件图号名称优化需求
feature/零件图号筛选
feature/需求计划
feature/页面显示优化
feature/验证合并的逻辑
feature/齐套检查与下达生产
hotfix/修复刀具预警没有预警记录和通知
hotfix/修复多面加工产线状态
hotfix/修复工件上下产线接口
hotfix/修复报废-外协入库验证
hotfix/修改agv回调接口授权
hotfix/备注为空
hotfix/解决采购申请bug
master
release/release1.0
release/release1.6
release/release1.7
release/release_1.2
release/release_1.4
release/release_1.5
release/release_1.8
release/release_1.9
release/release_2.0
release/release_2.1
release/release_2.10
release/release_2.11
release/release_2.12
release/release_2.13
release/release_2.14
release/release_2.15
release/release_2.2
release/release_2.3
release/release_2.4
release/release_2.5
release/release_2.6
release/release_2.7
release/release_2.8
release/release_2.9
Select branches
Hide Pull Requests
develop
feature/10月迭代优化
feature/20250604_chenye
feature/6679
feature/6684
feature/6686
feature/6694
feature/6711
feature/6763
feature/6973
feature/7119_lxbTest
feature/7134
feature/7141
feature/7151
feature/7154
feature/7229
feature/7230
feature/7231
feature/7248
feature/7249
feature/7253
feature/7254
feature/7254_new
feature/7277
feature/7277_7280
feature/7280
feature/auxiliary_files_upload
feature/backup-develop
feature/commercially_launched
feature/customer_material_optimization
feature/customer_supply
feature/delivery_status
feature/machining_accuracy_sync
feature/manufactur_order
feature/merge-6694
feature/message_update
feature/model_type_update
feature/mrp_bug_fixed
feature/new
feature/new1
feature/new111
feature/org_info_synchronous
feature/part_number
feature/plan_slow
feature/pre-three-elment
feature/process_outsourcing_code_stripping
feature/sale_order_route_pick
feature/sf-master1.0
feature/sf看板样式统一
feature/sync-develop-with-master
feature/tax_sync
feature/tool_standard_library_process
feature/update_process_start_time
feature/update_production_line
feature/wechat_message
feature/weid_sync_update
feature/workorder_exceptions
feature/临时分支
feature/主题logo添加中文
feature/产品的权限优化
feature/仓库发货下发bfm
feature/优化工件配送及AGV
feature/优化报废和返工
feature/优化设备维保标准
feature/优化调拨列表
feature/修改产品名称
feature/修改制造订单列表显示
feature/修改机床参数bug
feature/修改网站标题
feature/制造功能优化
feature/前端样式修改
feature/加工能力显示重叠
feature/取消加工订单
feature/合同审批
feature/坯料尺寸显示修改
feature/增加模块完整性验证
feature/增加质检模块
feature/增加适配开发环境
feature/工单返工优化
feature/打印配置优化
feature/报废优化
feature/搜索优化
feature/新增plm模块
feature/新增坯料类型
feature/新增消息提醒
feature/根据项目组区分sf代码
feature/消息提醒优化
feature/物料需求计划管理
feature/禁止负库存
feature/程序用刀异常提醒
feature/请购明细
feature/调拨单质检
feature/还原产品页面代码
feature/逾期工单批量重新安排
feature/采购申请优化
feature/销售和排程添加消息推送
feature/零件图号名称优化需求
feature/零件图号筛选
feature/需求计划
feature/页面显示优化
feature/验证合并的逻辑
feature/齐套检查与下达生产
hotfix/修复刀具预警没有预警记录和通知
hotfix/修复多面加工产线状态
hotfix/修复工件上下产线接口
hotfix/修复报废-外协入库验证
hotfix/修改agv回调接口授权
hotfix/备注为空
hotfix/解决采购申请bug
master
release/release1.0
release/release1.6
release/release1.7
release/release_1.2
release/release_1.4
release/release_1.5
release/release_1.8
release/release_1.9
release/release_2.0
release/release_2.1
release/release_2.10
release/release_2.11
release/release_2.12
release/release_2.13
release/release_2.14
release/release_2.15
release/release_2.2
release/release_2.3
release/release_2.4
release/release_2.5
release/release_2.6
release/release_2.7
release/release_2.8
release/release_2.9
-
0403a2d223
开放分组类型限制工艺参数字段显示
liaodanlong
2025-04-21 09:52:52 +08:00 -
7a4c3f155c
开放分组类型限制工艺参数字段显示
liaodanlong
2025-04-21 09:52:24 +08:00 -
acd8d9c758
Accept Merge Request #2019: (feature/6694 -> develop)
胡尧
2025-04-21 09:23:48 +08:00 -
d33a801f89
Accept Merge Request #2018: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-21 09:20:29 +08:00 -
a74c07f0bb
字段名写错
liaodanlong
2025-04-21 09:19:36 +08:00 -
9f1cac0789
去掉多余的代码
胡尧
2025-04-21 09:10:20 +08:00 -
fcd0319a9c
Accept Merge Request #2017: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-18 17:29:28 +08:00 -
ed2c76adf1
工厂日历独立菜单到计划模块
liaodanlong
2025-04-18 17:24:41 +08:00 -
1d45486e20
Accept Merge Request #2016: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-18 16:46:38 +08:00 -
d209d40356
sf-制造-表面工艺-菜单名称修改
liaodanlong
2025-04-18 16:39:09 +08:00 -
3355731632
Accept Merge Request #2015: (feature/6694 -> develop)
胡尧
2025-04-18 16:07:01 +08:00 -
ddd902cad8
修改创建表面工艺产品时表面工艺参数不能为空的问题
liaodanlong
2025-04-18 16:06:08 +08:00 -
e5566edd7c
sf_同步cloud表面工艺可选参数创建产品,修改产品名命名规则
liaodanlong
2025-04-18 15:45:32 +08:00 -
ea0f9d6ee2
sf-制造-作业-表单详情内,可选工艺参数手动新增编码规则跟外协服务产品名称不正确
liaodanlong
2025-04-18 15:45:00 +08:00 -
79006e062a
1.限制工序-作业配置 产品只能选中一个 2.添加产品下拉框查询过滤 3.产品选择框可以跳转到产品页面
liaodanlong
2025-04-18 15:44:13 +08:00 -
ee9783d4a6
增加打印模块,增加工单下发后打印程序单
胡尧
2025-04-18 14:50:03 +08:00 -
ff7c4a9ce7
Accept Merge Request #2014: (feature/制造功能优化 -> develop)
马广威
2025-04-18 14:40:31 +08:00 -
48b94e8d84
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
mgw
2025-04-18 14:39:11 +08:00 -
a395994a1c
调整设备可用率接口
mgw
2025-04-18 14:38:39 +08:00 -
43c29e30b0
暂时注释稼动率接口
mgw
2025-04-18 14:18:41 +08:00 -
be639d7631
Accept Merge Request #2013: (feature/页面显示优化 -> develop)
管欢
2025-04-18 14:08:29 +08:00 -
66c745af3c
排序优化
guanhuan
2025-04-18 13:22:25 +08:00 -
29ee275840
增加上传支持格式
mgw
2025-04-18 13:00:45 +08:00 -
f92b844c16
Accept Merge Request #2012: (feature/页面显示优化 -> develop)
管欢
2025-04-18 09:50:58 +08:00 -
63870ed7a9
Accept Merge Request #2011: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-18 09:07:24 +08:00 -
558c99f48b
产品表面工艺参数更名为工艺参数
liaodanlong
2025-04-18 09:00:06 +08:00 -
1264a4305e
Accept Merge Request #2010: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-17 17:13:54 +08:00 -
a4f8183654
更新工艺外协流程的采购单查询逻辑
liaodanlong
2025-04-17 17:02:43 +08:00 -
3ea8e9d35f
Accept Merge Request #2009: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-17 16:34:27 +08:00 -
3fb2890bf1
更新工艺外协流程的报错问题
liaodanlong
2025-04-17 16:32:18 +08:00 -
0c3ba5c172
Accept Merge Request #2008: (feature/tool_standard_library_process -> develop)
廖丹龙
2025-04-17 14:39:18 +08:00 -
1b22d02700
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
liaodanlong
2025-04-17 14:35:24 +08:00 -
962931bc9d
外协流程更改
liaodanlong
2025-04-17 14:29:06 +08:00 -
9cfc8418ec
优化库存排序
guanhuan
2025-04-17 13:44:25 +08:00 -
e4af2aacb8
Accept Merge Request #2007: (feature/6694 -> develop)
胡尧
2025-04-17 13:18:03 +08:00 -
c67944f689
增加工单下发时打印编程文件pdf的功能
胡尧
2025-04-17 13:15:48 +08:00 -
9c713c2a37
设备增加网络配置,增加编程文件传输接口
胡尧
2025-04-16 17:21:36 +08:00 -
53d4be596f
调整日志
mgw
2025-04-16 11:26:21 +08:00 -
195302b67f
调整月合格率
mgw
2025-04-16 11:20:35 +08:00 -
6cb5e909d4
调整稼动率
mgw
2025-04-16 11:12:04 +08:00 -
cb98f5cf25
Accept Merge Request #2006: (feature/6609 -> develop)
胡尧
2025-04-16 09:30:28 +08:00 -
f87a6690fe
Accept Merge Request #2005: (feature/6684 -> develop)
胡尧
2025-04-16 09:29:59 +08:00 -
b041feb297
Merge branch 'release/release_2.11'
胡尧
2025-04-15 20:54:53 +08:00 -
06e9d5a538
Accept Merge Request #2004: (feature/功能刀具拆解单优化_1 -> develop)
release/release_2.11
禹翔辉
2025-04-15 17:22:50 +08:00 -
b9aac6c558
Merge branch 'feature/功能刀具拆解单优化' into feature/功能刀具拆解单优化_1
yuxianghui
2025-04-15 17:21:31 +08:00 -
2de0e9f02f
处理功能刀具预警没有自动创建预警记录和拆解单问题
yuxianghui
2025-04-15 17:20:16 +08:00 -
722b601890
Accept Merge Request #2003: (release/release_2.11 -> develop)
胡尧
2025-04-15 17:14:51 +08:00 -
20722c12b8
修改质检单的质检员字段
胡尧
2025-04-15 17:08:43 +08:00 -
2100ee9590
增加备注
胡尧
2025-04-15 17:08:17 +08:00 -
56f2ea0356
Accept Merge Request #2002: (feature/功能刀具拆解单优化 -> develop)
禹翔辉
2025-04-15 16:58:28 +08:00 -
6ff8395916
增加向pdf中添加二维码的功能
胡尧
2025-04-15 16:57:32 +08:00 -
bc85c457ad
功能刀具添加状态变更跟踪
yuxianghui
2025-04-15 16:46:49 +08:00 -
085e6359ce
编程单增加二维码
胡尧
2025-04-15 15:47:35 +08:00 -
7eeea92a3e
Accept Merge Request #2001: (feature/功能刀具拆解单优化 -> develop)
禹翔辉
2025-04-15 15:09:36 +08:00 -
d672f3f4d7
功能刀具拆解单添加可以选择线边刀库的功能刀具进行拆解
yuxianghui
2025-04-15 15:05:23 +08:00 -
c79cf2e5ad
Accept Merge Request #2000: (feature/前端样式修改 -> develop)
黄焱
2025-04-15 11:26:42 +08:00 -
33a5fc0ff4
删除多余字段
hyyy
2025-04-15 11:24:45 +08:00 -
2dcaa25952
Accept Merge Request #1999: (feature/前端样式修改 -> develop)
黄焱
2025-04-15 09:43:20 +08:00 -
ba88070fad
修改刀片刀杆样式
hyyy
2025-04-15 09:31:42 +08:00 -
3f940992be
Accept Merge Request #1998: (feature/制造功能优化 -> develop)
马广威
2025-04-14 17:24:04 +08:00 -
197ae6bc01
去掉基础数据
mgw
2025-04-14 17:22:27 +08:00 -
07336326ce
优化稼动率接口
mgw
2025-04-14 17:16:38 +08:00 -
c93553e78e
增加稼动率接口
mgw
2025-04-14 16:42:33 +08:00 -
0db31f7936
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
liaodanlong
2025-04-14 15:24:22 +08:00 -
61a3cf606e
表面工艺数据内置与数据同步调整
liaodanlong
2025-04-14 15:23:47 +08:00 -
91d79008e1
故障时长提取
mgw
2025-04-14 11:21:24 +08:00 -
8cdf77f609
Accept Merge Request #1997: (feature/功能刀具组装初始化优化 -> develop)
禹翔辉
2025-04-14 10:34:47 +08:00 -
37edc858c2
1
yuxianghui
2025-04-14 10:32:26 +08:00 -
17fdf20e03
功能刀具组装自动根据BOM配置初始物料信息优化
yuxianghui
2025-04-14 10:30:51 +08:00 -
a896108638
产品主数据【条码】存储模型ID
胡尧
2025-04-11 16:49:18 +08:00 -
026697f363
修改sf定时任务不在部署时更新配置
胡尧
2025-04-11 16:12:58 +08:00 -
ec934abc42
Accept Merge Request #1996: (feature/6679 -> develop)
胡尧
2025-04-11 16:04:02 +08:00 -
cc030957fb
给仓储岗增加修改工单的权限
feature/6679
胡尧
2025-04-11 16:02:24 +08:00 -
87786dbd80
调整故障时长
mgw
2025-04-11 14:16:18 +08:00 -
9d0ffd23b2
Accept Merge Request #1995: (feature/刀具组装扫描优化 -> develop)
禹翔辉
2025-04-10 14:27:04 +08:00 -
3fb56f15c8
处理功能刀具组装时,有时扫描货位编码验证刀具信息扫不到货位的问题
yuxianghui
2025-04-10 14:24:25 +08:00 -
bdf4696c08
调整待完成工单明细
mgw
2025-04-09 16:56:53 +08:00 -
6c926bf081
调整质检取值
mgw
2025-04-09 16:39:21 +08:00 -
ddb0c304b9
修改字段路径
mgw
2025-04-09 15:57:13 +08:00 -
cf8c14e738
调整查询范围
mgw
2025-04-09 15:22:41 +08:00 -
6bd6816495
Accept Merge Request #1994: (feature/前端样式修改 -> develop)
黄焱
2025-04-09 14:03:06 +08:00 -
2bae98950e
功能刀具组装优化需求
hyyy
2025-04-09 13:57:48 +08:00 -
ec379a7541
Accept Merge Request #1993: (feature/6679 -> develop)
胡尧
2025-04-08 17:08:20 +08:00 -
119acf1543
Accept Merge Request #1992: (feature/6686 -> develop)
胡尧
2025-04-08 17:07:57 +08:00 -
0f6f1aae24
Accept Merge Request #1991: (feature/功能刀具拆解优化_1 -> develop)
禹翔辉
2025-04-08 17:01:56 +08:00 -
c40ecfb6ce
将寿命到期拆解创建的组装单添加到对应安全库存组装单列表
yuxianghui
2025-04-08 17:00:00 +08:00 -
a51a4c2fbb
Accept Merge Request #1990: (feature/功能刀具拆解优化_1 -> develop)
禹翔辉
2025-04-08 15:59:04 +08:00 -
315e2aa03d
功能刀具拆解寿命到期刀具创建新的组装单时,添加几个参数的值。
yuxianghui
2025-04-08 15:56:08 +08:00 -
10bea40159
增加不同工作中心配置相同接驳站的功能
胡尧
2025-04-08 10:29:29 +08:00 -
78ba8d0ead
Accept Merge Request #1989: (feature/制造功能优化 -> develop)
马广威
2025-04-08 10:11:41 +08:00 -
e61742cc5b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
mgw
2025-04-08 10:11:05 +08:00 -
d0d1a640d9
调整报告页码
mgw
2025-04-08 10:10:36 +08:00 -
e613a2f283
Accept Merge Request #1987: (feature/功能刀具拆解优化 -> develop)
禹翔辉
2025-04-08 09:59:09 +08:00 -
88e83c0e14
Accept Merge Request #1988: (feature/制造功能优化 -> develop)
马广威
2025-04-08 09:48:48 +08:00 -
f912a81e7b
调整报告产品取值
mgw
2025-04-08 09:48:05 +08:00 -
e09226e966
新增对寿命未到期且位置在线边刀库的功能刀具进行拆解时,不直接报错,而是进行二次确认是否进行拆除。
yuxianghui
2025-04-08 09:44:46 +08:00 -
8a7a90ff0d
agv配置不可修改
feature/6686
胡尧
2025-04-07 17:04:34 +08:00 -
e9719a2b5b
功能刀具组装时自动根据BOM配置选取物料逻辑优化为:一直查找直到找到一个满足条件的物料货位,如果没有就给提示。
release/release_2.10
yuxianghui
2025-04-02 13:47:39 +08:00 -
d05a3606c3
Merge branch 'release/release_2.10'
胡尧
2025-04-02 11:50:07 +08:00 -
4b5c3b383b
对工单的page页进行调整
yuxianghui
2025-04-02 10:58:25 +08:00