 zhangxin
|
fc7da93362
|
Merge branch 'master' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
82195fb096
|
添加字符串处理
|
2 years ago |
 娄文智
|
8d82f187e3
|
Merge pull request '提交dashboard' (#241) from fix_dashboard11 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/241
|
2 years ago |
|
娄文智
|
73eec89cf8
|
提交dashboard
|
2 years ago |
|
zhangxin
|
05eb2eb03a
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend
|
2 years ago |
|
zhangxin
|
14a46f186b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_shunyin
|
2 years ago |
|
zhangxin
|
c74fbd7721
|
修改生成流水号的规则
|
2 years ago |
|
zhangxin
|
1a6ee72dd2
|
修改排序方式
|
2 years ago |
|
zhangxin
|
b4de323ac2
|
提交新的变更逻辑
|
2 years ago |
|
zhangxin
|
2f05dacc84
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_shunyin
|
2 years ago |
|
zhangxin
|
f1d619b992
|
修复bug
|
2 years ago |
|
zhangxin
|
3e7c7fc6e1
|
添加事务
|
2 years ago |
|
zhangxin
|
4e597ffbc2
|
修复启动派工没有走派工配置
|
2 years ago |
|
zhangxin
|
af39285a24
|
去掉无用代码
|
2 years ago |
|
zhangxin
|
e83fad46b5
|
修复派工时 往队列里面放置任务需要根据配置进行时间判断
|
2 years ago |
|
zhangxin
|
99088dec75
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_shunyin
|
2 years ago |
|
zhangxin
|
82c30acb78
|
预装流水号的日期一个台套使用一个
|
2 years ago |
|
zhangxin
|
d58fe5f095
|
添加批量下单品时跨工厂的预装不生成的逻辑
|
2 years ago |
|
zhangxin
|
ef43f0f374
|
添加南沙发运校验和顺引任务拆分的功能逻辑
|
2 years ago |
|
zhangxin
|
1f1c2e1ef3
|
添加总成生成流水号逻辑
|
2 years ago |
|
zhangxin
|
424153a8c8
|
在做派生和总成的关联查询时添加项目id条件
|
2 years ago |
|
zhangxin
|
e360f2c552
|
Revert "打印规则添加字段"
This reverts commit 3e8828c3b2.
|
2 years ago |
|
zhangxin
|
d098895a02
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
3e8828c3b2
|
打印规则添加字段
|
2 years ago |
|
zhangxin
|
5540362571
|
修改返厂打散逻辑
|
2 years ago |
|
zhangxin
|
01650cd6e0
|
修复顺引解析的bug
|
2 years ago |
|
zhangxin
|
f55c29c17b
|
Merge pull request '订单派工， 流水号占用' (#240) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/240
|
2 years ago |
|
zhangxin
|
f6a328febf
|
添加导出顺引页面数据功能
|
2 years ago |
|
zhangxin
|
43e928f075
|
添加导出顺引页面数据功能 添加dashboard不良数据采集
|
2 years ago |
|
zhangxin
|
79b1001161
|
添加通过产线和项目查询总成
|
2 years ago |
|
zhangxin
|
684baa47e8
|
添加通过产线和项目id查询总成
|
2 years ago |
|
zhangxin
|
ef774b1128
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
690f87827a
|
添加定时派工任务
|
2 years ago |
|
娄文智
|
45023d742a
|
Merge pull request '100 & 300 条码返修' (#239) from fix_checkSeriOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/239
|
2 years ago |
|
娄文智
|
9cf8234fb3
|
100 & 300 条码返修
|
2 years ago |
|
zhangxin
|
63077f2ac3
|
Merge pull request '流水号占用，根据配置派工' (#238) from feature_task into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/238
|
2 years ago |
|
zhangxin
|
554484a527
|
去掉无效代码
|
2 years ago |
|
zhangxin
|
9de356cc1c
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_task
|
2 years ago |
|
zhangxin
|
d31721a345
|
添加gaas逻辑
|
2 years ago |
|
zhangxin
|
4b2ee753c9
|
修复批量创建的预装工单schedKey相同的bug
|
2 years ago |
|
zhangxin
|
ba85b58a3f
|
添加配置派工的逻辑
|
2 years ago |
|
zhangxin
|
4481397137
|
添加流水号占用和派工逻辑结合
|
2 years ago |
|
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
|
30c7512d18
|
Merge pull request 'develop' (#237) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/237
|
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: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/236
|
2 years ago |
