 zhangxin
|
b9c9dfd6d3
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_task
|
2 years ago |
|
zhangxin
|
91950ec706
|
添加派工逻辑流水号占用和取消 添加派工配置
|
2 years ago |
 allanwei
|
8add418bbe
|
修正了座椅查询发运时间错误
|
2 years ago |
|
zhangxin
|
0d291b2952
|
添加流水号占用逻辑
|
2 years ago |
|
zhangxin
|
b8667d8a17
|
如果是80或者75下线打包校验目检
|
2 years ago |
|
zhangxin
|
4c13b9d76f
|
Merge branch 'master' into develop
|
2 years ago |
 娄文智
|
890513bbb3
|
Merge pull request '出勤人数去掉' (#236) from fix_person into develop
Reviewed-on: #236
|
2 years ago |
|
娄文智
|
4895e287c3
|
出勤人数去掉
|
2 years ago |
|
zhangxin
|
683dcbfbaf
|
Merge pull request '调整dashboard缺陷展示日期顺序' (#235) from develop into master
Reviewed-on: #235
|
2 years ago |
|
zhangxin
|
87a8637c1f
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
c6d5b3f3a8
|
调整dashboard缺陷展示日期顺序
|
2 years ago |
|
zhangxin
|
c0d567b4ad
|
Merge pull request '修复部分情况电检结果没有写入到包装单上 修改生成rfid使用的结果标识的依赖数据' (#234) from develop into master
Reviewed-on: #234
|
2 years ago |
|
zhangxin
|
fcdf8eefda
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
673fbba31c
|
修复部分情况电检结果没有写入到包装单上 修改生成rfid使用的结果标识的依赖数据
|
2 years ago |
|
zhangxin
|
3444e71bd1
|
Merge pull request 'V1.3.0' (#233) from develop into master
Reviewed-on: #233
|
2 years ago |
|
zhangxin
|
665f960bef
|
提交打散功能和回冲标识，修复打包逻辑
|
2 years ago |
|
zhangxin
|
e0a3d52ffa
|
生成发运单回冲文件时 同时更新serialOrder得ShipBackFlush标识
|
2 years ago |
|
zhangxin
|
3fcb0bbccf
|
Merge branch 'feature_specialship' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
c09b7690eb
|
添加GAAS的处理
|
2 years ago |
|
zhangxin
|
27b160362f
|
添加打散的操作
|
2 years ago |
|
zhangxin
|
ca00fc3da2
|
添加流水号溢出报错的处理
|
2 years ago |
|
zhangxin
|
acf02f7b89
|
修改回冲文件生成逻辑
|
2 years ago |
|
zhangxin
|
778a1a66e0
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_specialship
|
2 years ago |
|
zhangxin
|
a80447b8bd
|
修改获取流水号使用的时间
|
2 years ago |
|
zhangxin
|
7369171fc3
|
修改工单流水号规则从总成上获取
|
2 years ago |
|
zhangxin
|
a1292761d1
|
Merge branch 'fix' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
# Conflicts:
# services/pln/implments/CustOrderLogic.service.impl.go
|
2 years ago |
|
zhangxin
|
0816dfdc73
|
添加git忽略文件
|
2 years ago |
|
zhangxin
|
0dd6874de8
|
修改工单流水号到总成上
|
2 years ago |
|
娄文智
|
d1470810ed
|
Merge pull request 'dashboard' (#232) from fix_dashboard_lou into fix
Reviewed-on: #232
|
2 years ago |
|
娄文智
|
9ee0dfedc2
|
Merge branch 'fix' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into fix_dashboard_lou
|
2 years ago |
|
zhangxin
|
ff81f5fb8b
|
custOrder派工使用的流水号从派生上获取
|
2 years ago |
|
娄文智
|
48ef3470be
|
dashboard
|
2 years ago |
|
zhangxin
|
28c6294935
|
修改顺引bug
|
2 years ago |
|
zhangxin
|
721e901646
|
Merge branch 'fix' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
# Conflicts:
# services/om/implments/SerialOrder.Craft.impl.go
|
2 years ago |
|
zhangxin
|
4e4b7b61de
|
优化dashboard
|
2 years ago |
|
zhangxin
|
57dfa1944b
|
修改dashboard和顺引bug
|
2 years ago |
|
zhangxin
|
02fad78dc2
|
删除无用dashboard配置service和controller代码 修改dashboard和南沙顺引bug
|
2 years ago |
|
娄文智
|
fdebb6244c
|
更新数据
|
2 years ago |
|
zhangxin
|
de99ebb4d8
|
Merge pull request 'feature_crossplant' (#230) from feature_crossplant into develop
Reviewed-on: #230
|
2 years ago |
|
zhangxin
|
62ff15fb51
|
完成跨工厂的任务拆分功能
|
2 years ago |
|
zhangxin
|
8103361cd8
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_crossplant
# Conflicts:
# etl_task/BackFlushShipOrder.go
# models/pln/pln.go
# services/pln/implments/CustOrderLogic.service.impl.go
|
2 years ago |
|
zhangxin
|
3ec8d349b7
|
完善跨工厂派工逻辑
|
2 years ago |
|
zhangxin
|
d5530a72af
|
Merge pull request '修改dashboard和异步派工的bug' (#229) from develop into master
Reviewed-on: #229
|
2 years ago |
|
zhangxin
|
f794559a43
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
7aad849684
|
修改dashboard和异步派工的bug
|
2 years ago |
|
zhangxin
|
3a9d1b5dae
|
修改常量名 添加跨工厂名
|
2 years ago |
|
zhangxin
|
dbfba09449
|
修改回冲逻辑
|
2 years ago |
|
zhangxin
|
b38a62f6b4
|
修改常量名
|
2 years ago |
|
zhangxin
|
389a67cae2
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend
|
2 years ago |
|
zhangxin
|
65e9a0bfb1
|
修改电检和sbr的逻辑
|
2 years ago |
