 Yang
|
08a3102b7b
|
commit by yzf
|
2 years ago |
|
Yang
|
010b0613d5
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
Leo
|
64af77efec
|
修改协同中确认协同后协同进度
|
2 years ago |
|
Yang
|
a0a417bb98
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
a657f8e301
|
commitby yzf
|
2 years ago |
|
Leo
|
dd87d33da1
|
修改协同无法确认路线的BUG
|
2 years ago |
|
Leo
|
d164970400
|
物料路线新增物料增加重复物料描述的限制判断
|
2 years ago |
|
Yang
|
1a8a71a136
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
67d5df87dc
|
commoit by yzf
|
2 years ago |
|
Leo
|
501f6b3237
|
格式化配方接口传入的版本号
数值情况下格式为：0.0000
非数值情况下保留原样
|
2 years ago |
|
Leo
|
3592b946c7
|
协同包材相关事项不生产子包材事项
|
2 years ago |
|
Leo
|
f1e78eff0f
|
修改视图下载
|
2 years ago |
|
Leo
|
c82ca5b5a9
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Leo
|
fa4a32529c
|
物料路线新增增加物料编号
|
2 years ago |
|
Yang
|
fcc04bcbbf
|
commit by yzf
|
2 years ago |
|
Yang
|
9d3fbdf41d
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
720aa827c9
|
commit by yzf
|
2 years ago |
|
Leo
|
ff6f23683d
|
合并
|
2 years ago |
|
Leo
|
eee23d6a5a
|
web.cofig
|
2 years ago |
|
Yang
|
67775d8c05
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Yang
|
db48252178
|
commit by yzf
|
2 years ago |
|
Leo
|
7186bd8c02
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
Leo
|
9185286850
|
修改物料路线修改时物料排序
|
2 years ago |
|
Yang
|
54b47d442a
|
commit by yzf
|
2 years ago |
 leo
|
78de690fdf
|
修改替代料事项创建逻辑
|
2 years ago |
|
leo
|
cc0afb10fe
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
leo
|
a04b8ac0a3
|
修改导入字段顺序
|
2 years ago |
|
Yang
|
b35b6d2441
|
commit by yzf
|
2 years ago |
|
leo
|
0878253397
|
Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
|
2 years ago |
|
leo
|
2d9d32ba31
|
修改物料新增路线中，修改物料描述后，路线和视图中的物料名称没有变更的BUG
|
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 |
