 zhangxin
|
f73d478ccf
|
删除了产线作为扫码规则的校验条件
|
2 years ago |
|
zhangxin
|
172701c8eb
|
Merge pull request '修改打印条码的日期为计划生产日期' (#205) from develop into master
Reviewed-on: #205
|
2 years ago |
|
zhangxin
|
81a23b4193
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
fd90d41fab
|
修改打印条码的日期为计划生产日期
|
2 years ago |
|
zhangxin
|
c14af0c110
|
Merge pull request 'develop' (#204) from develop into master
Reviewed-on: #204
|
2 years ago |
|
zhangxin
|
93b7770ae4
|
Merge pull request '添加对樱泰顺引的处理' (#203) from feature_dashboard into develop
Reviewed-on: #203
|
2 years ago |
|
zhangxin
|
ec83d339cf
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_dashboard
|
2 years ago |
|
zhangxin
|
f68af30e45
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_dashboard
|
2 years ago |
|
zhangxin
|
e1ad91d93d
|
Merge pull request '打印逻辑修改' (#202) from fix_eysRepair into develop
Reviewed-on: #202
|
2 years ago |
|
zhangxin
|
9686f8ea57
|
添加对樱泰顺引的处理
|
2 years ago |
 娄文智
|
84569ae1ce
|
打印逻辑修改
|
2 years ago |
|
zhangxin
|
f258d6802b
|
Merge pull request '大屏展示及其返修逻辑' (#201) from feature_repairAndBASH into develop
Reviewed-on: #201
|
2 years ago |
|
娄文智
|
703caf32a7
|
大屏展示及其返修逻辑
|
2 years ago |
 yehongyang
|
05cfd9fa21
|
Merge pull request '修改dashboard的逻辑' (#200) from feature_dashboard into develop
Reviewed-on: #200
|
2 years ago |
|
zhangxin
|
49c3a9f289
|
修改dashboard的逻辑
|
2 years ago |
|
zhangxin
|
78d07e3d9d
|
Merge branch 'master' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
0c44e9d311
|
完成广州项目的问题调整和修复
|
2 years ago |
|
zhangxin
|
317d020acd
|
修复多产线下工单的bug
|
2 years ago |
|
zhangxin
|
efaf86c86f
|
修复预装工单的聚合工序的bug
|
2 years ago |
|
zhangxin
|
9a94d0a1d2
|
修复预装工单聚合工序的bug
|
2 years ago |
|
zhangxin
|
248523cd18
|
不再依赖配置的的projectId 将该字段加到plant上 添加打包中缤智线的plc写入逻辑
|
2 years ago |
|
zhangxin
|
b4c4fa3017
|
Merge pull request '广州项目稳定版本' (#198) from develop into master
Reviewed-on: #198
|
2 years ago |
|
zhangxin
|
0ef2e28dae
|
提交依赖包
|
2 years ago |
|
zhangxin
|
edff532a49
|
Merge pull request '修改解析派生id的规则,添加多产线的支持' (#197) from feature_om into develop
Reviewed-on: #197
|
2 years ago |
|
zhangxin
|
ab52606b13
|
修改解析派生id的规则
|
2 years ago |
|
zhangxin
|
48f915f1bf
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
e060781b03
|
添加多产线的支持
|
2 years ago |
|
zhangxin
|
163062feab
|
添加零件校验规则的处理
|
2 years ago |
|
娄文智
|
f085587e72
|
Merge pull request '添加派生产线关联数据表' (#196) from feature_om into develop
Reviewed-on: #196
|
2 years ago |
|
zhangxin
|
6886cb83ea
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
0e1f7d191f
|
添加派生产线关联数据表
|
2 years ago |
|
娄文智
|
88a41ca7c5
|
Merge pull request '添加总成关联多产线和派生关联多产线功能' (#194) from feature_om into develop
Reviewed-on: #194
|
2 years ago |
|
zhangxin
|
ad7ae58bdb
|
添加总成关联多产线和派生关联多产线功能
|
2 years ago |
|
zhangxin
|
77ebe9357f
|
Merge pull request 'fix_taitao' (#193) from fix_taitao into develop
Reviewed-on: #193
|
2 years ago |
|
娄文智
|
8a2eee8770
|
no message
|
2 years ago |
|
娄文智
|
7979637f76
|
大屏修改
|
2 years ago |
|
娄文智
|
9694a366e9
|
Merge pull request '修改测试代码' (#192) from feature_om into develop
Reviewed-on: #192
|
2 years ago |
|
zhangxin
|
da94003059
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
d96a4d088a
|
修改测试代码
|
2 years ago |
|
zhangxin
|
68798f027c
|
Merge pull request '台套大屏改进' (#191) from fix_taitao into develop
Reviewed-on: #191
|
2 years ago |
|
娄文智
|
8479aad26f
|
台套大屏改进
|
2 years ago |
|
娄文智
|
5b0eebb588
|
Merge pull request '1.修复sql条件少的bug，2.修改打印格式' (#190) from feature_om into develop
Reviewed-on: #190
|
2 years ago |
|
zhangxin
|
9f319901d3
|
Merge branch 'develop' into feature_om
|
2 years ago |
|
zhangxin
|
aaf1215643
|
修改打印格式
|
2 years ago |
|
zhangxin
|
91316d50dc
|
修复sql条件少的bug
|
2 years ago |
 weichenglei
|
7691e1c0b2
|
Merge pull request '修改dashboard的逻辑' (#189) from feature_om into develop
Reviewed-on: #189
|
2 years ago |
|
zhangxin
|
ab4a086b5e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
6b1bbf92f9
|
修改dashboard的逻辑
|
2 years ago |
|
zhangxin
|
7b217c451b
|
Merge pull request '1.修复扫描抓取零件数据得bug 数据追溯添加电检逻辑, 2. 修改电检时间字段为datetime类型' (#188) from feature_om into develop
Reviewed-on: #188
|
2 years ago |
|
zhangxin
|
d1f93fa18b
|
修复扫描抓取零件数据得bug 数据追溯添加电检逻辑
|
2 years ago |
