徐腾飞
|
0ed4c90189
|
Merge pull request 'operation增加字段workLineId并进行相应处理,opc和开放协议添加保存接口' (#84) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/84
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
徐腾飞
|
65f6e81512
|
Merge branch 'develop' into feature_om
|
3 years ago |
zhangxin
|
f5031befa0
|
增加worklineId之后修改查询语句
|
3 years ago |
zhangxin
|
95da962340
|
添加子主条码的参数赋值
|
3 years ago |
zhangxin
|
1953b97252
|
添加保存的接口
|
3 years ago |
徐腾飞
|
a85fa655a7
|
Merge pull request '生成包装逻辑' (#83) from feature_packorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/83
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
娄文智
|
d0713edc28
|
生成包装逻辑
|
3 years ago |
娄文智
|
c368df76f5
|
Merge pull request 'Log_PackTemplate添加SiteCode' (#82) from feature_xml into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/82
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
786dac7ade
|
Log_PackTemplate添加SiteCode
|
3 years ago |
zhangxin
|
c2b48579bf
|
添加通过工艺添加开放协议的方法
|
3 years ago |
zhangxin
|
095b3ea4cc
|
新增字段workLineId
|
3 years ago |
徐腾飞
|
0b20f1f2ff
|
Merge pull request '去掉cancelWorkOrder中对mes数据库的操作' (#81) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/81
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
zhangxin
|
e6446f4780
|
去掉cancelWorkOrder中对mes数据库的操作
|
3 years ago |
weichenglei
|
3a27f37657
|
Merge pull request '修改工序依赖派工的逻辑,添加ruleId到opdetail里' (#80) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/80
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
zhangxin
|
0ade8386a7
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
zhangxin
|
501ba05f6a
|
修改工序依赖派工的逻辑
|
3 years ago |
zhangxin
|
90cb2ac83e
|
添加ruleId到opdetail里
|
3 years ago |
zhangxin
|
9e7b597d2b
|
修复拼接artId的bug
|
3 years ago |
徐腾飞
|
6913f5bd35
|
Merge pull request '修改displayTime字段类型' (#79) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/79
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
zhangxin
|
1733a81253
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
zhangxin
|
abd60b92bb
|
修改displayTime字段类型
|
3 years ago |
徐腾飞
|
099c7849c1
|
Merge pull request '修改生成工艺的逻辑' (#78) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/78
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
zhangxin
|
990b231d67
|
修改生成工艺的逻辑
|
3 years ago |
zhangxin
|
da45343233
|
Merge pull request 'feature_xml 修复合并代码错误' (#77) from feature_xml into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/77
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
5eda2070bb
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml
|
3 years ago |
zhangxin
|
7deea1e020
|
Merge pull request '添加了新的自动生成代码' (#76) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/76
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
844e2e0985
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
419e49e33f
|
修复合并代码错误
|
3 years ago |
allanwei
|
b1f11e3560
|
添加了新的自动生成代码
|
3 years ago |
weichenglei
|
2779c832e2
|
Merge pull request '修复更新opcBasicMap的bug' (#74) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/74
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
zhangxin
|
2688012c86
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
zhangxin
|
3de0d5cc2f
|
修复更新opcBasicMap的bug
|
3 years ago |
娄文智
|
4970a5d8e7
|
Merge pull request 'feature_xml PackTemplate修改' (#73) from feature_xml into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/73
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
8a0a0b5c24
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
69d77bb5c2
|
PackTemplate 新增字段
|
3 years ago |
徐腾飞
|
3e599b047a
|
Merge pull request '根据表结构变动修改代码,添加数据校验逻辑' (#66) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/66
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
zhangxin
|
ba75ea1494
|
添加workplacenr的映射
|
3 years ago |
zhangxin
|
a351fb4a45
|
修改字段类型
|
3 years ago |
zhangxin
|
718ad79ce4
|
根据数据库表变动修改代码,增加校验逻辑
|
3 years ago |
徐腾飞
|
b04006eab7
|
Merge pull request '根据修改的表结构修改生成工艺数据的逻辑' (#65) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/65
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
zhangxin
|
4399f81fb6
|
根据协议添加的workplacenr 修改生成工艺数据的逻辑
|
3 years ago |
zhangxin
|
a95919cd50
|
修改表结构对应
|
3 years ago |
zhangxin
|
27663600a2
|
Merge pull request '添加了新的自动生成代码' (#64) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/64
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
allanwei
|
4207c62726
|
添加了新的自动生成代码
|
3 years ago |
allanwei
|
bd168b6b7c
|
添加了新的自动生成代码
|
3 years ago |
weichenglei
|
5d28311da4
|
Merge pull request '根据新的需求修改生成工艺的逻辑' (#63) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/63
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
zhangxin
|
3c29946c96
|
根据新的需求修改生成工艺的逻辑
|
3 years ago |
zhangxin
|
bcb6298d6c
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
zhangxin
|
7937ac69ac
|
启动使用的路由
|
3 years ago |
zhangxin
|
f230ae1ffb
|
Merge pull request '添加了新的自动生成代码' (#62) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/62
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |