 zhangxin
|
fad9ec98d1
|
修复查询工艺时 拼接artId没有双引号的bug
|
3 years ago |
|
zhangxin
|
516fcc00bf
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
# Conflicts:
# web/controllers/base/base.go
|
3 years ago |
|
zhangxin
|
bf18861f31
|
Merge pull request '添加了新的自动生成代码' (#92) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/92
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 weichenglei
|
4ef8c434fe
|
Merge branch 'develop' into feature_NewCode
|
3 years ago |
|
zhangxin
|
730da412a7
|
Merge pull request '打印字段添加' (#91) from feature_printre into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/91
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
018e41d5d5
|
打印字段添加
|
3 years ago |
|
allanwei
|
60b7b705e7
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
b0e3efc5eb
|
保存时 添加删除的筛选条件workplacenr
|
3 years ago |
|
zhangxin
|
dd8955f16e
|
调整派工的逻辑
|
3 years ago |
|
zhangxin
|
bbd395c996
|
调整生成工艺bom的逻辑
|
3 years ago |
|
zhangxin
|
5508e70091
|
为打印条码新增字段映射
|
3 years ago |
|
zhangxin
|
a4143935b0
|
新增字段
|
3 years ago |
|
zhangxin
|
ac9e9c11c5
|
修正数据维护时更新其他表的bug
|
3 years ago |
|
zhangxin
|
f04450d7d1
|
调整排序方式
|
3 years ago |
|
zhangxin
|
886728192d
|
新增字段
|
3 years ago |
|
zhangxin
|
37d56f39a3
|
筛选条件去掉ProjectiD
|
3 years ago |
|
zhangxin
|
e50e656770
|
添加字段
|
3 years ago |
|
zhangxin
|
575a406fae
|
添加字段
|
3 years ago |
|
zhangxin
|
b7c20f47af
|
修改排序字段
|
3 years ago |
|
zhangxin
|
439077c399
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
82096e77e0
|
Merge pull request '包装数量修改' (#90) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/90
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
d4dd0142ff
|
包装数量修改
|
3 years ago |
|
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 |
