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
-
22f36d095c
跟新
feature/7229
huziyang@jikimo.com
2025-07-18 16:18:09 +08:00 -
cdb3cc7c03
需求计划详情调拨单显示
feature/物料需求计划管理
guanhuan
2025-07-18 15:33:51 +08:00 -
3872cb3b93
产品胚料-追溯取值问题
feature/7277_7280
陈赓
2025-07-18 15:15:58 +08:00 -
62f0578ce8
Accept Merge Request #2293: (feature/7254_new -> develop)
develop
刘磊
2025-07-18 15:12:05 +08:00 -
b2a0899553
Accept Merge Request #2294: (feature/7230 -> develop)
刘磊
2025-07-18 15:11:41 +08:00 -
e0c1e27344
夹具型号相关数据表的优化
feature/7230
陈赓
2025-07-18 14:24:33 +08:00 -
8434172fec
夹具型号相关数据表的优化
陈赓
2025-07-18 11:10:50 +08:00 -
a920d4b4b8
夹具型号相关数据表的优化
陈赓
2025-07-18 09:58:44 +08:00 -
4609ddfa7a
夹具型号相关数据表的优化
陈赓
2025-07-18 09:55:21 +08:00 -
e73c0b15ea
夹具型号相关数据表的优化
陈赓
2025-07-18 09:26:30 +08:00 -
19417dd569
库存移动新增需求计划关联
guanhuan
2025-07-17 17:41:04 +08:00 -
6fa4590dbd
追溯取值问题
陈赓
2025-07-17 16:01:51 +08:00 -
bba9e8e8a8
采购到货通知需求更改
feature/7248
chenye
2025-07-17 15:20:34 +08:00 -
2347ed9cb3
材料型号增加是否磁吸
feature/7254_new
陈赓
2025-07-17 14:12:35 +08:00 -
9af458b11e
是否磁吸
feature/7254
陈赓
2025-07-17 11:36:24 +08:00 -
f4829f57a1
还原
陈赓
2025-07-17 11:08:42 +08:00 -
9f07bbdeae
屏蔽代码
feature/增加模块完整性验证
胡尧
2025-07-16 17:54:13 +08:00 -
20415d0d3f
下拉选项检测
hyyy
2025-07-16 17:37:29 +08:00 -
4d959eab59
新增产线类型方法校验
guanhuan
2025-07-16 15:46:03 +08:00 -
e4c3435840
Accept Merge Request #2292: (feature/增加模块完整性验证 -> develop)
胡尧
2025-07-16 15:04:01 +08:00 -
2a7048dafd
去掉多余的js
胡尧
2025-07-16 15:03:23 +08:00 -
d580f47885
追溯
feature/7280
陈赓
2025-07-16 14:34:07 +08:00 -
2bb215f9df
Accept Merge Request #2291: (feature/增加模块完整性验证 -> develop)
胡尧
2025-07-16 14:33:35 +08:00 -
a2be3a0dbf
去掉多余的js文件
胡尧
2025-07-16 14:32:37 +08:00 -
1f4ceab377
Accept Merge Request #2290: (feature/7253 -> develop)
李晓斌
2025-07-16 14:10:37 +08:00 -
94d727e8e0
Bug_7262_lxb_commit
feature/7253
lixiaobin@jikimo.com
2025-07-16 14:06:58 +08:00 -
cdf6a36c30
Redis同步
陈赓
2025-07-16 11:49:41 +08:00 -
42d9f894dd
Accept Merge Request #2289: (feature/7253 -> develop)
李晓斌
2025-07-16 11:23:08 +08:00 -
9416d1c1a0
BUG_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-16 11:20:26 +08:00 -
7dd44ca12c
Accept Merge Request #2288: (feature/物料需求计划管理 -> develop)
管欢
2025-07-16 09:41:06 +08:00 -
5a98b20988
下达计划按钮重复点击生成重复数据
guanhuan
2025-07-16 09:32:28 +08:00 -
344b79d76b
bom追溯方式
feature/7277
陈赓
2025-07-16 09:12:31 +08:00 -
2738085a1e
Accept Merge Request #2287: (feature/7253 -> develop)
李晓斌
2025-07-15 16:56:26 +08:00 -
61c1fdbd05
Bug_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-15 16:53:52 +08:00 -
556b9fdfbf
修改bom追溯方式
陈赓
2025-07-15 16:48:19 +08:00 -
7eea5a0ff2
重复点击
hyyy
2025-07-15 16:25:28 +08:00 -
714c68c0c1
Accept Merge Request #2286: (feature/7253 -> develop)
李晓斌
2025-07-15 14:35:11 +08:00 -
f3e7ba7f68
BUG_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-15 14:17:38 +08:00 -
df589b43e7
BUG_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-15 14:13:01 +08:00 -
8bdc65c626
BUG_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-15 14:09:14 +08:00 -
0c3407572f
需求计划详情
guanhuan
2025-07-15 11:51:14 +08:00 -
e5404efb60
批量下达计划禁用
hyyy
2025-07-15 11:39:20 +08:00 -
8e8f5eb8be
feat: 新增 Redis 缓存同步相关模块与控制器
陈赓
2025-07-15 11:29:18 +08:00 -
cdbc277a94
feat: 新增 Redis 工具与控制器,更新同步逻辑相关文件
陈赓
2025-07-15 11:28:12 +08:00 -
46f60028aa
需求位置修改
guanhuan
2025-07-15 10:40:19 +08:00 -
bfc071debd
需求位置修改
guanhuan
2025-07-15 10:34:28 +08:00 -
7fca59322e
Accept Merge Request #2285: (feature/7253 -> develop)
李晓斌
2025-07-15 09:42:48 +08:00 -
42694c1ac6
BUG_7276_lxb_commit
lixiaobin@jikimo.com
2025-07-15 09:39:50 +08:00 -
e88fc012ec
Accept Merge Request #2284: (feature/物料需求计划管理 -> develop)
管欢
2025-07-14 16:16:20 +08:00 -
ff7cd9c927
校验修改
guanhuan
2025-07-14 16:13:49 +08:00 -
588b7d340f
Merge branch 'refs/heads/develop' into feature/物料需求计划管理
guanhuan
2025-07-14 15:52:10 +08:00 -
5902d61f13
新增单件用量显示
guanhuan
2025-07-14 15:39:37 +08:00 -
8cfad007b9
Accept Merge Request #2283: (feature/7249 -> develop)
陈烨
2025-07-14 14:29:24 +08:00 -
5008210176
合并 develop 分支到 feature/7249
feature/7249
chenye
2025-07-14 14:21:44 +08:00 -
f487ab4cce
提交7268,7271等bug修改
chenye
2025-07-14 14:15:28 +08:00 -
0441f345ef
新增单件用量显示
guanhuan
2025-07-14 14:11:28 +08:00 -
3527105e83
Accept Merge Request #2282: (feature/7253 -> develop)
李晓斌
2025-07-14 11:41:47 +08:00 -
88e4cfb541
Debug-7269_lxb_commit
lixiaobin@jikimo.com
2025-07-14 11:32:29 +08:00 -
5a175c078f
Accept Merge Request #2281: (feature/物料需求计划管理 -> develop)
管欢
2025-07-14 10:55:52 +08:00 -
20980bed9d
修复客供料产品下达计划,第二个计划下达报错
guanhuan
2025-07-14 10:54:17 +08:00 -
9b94357439
Accept Merge Request #2280: (feature/7249 -> develop)
陈烨
2025-07-14 08:50:26 +08:00 -
5ae3c5dd47
Merge branch 'develop' into feature/7249
chenye
2025-07-11 17:57:31 +08:00 -
60be14dda2
修改bug7264和7265
chenye
2025-07-11 17:49:05 +08:00 -
f0ff7c4a74
Accept Merge Request #2279: (feature/7249 -> develop)
陈烨
2025-07-11 17:01:05 +08:00 -
2b6e2fe31b
Merge branch 'develop' into feature/7249
chenye
2025-07-11 16:48:24 +08:00 -
f1390e47c9
提交7252bug修改内容
chenye
2025-07-11 16:36:18 +08:00 -
c7cd0a6a69
Accept Merge Request #2278: (feature/7253 -> develop)
李晓斌
2025-07-11 11:40:18 +08:00 -
fa5307a2ea
7253_BUG修复
lixiaobin@jikimo.com
2025-07-11 11:13:08 +08:00 -
f66f275719
Resolve merge conflicts
feature/7231
lixiaobin@jikimo.com
2025-07-11 10:49:15 +08:00 -
07e4cdcaa0
Accept Merge Request #2276: (feature/7249 -> develop)
陈烨
2025-07-11 10:19:58 +08:00 -
0cb473f209
7253_BUG修复
lixiaobin@jikimo.com
2025-07-11 10:19:20 +08:00 -
ff5925eb06
Merge branch refs/heads/develop into refs/heads/feature/7249
陈烨
2025-07-11 10:10:56 +08:00 -
2a7e07b4c0
提交7249和7246需求
chenye
2025-07-10 17:44:10 +08:00 -
4706bfe85e
计划量字段被修改成了别的字段名
guanhuan
2025-07-10 17:36:37 +08:00 -
2f21c510bd
Accept Merge Request #2274: (feature/7231 -> develop)
李晓斌
2025-07-10 17:01:05 +08:00 -
7adaa7e79b
7231_lxb_commit
lixiaobin@jikimo.com
2025-07-10 16:33:43 +08:00 -
166d10e7d9
Accept Merge Request #2273: (feature/禁止负库存 -> develop)
禹翔辉
2025-07-10 15:24:52 +08:00 -
36d6a3ed4c
Accept Merge Request #2275: (feature/物料需求计划管理 -> develop)
管欢
2025-07-10 15:18:35 +08:00 -
650ff9b3e2
采购申请状态修复
guanhuan
2025-07-10 15:11:32 +08:00 -
559c6bfb1d
7231_lxb_commit
lixiaobin@jikimo.com
2025-07-10 14:29:06 +08:00 -
e83d3f8a1c
修复齐套检查产品制造完成,坯料的状态又变成了未齐套
guanhuan
2025-07-10 14:21:10 +08:00 -
ac0966f3bf
修复齐套检查产品制造完成,坯料的状态又变成了未齐套
guanhuan
2025-07-10 14:20:15 +08:00 -
1f93ba3b42
修复未保存需求计划删除明细行问题,打印列表显示
guanhuan
2025-07-10 14:11:31 +08:00 -
4d2ab82645
修复采购类型根据供货方式来赋值
guanhuan
2025-07-10 08:57:38 +08:00 -
7b4499184d
添加禁止负库存功能
feature/禁止负库存
yuxianghui
2025-07-09 16:58:20 +08:00 -
d02babaf0a
修复需求计划生成的bom编码时间少8小时
guanhuan
2025-07-09 16:57:20 +08:00 -
acb6fd42ca
采购明细加需求计划明细字段
guanhuan
2025-07-09 16:46:46 +08:00 -
c2cb24c60b
需求计划优化
guanhuan
2025-07-09 11:38:40 +08:00 -
3be1c4c529
Accept Merge Request #2272: (feature/物料需求计划管理 -> develop)
管欢
2025-07-09 10:26:45 +08:00 -
60e7415a27
更新报错
guanhuan
2025-07-09 10:25:19 +08:00 -
22763903a4
Accept Merge Request #2271: (feature/物料需求计划管理 -> develop)
管欢
2025-07-09 10:19:50 +08:00 -
4c6cf0ba5e
更新报错
guanhuan
2025-07-09 09:54:58 +08:00 -
02012b2c52
Accept Merge Request #2270: (feature/物料需求计划管理 -> develop)
管欢
2025-07-09 09:43:44 +08:00 -
a2b2efed7d
交货数量修改
guanhuan
2025-07-08 15:46:32 +08:00 -
925c59e1fe
采购申请添加需求明细字段
guanhuan
2025-07-08 11:25:00 +08:00 -
f86e27b45e
Accept Merge Request #2269: (feature/新增plm模块 -> develop)
胡尧
2025-07-07 15:00:13 +08:00 -
b704f99a29
删除plm模块代码
feature/新增plm模块
胡尧
2025-07-07 14:59:48 +08:00 -
1ac6314f5f
Accept Merge Request #2268: (feature/新增plm模块 -> develop)
胡尧
2025-07-07 12:16:56 +08:00 -
8b3eef1256
新增
胡尧
2025-07-07 11:59:14 +08:00 -
22ccb095ee
需求计划下达计划
guanhuan
2025-07-07 10:46:27 +08:00