sfms3.0-ui

Commit Graph

Select branches

Hide Pull Requests

deli_huaxiang_jimu

deli_scp

hella_chenfang

hella_online_20240803

hella_online_20240815

hella_online_20240816

hella_online_20240819

hella_online_20240821

hella_online_20240823

hella_online_20240828

hella_online_20240829

hella_online_20240904

hella_online_20240906

hella_online_20240911

hella_online_20240913

hella_online_20240919

hella_online_20240924

hella_online_20240927

hella_online_20241011

hella_online_20241017

hella_online_20241024

hella_online_20241030

hella_online_20241107

hella_online_20241114

hella_online_20241121

hella_online_20241128

hella_online_20241205

hella_online_20241212

hella_online_20241212_pandian

hella_online_20241219

hella_online_20241226

hella_online_20250102

hella_online_20250109

hella_online_20250116

hella_online_20250123

hella_online_20250213

hella_online_20250220

hella_online_20250227

hella_online_20250306

hella_online_20250313

hella_online_20250328

hella_online_20250417

hella_online_20250508

hella_online_20250522

hella_online_20250529

hella_online_20250710

hella_online_20250724

hella_onlinesettlement

hella_zhaoxuebing

index_online20241231

intes_online20250115

intex

intex_20241211

intex_20250617_panDian

intex_label_print

intex_onlin20250418

intex_online20241111

intex_online20241205

intex_online20241216

intex_online20241224

intex_online20241228

intex_online20250117

intex_online20250120

intex_online20250124

intex_online20250220

intex_online20250224

intex_online20250311

intex_online20250327

intex_online20250408

intex_online20250409

intex_online20250410

intex_online20250427

intex_online20250506

intex_online20250509

intex_online20250522

intex_online20250523

intex_online20250528

intex_online20250609

intex_online20250629

intex_online20250704

intex_online20250710

intex_online20250724

intex_online20250725

intex_online20250725_YT-2905

intex_online_narushoulingshu

intex_online_yejiaxing

intex_onlinescplabel

intex_onlinewmslabel

intex_pandian

intex_zhaoxuebing

linshi20240813

master

master_hella

master_hella_20240701

syhx

5.1版本

合并到了海拉

合并到海拉

64b682900b 增加报废收货赵雪冰 2024-03-26 11:15:00 +0800
fedf2b6cd3 生产计划添加字段子表物料及数量陈薪名 2024-03-25 18:31:48 +0800
c683240736 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-25 15:40:33 +0800
57223d8ec4 制品收货拆分预生成收货和装配收货陈薪名 2024-03-25 15:40:31 +0800
60df601b89 隐藏是否寄存订单赵雪冰 2024-03-25 15:32:09 +0800
f19a364694 隐藏超收百分比赵雪冰 2024-03-25 15:20:23 +0800
b8085723b3 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-25 14:30:13 +0800
635915b325 修改数量赵雪冰 2024-03-25 14:30:07 +0800
1613ac1331 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-25 10:18:14 +0800
5e7b7df950 生产计划拆分陈薪名 2024-03-25 10:18:12 +0800
479f3e2753 1、工位关联工序 bjang03 2024-03-22 17:29:29 +0800
d0283ebf0d Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-22 16:28:13 +0800
d7ed368eb9 从配置获取参数赵雪冰 2024-03-22 16:28:08 +0800
853647367e 1、绑定设备 bjang03 2024-03-22 15:50:26 +0800
11165bba49 1、绑定设备 bjang03 2024-03-22 15:40:57 +0800
469350111e Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-22 15:38:28 +0800
085c894a01 配置参数修改赵雪冰 2024-03-22 15:38:22 +0800
a03fda7834 备货申请物料代码搜索框根据情况展示/隐藏 chenfang 2024-03-22 13:21:44 +0800
256236f05b 修改物料筛选赵雪冰 2024-03-22 11:11:46 +0800
60a902eee3 工位动态获取库区类型 chenfang 2024-03-22 10:53:23 +0800
c65aa6848f 缺少逗号提交赵雪冰 2024-03-22 08:20:27 +0800
0c63376357 缺少逗号修改赵雪冰 2024-03-22 08:12:32 +0800
fead9c5e41 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella chenfang 2024-03-21 19:46:35 +0800
5bbffd1815 直接生成记录设置isForm:false chenfang 2024-03-21 19:46:24 +0800
c78ebe2e3c Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-21 19:42:19 +0800
8c6777cf57 报废出库增加单价和金额赵雪冰 2024-03-21 19:42:13 +0800
83bcede53c 增加部门回显 chenfang 2024-03-21 19:40:16 +0800
b4a886b156 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella chenfang 2024-03-21 19:21:19 +0800
6a7574bd21 库位类型批量修改成库区类型及部门回显 chenfang 2024-03-21 19:21:08 +0800
75d245b49f 自动执行记录隐藏赵雪冰 2024-03-21 19:15:29 +0800
a93863c9c3 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-21 19:06:19 +0800
9a4900624b 制品报废增加单价和金额赵雪冰 2024-03-21 19:06:12 +0800
b761b27b66 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-21 18:40:01 +0800
2ffeff734d 制品收货申请创建包装标签陈薪名 2024-03-21 18:40:00 +0800
a11944b69b 按钮与搜索框隐藏 chenfang 2024-03-21 18:10:17 +0800
6cfce7e008 申请功能直接生成记录isTable设置为false chenfang 2024-03-21 16:43:05 +0800
a5d566ef08 所有申请直接生成记录隐藏isTable设置为false chenfang 2024-03-21 16:41:48 +0800
a08ee77887 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 赵雪冰 2024-03-21 14:28:36 +0800
adff006db0 bom选择库位弹窗赵雪冰 2024-03-21 14:28:29 +0800
e6b0b67c70 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella chenfang 2024-03-21 14:03:08 +0800
12dd83dd16 前端展示字典项 chenfang 2024-03-21 14:02:58 +0800
c0431773d5 修改业务类型与库位赵雪冰 2024-03-21 13:00:48 +0800
af9d48a49c Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-21 12:05:23 +0800
c7be9e729d 筛选条件优化陈薪名 2024-03-21 12:05:16 +0800
9f50d9b00f 备货功能展示字段 chenfang 2024-03-21 09:46:19 +0800
aec0ee7059 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-21 08:48:48 +0800
29692de19e 制品收货申请子子表api修改陈薪名 2024-03-21 08:48:47 +0800
8fe6322e79 注释直接生成记录按钮 chenfang 2024-03-20 20:01:17 +0800
f61c69a103 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella chenfang 2024-03-20 19:54:04 +0800
eb3e519ac2 注释直接生成记录按钮 chenfang 2024-03-20 19:53:53 +0800
d2c5466aee 包装规格字典改字符串陈薪名 2024-03-20 19:49:29 +0800
83c639fac0 制品收货申请创建标签修改参数陈薪名 2024-03-20 19:49:17 +0800
f6691d2830 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-20 18:49:49 +0800
6391f78792 补料任务字段调整陈薪名 2024-03-20 18:49:48 +0800
70fd83bcd2 要货计划遮罩修改赵雪冰 2024-03-20 18:03:17 +0800
59784804ee dialog 遮罩修改陈薪名 2024-03-20 18:00:09 +0800
57c0ff2e59 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-20 17:54:42 +0800
0076db342b dialog 遮罩功能陈薪名 2024-03-20 17:54:41 +0800
ed6f45c1d2 1、绑定设备 bjang03 2024-03-20 17:26:47 +0800
65ee27e41e 1、绑定设备 bjang03 2024-03-20 17:19:04 +0800
11fc5a4261 1、绑定设备 bjang03 2024-03-20 17:08:13 +0800
78a11a2868 物料包装信息调用api修改 chenfang 2024-03-20 16:24:14 +0800
03f9124bda Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella chenfang 2024-03-20 16:12:34 +0800
cf1ea7f393 备货任务新增创建者字段 chenfang 2024-03-20 16:12:24 +0800
ee9a4a9506 去掉校验赵雪冰 2024-03-20 16:09:28 +0800
3b6c504ac0 修改校验逻辑赵雪冰 2024-03-20 14:56:32 +0800
243ee58278 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-20 14:05:53 +0800
051330940e 基础表单遮罩修改陈薪名 2024-03-20 14:05:52 +0800
d8b612f21b 备货添加发货记录搜索框 chenfang 2024-03-20 13:59:21 +0800
3aae780a56 供应商发货校验修改赵雪冰 2024-03-20 13:55:10 +0800
fbbc3fe570 采购订单时间修改i 赵雪冰 2024-03-20 13:01:30 +0800
ab07a0d626 1、工位绑定工组、工序、设备等信息 bjang03 2024-03-20 09:03:53 +0800
4ec4c57b8e 翻包追溯记录陈薪名 2024-03-20 08:39:42 +0800
61f2e6bed9 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella zhousq 2024-03-20 08:23:54 +0800
55c524a4b8 增加antv-x6 插件 zhousq 2024-03-20 08:23:32 +0800
e33e319b1f 备货模块api更新 chenfang 2024-03-19 19:01:31 +0800
6f534ba65d Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella zhousq 2024-03-19 17:29:17 +0800
6e6de6c3c1 2024-3-18 增加工序名称查询 zhousq 2024-03-19 17:28:44 +0800
ad298a619c Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-19 15:44:21 +0800
55bddfc066 直接生产翻包记录陈薪名 2024-03-19 15:44:20 +0800
2a0cc8d1cf 角色修改赵雪冰 2024-03-19 13:27:11 +0800
3568b5647f Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-19 13:22:00 +0800
456c40f0f2 翻包记录陈薪名 2024-03-19 13:21:53 +0800
fe19393e85 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella zhousq 2024-03-19 13:21:13 +0800
717dd78cbc 2024-3-18 工艺路线配置功能 zhousq 2024-03-19 13:20:24 +0800
7db097bdcc 前端展示页面 chenfang 2024-03-19 11:25:31 +0800
e636d0d0e0 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-19 08:34:55 +0800
8e6bbaeba2 翻包记录陈薪名 2024-03-19 08:34:54 +0800
e9a90b0bb6 特殊设置，物料库区配置信息子表允许不添加 chenfang 2024-03-18 17:14:21 +0800
103008495e 增加是否生成标签判断赵雪冰 2024-03-18 16:58:57 +0800
c657fa8410 单据打印移到记录里面赵雪冰 2024-03-18 14:42:22 +0800
d0516146a1 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-18 14:36:21 +0800
61bfc676c9 翻包修改陈薪名 2024-03-18 14:36:20 +0800
38735f196b 发货记录退货记录添加打印按钮陈薪名 2024-03-18 14:36:05 +0800
00230c640f 物料库区配置字段展示 chenfang 2024-03-18 13:02:35 +0800
c23243ef2d 报废转隔离修复验证包装号重复bug chenfang 2024-03-18 09:36:34 +0800
6beab504b3 Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella 陈薪名 2024-03-17 15:32:40 +0800
de122d0ef8 库位标签陈薪名 2024-03-17 15:32:39 +0800
3c3161c074 要货预测隐藏部分字段 chenfang 2024-03-17 15:11:40 +0800
05695dd55d 去掉新增赵雪冰 2024-03-17 15:03:08 +0800