 zhangxin
|
941c84de7f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
9b7f2e7cae
|
Merge pull request '修改查询语句' (#88) from feature_logorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/88
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
7fc9b7710f
|
修改查询语句
|
3 years ago |
|
zhangxin
|
5517a0e9ff
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
# Conflicts:
# dao/me/BomHead.dao.go
# dao/me/implments/BomHead.dao.impl.go
# services/me/BomHead.service.go
# web/controllers/me/BomHead.rest.go
|
3 years ago |
 徐腾飞
|
ceec09f7c1
|
Merge pull request '包装生成逻辑修改' (#87) from feature_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/87
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
|
娄文智
|
31038934f8
|
包装生成逻辑修改
|
3 years ago |
|
zhangxin
|
d742b91981
|
修改生成BOM的逻辑
|
3 years ago |
|
zhangxin
|
1597324a49
|
修改查询传参位置
|
3 years ago |
|
zhangxin
|
bdf8b4a55b
|
添加查询工艺时新增查询条件projectid
|
3 years ago |
|
zhangxin
|
5bcc1040fd
|
新增物料类型
|
3 years ago |
|
zhangxin
|
a66dd77171
|
修改bom数据维护的逻辑
|
3 years ago |
|
zhangxin
|
588587762e
|
查找工艺的添加增项目ID
|
3 years ago |
|
zhangxin
|
c387e3de3a
|
添加物料和产线关联关系
|
3 years ago |
|
zhangxin
|
561c1ddaa7
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
fdb4554e13
|
新增工位监控动作数据维护的功能接口
|
3 years ago |
|
zhangxin
|
e617ddb983
|
增加字段
|
3 years ago |
|
zhangxin
|
dbedc9d0ca
|
删除掉无用文件
|
3 years ago |
|
zhangxin
|
8b905b885d
|
Merge pull request '添加了新的自动生成代码' (#86) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/86
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 allanwei
|
dc12a7237f
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
1e7e171855
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
d2e848baeb
|
Merge pull request '添加了新的自动生成代码' (#85) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/85
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
0d1cb6fd84
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
58a7b38fe9
|
修改包名
|
3 years ago |
|
zhangxin
|
2fa0fa0e9a
|
添加获取所有属性和零件分配规则得方法
|
3 years ago |
|
zhangxin
|
c6324dba97
|
创建订单需要指定workLineId 同时修改opc映射值获取映射值得规则
|
3 years ago |
|
zhangxin
|
26dd10c3ef
|
添加bom拆分功能
|
3 years ago |
|
徐腾飞
|
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 |
