 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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/194
|
2 years ago |
|
zhangxin
|
ad7ae58bdb
|
添加总成关联多产线和派生关联多产线功能
|
2 years ago |
|
zhangxin
|
77ebe9357f
|
Merge pull request 'fix_taitao' (#193) from fix_taitao into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/191
|
2 years ago |
|
娄文智
|
8479aad26f
|
台套大屏改进
|
2 years ago |
|
娄文智
|
5b0eebb588
|
Merge pull request '1.修复sql条件少的bug，2.修改打印格式' (#190) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/188
|
2 years ago |
|
zhangxin
|
d1f93fa18b
|
修复扫描抓取零件数据得bug 数据追溯添加电检逻辑
|
2 years ago |
|
zhangxin
|
47ec92bb01
|
修改电检时间字段为datetime类型
|
2 years ago |
|
zhangxin
|
7e23f7cf2a
|
Merge pull request '提交返修条码' (#187) from fix_remove into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/187
|
2 years ago |
|
娄文智
|
624c533209
|
提交返修条码
|
2 years ago |
|
娄文智
|
0bb54d49ed
|
Merge pull request '添加对工单电检的处理' (#186) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/186
|
2 years ago |
|
zhangxin
|
814c6bfe8c
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
9419b7f098
|
添加对工单电检的处理
|
2 years ago |
|
zhangxin
|
c0c402c3ba
|
Merge pull request '大屏展示，打包数量' (#185) from fix_morePlantnr into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/185
|
2 years ago |
|
娄文智
|
af6a1543c6
|
大屏展示中心位置。逻辑修改
|
2 years ago |
|
娄文智
|
29e10589b0
|
大屏展示，打包数量
|
2 years ago |
|
娄文智
|
3a1a62c266
|
Merge pull request '修改工厂写死 支持多工厂' (#184) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/184
|
2 years ago |
|
zhangxin
|
4c5673cf84
|
修改工厂写死 支持多工厂
|
2 years ago |
 yehongyang
|
3f017230c9
|
多工厂
|
2 years ago |
|
zhangxin
|
273403157a
|
Merge pull request '多工厂问题' (#183) from fix_morePlantnr into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/183
|
2 years ago |
|
娄文智
|
fbd24bd7b1
|
多工厂问题
|
2 years ago |
|
娄文智
|
222b7a2870
|
Merge pull request '添加新模块代码' (#182) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/182
|
2 years ago |
|
zhangxin
|
89c1f077e1
|
添加新模块代码
|
2 years ago |
|
娄文智
|
e0a7942b3e
|
Merge pull request '添加解析excel时解析日期' (#181) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/181
|
2 years ago |
|
zhangxin
|
c10b6dbdd1
|
添加出生证添加电检查询
|
2 years ago |
|
zhangxin
|
1d963ca108
|
修复dao层where的条件
|
2 years ago |
|
zhangxin
|
2ce047df3e
|
添加派生使用的存储结构体
|
2 years ago |
|
zhangxin
|
129ab8ef25
|
修复预装工单扫码打印的bug
|
2 years ago |
|
zhangxin
|
1914c7b43a
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
7562ed0750
|
添加解析excel时解析日期
|
2 years ago |
|
zhangxin
|
34915c400f
|
修改生成打印数据时获取打印模板的逻辑
|
2 years ago |
|
娄文智
|
7f7be1b3fd
|
Merge pull request '添加工单返修拆解功能代码' (#180) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/180
|
2 years ago |
|
zhangxin
|
f2b9cf33fd
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
2 years ago |
|
zhangxin
|
393de4a2cd
|
添加工单返修拆解功能代码
|
2 years ago |
|
zhangxin
|
ac27ce8b83
|
添加工单拆解模板代码
|
2 years ago |
|
weichenglei
|
bab144a1d1
|
Merge pull request '修改dashboard展示样式' (#178) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/178
|
2 years ago |
