 Yang
|
b35b6d2441
|
commit by yzf
|
2 years ago |
|
Yang
|
39c03826c1
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
8e6d8f23e7
|
commit by yzf
|
2 years ago |
 leo
|
2a8508ed85
|
修改协同物料分类任务后，不生成其他类型物料事项的BUG
|
2 years ago |
|
Yang
|
59bf61e601
|
commit by yzf
|
2 years ago |
|
Yang
|
bacad3f6d9
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
a35009ffe0
|
commit by yzf
|
2 years ago |
|
leo
|
ad6938e16f
|
1.修改协同是否下载BOM的逻辑：改为用选择的试验号判断
2.协同是否有BomJson的结果传到前端，用于判断是否显示配方视图
|
2 years ago |
|
Yang
|
97f17d7b48
|
commit by yzf
|
3 years ago |
|
leo
|
86c39be44a
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
c508ed35bd
|
取消修改旧物料的协同ID
|
3 years ago |
|
Yang
|
02f9e43a4c
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
6f94573686
|
commit by yzf
|
3 years ago |
|
leo
|
375b108ca0
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
f4848df636
|
修改协同物料分类时报错的问题
前台传入的FTypeID2要删除，materialView中不存在这个字段
|
3 years ago |
|
Yang
|
6fd63a83b4
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
3e148fa2ef
|
commit by yzf
|
3 years ago |
|
leo
|
e18b5785c0
|
协同BUG修改
|
3 years ago |
|
Yang
|
b57cc30bc6
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
0ecd7f6410
|
commit by yzf
|
3 years ago |
|
leo
|
19538dc95f
|
修改视图查询逻辑
原逻辑：根据用户工厂取视图
现逻辑：取消根据用户工厂
|
3 years ago |
|
leo
|
b348a41824
|
日志导出修改
|
3 years ago |
|
leo
|
43343af9e6
|
修改日志，增加操作模块
|
3 years ago |
|
leo
|
e85db5311e
|
修改物料路线BUG
修改导出视图文件名称
|
3 years ago |
|
leo
|
0ac109c75d
|
物料路线BUG修复
|
3 years ago |
|
leo
|
5ebe2526ca
|
物料路线修改物料类型的更新
|
3 years ago |
|
Yang
|
16096d7f1f
|
commit by yzf
|
3 years ago |
|
Yang
|
ef181c2af2
|
commit by yzf
|
3 years ago |
|
Yang
|
3d536481dc
|
commit by yzf
|
3 years ago |
|
Yang
|
cf3c6c8ce9
|
commit by yzf
|
3 years ago |
|
Yang
|
d5d0c615e5
|
commit by yzf
|
3 years ago |
|
leo
|
98622019ef
|
修改一下原料视图的类型
|
3 years ago |
|
leo
|
2e7cffe42b
|
修改物料路线权限
|
3 years ago |
|
leo
|
a603c1d45b
|
修改物料新增路线的权限
|
3 years ago |
|
Yang
|
d3b0e7b80f
|
commit by yzf
|
3 years ago |
|
Yang
|
0c28819501
|
修改权限
|
3 years ago |
|
leo
|
cc7d09212e
|
修改事项权限
|
3 years ago |
|
Yang
|
92f6fdf923
|
commit by yzf
|
3 years ago |
|
Yang
|
6055386b33
|
commit by yzf
|
3 years ago |
|
Yang
|
942f38826f
|
commit by yzf
|
3 years ago |
|
Yang
|
bb6dfe5a40
|
commit by yzf
|
3 years ago |
|
Yang
|
925d3c3215
|
COMMIT BY YZF
|
3 years ago |
|
leo
|
59cf0b64e7
|
菜单权限修改
|
3 years ago |
|
leo
|
dbf946a3a8
|
修改物料分类任务保存时，没有更新协同的BUG
|
3 years ago |
|
Yang
|
3c0d93c8ba
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
9e25febd77
|
commit by yzf
|
3 years ago |
|
leo
|
d309b5e8bc
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
67e4690927
|
修改物料新增相关问题
|
3 years ago |
|
Yang
|
abc90d78b9
|
commit by yzf
|
3 years ago |
|
Yang
|
7142250dd6
|
commit by yzf
|
3 years ago |
|
Yang
|
13ebe76eba
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
4fc4ec11b9
|
物料新增路线增加视图导出功能
|
3 years ago |
|
Yang
|
5f8cb48afa
|
commit by yzf
|
3 years ago |
|
leo
|
b907e1224c
|
修改BUG
|
3 years ago |
|
leo
|
7214bd1a5b
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
8879212606
|
修改协同视图的查询条件
|
3 years ago |
|
Yang
|
a8a9b414b6
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
da884b4b62
|
commit by yzf
|
3 years ago |
|
leo
|
f6a928458b
|
包规存在判断
|
3 years ago |
|
leo
|
23fa7c2a17
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
85a2049429
|
修改物料路线调用MDM更新物料号
修改物料路线筛选
|
3 years ago |
|
Yang
|
ea341bd003
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
3f2516e262
|
commit by yzf
|
3 years ago |
|
leo
|
8eac275751
|
菜单调整
|
3 years ago |
|
leo
|
84a26cd395
|
修改日志模块
|
3 years ago |
|
Yang
|
0d42f66266
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
b9d3142cdc
|
commit by yzf
|
3 years ago |
|
leo
|
33f1bc2385
|
物料修改路线
|
3 years ago |
|
Yang
|
e832745880
|
commit by yzf
|
3 years ago |
|
Yang
|
b9a9a63a62
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
542460ed22
|
commit by yzf
|
3 years ago |
|
leo
|
e098115019
|
新增物料修改
|
3 years ago |
|
Yang
|
2d515ed0c9
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
# Conflicts:
# FactorySystemApi/Controllers/ViewController.cs
|
3 years ago |
|
Yang
|
20c5923aef
|
commit by yzf
|
3 years ago |
|
leo
|
6a1f51bf5a
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
6282225de7
|
物料新增路线修改
|
3 years ago |
|
Yang
|
480e3c1b0f
|
commit by yzf
|
3 years ago |
|
Yang
|
2e6dc08f17
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
# Conflicts:
# FactorySystemApi/Controllers/MaterialTaskController.cs
# FactorySystemApi/Controllers/MaterialTeamworkController.cs
# FactorySystemBll/MaterialBll.cs
# FactorySystemBll/MaterialTaskBll.cs
# FactorySystemBll/MaterialTeamworkBll.cs
|
3 years ago |
|
leo
|
bb90d13180
|
新增物料路线
|
3 years ago |
|
Yang
|
25b05482df
|
新增试验号变更流程
|
3 years ago |
|
Yang
|
d00bae09d4
|
commit by yzf
|
3 years ago |
|
Yang
|
5d6c57a606
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
b97556f8af
|
修改替代物料确认
|
3 years ago |
|
leo
|
7dca50e9ff
|
新增物料分类事项
|
3 years ago |
|
Yang
|
c0d0f9d857
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
Yang
|
97c786cf6b
|
commit by yzf
|
3 years ago |
|
leo
|
a677c0a171
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
3 years ago |
|
leo
|
4097150bfa
|
视图编辑页面字段补充完整
|
3 years ago |
|
Yang
|
1b7b9247a9
|
插入配置物料类型任务
|
3 years ago |
|
leo
|
38baee10f2
|
添加项目文件。
|
3 years ago |
